diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 085bfceb01f0426d9b140d1acd220a795b1382f7..b85e43aa1ae2fad2745ebeb05c41f190881bb873 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -1,15 +1,22 @@
# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 3.0.8
+# Version 3.0.12
#
# 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
-if version_info >= (2, 6, 0):
+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
@@ -19,22 +26,27 @@ if version_info >= (2, 6, 0):
except ImportError:
import _libBornAgainCore
return _libBornAgainCore
- if fp is not None:
- try:
- _mod = imp.load_module('_libBornAgainCore', fp, pathname, description)
- finally:
+ try:
+ _mod = imp.load_module('_libBornAgainCore', fp, pathname, description)
+ finally:
+ if fp is not None:
fp.close()
- return _mod
+ return _mod
_libBornAgainCore = swig_import_helper()
del swig_import_helper
else:
import _libBornAgainCore
-del version_info
+del _swig_python_version_info
+
try:
_swig_property = property
except NameError:
pass # Python < 2.2 doesn't have 'property'.
+try:
+ import builtins as __builtin__
+except ImportError:
+ import __builtin__
def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
if (name == "thisown"):
@@ -59,41 +71,34 @@ def _swig_setattr(self, class_type, name, value):
return _swig_setattr_nondynamic(self, class_type, name, value, 0)
-def _swig_getattr_nondynamic(self, class_type, name, static=1):
+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)
- if (not static):
- return object.__getattr__(self, name)
- else:
- raise AttributeError(name)
-
-def _swig_getattr(self, class_type, name):
- return _swig_getattr_nondynamic(self, class_type, name, 0)
+ raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
def _swig_repr(self):
try:
strthis = "proxy of " + self.this.__repr__()
- except Exception:
+ except __builtin__.Exception:
strthis = ""
return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
try:
_object = object
_newclass = 1
-except AttributeError:
+except __builtin__.Exception:
class _object:
pass
_newclass = 0
-
try:
import weakref
weakref_proxy = weakref.proxy
-except Exception:
+except __builtin__.Exception:
weakref_proxy = lambda x: x
@@ -204,8 +209,6 @@ class SwigPyIterator(_object):
SwigPyIterator_swigregister = _libBornAgainCore.SwigPyIterator_swigregister
SwigPyIterator_swigregister(SwigPyIterator)
-
-_libBornAgainCore.SHARED_PTR_DISOWN_swigconstant(_libBornAgainCore)
SHARED_PTR_DISOWN = _libBornAgainCore.SHARED_PTR_DISOWN
class ParameterPoolIterator(object):
@@ -386,7 +389,7 @@ class vdouble1d_t(_object):
this = _libBornAgainCore.new_vdouble1d_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -598,7 +601,7 @@ class vdouble2d_t(_object):
this = _libBornAgainCore.new_vdouble2d_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -810,7 +813,7 @@ class vector_integer_t(_object):
this = _libBornAgainCore.new_vector_integer_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1022,7 +1025,7 @@ class vinteger2d_t(_object):
this = _libBornAgainCore.new_vinteger2d_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1234,7 +1237,7 @@ class vector_longinteger_t(_object):
this = _libBornAgainCore.new_vector_longinteger_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1446,7 +1449,7 @@ class vector_complex_t(_object):
this = _libBornAgainCore.new_vector_complex_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1658,7 +1661,7 @@ class vector_string_t(_object):
this = _libBornAgainCore.new_vector_string_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1771,7 +1774,7 @@ class INoncopyable(_object):
this = _libBornAgainCore.new_INoncopyable()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_INoncopyable
__del__ = lambda self: None
@@ -1864,7 +1867,7 @@ class INamed(_object):
this = _libBornAgainCore.new_INamed(_self, *args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_INamed
__del__ = lambda self: None
@@ -1921,7 +1924,7 @@ class IParameterized(INamed):
this = _libBornAgainCore.new_IParameterized(_self, *args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IParameterized
__del__ = lambda self: None
@@ -2056,7 +2059,7 @@ class INode(IParameterized):
this = _libBornAgainCore.new_INode(_self, )
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_INode
__del__ = lambda self: None
@@ -2329,7 +2332,7 @@ class swig_dummy_type_inode_vector(_object):
this = _libBornAgainCore.new_swig_dummy_type_inode_vector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -2541,7 +2544,7 @@ class swig_dummy_type_const_inode_vector(_object):
this = _libBornAgainCore.new_swig_dummy_type_const_inode_vector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -2623,7 +2626,7 @@ class kvector_t(_object):
this = _libBornAgainCore.new_kvector_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def x(self):
@@ -3053,7 +3056,7 @@ class vector_kvector_t(_object):
this = _libBornAgainCore.new_vector_kvector_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -3135,7 +3138,7 @@ class cvector_t(_object):
this = _libBornAgainCore.new_cvector_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def x(self):
@@ -3473,7 +3476,7 @@ class vector_cvector_t(_object):
this = _libBornAgainCore.new_vector_cvector_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -3586,9 +3589,7 @@ class WavevectorInfo(_object):
"""GetZeroQ() -> WavevectorInfo"""
return _libBornAgainCore.WavevectorInfo_GetZeroQ()
- if _newclass:
- GetZeroQ = staticmethod(GetZeroQ)
- __swig_getmethods__["GetZeroQ"] = lambda x: GetZeroQ
+ GetZeroQ = staticmethod(GetZeroQ)
def __init__(self, *args):
"""
@@ -3601,7 +3602,7 @@ class WavevectorInfo(_object):
this = _libBornAgainCore.new_WavevectorInfo(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def transformed(self, transform):
@@ -3709,7 +3710,7 @@ class Beam(INode):
this = _libBornAgainCore.new_Beam(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Beam
__del__ = lambda self: None
@@ -3838,7 +3839,7 @@ class Bin1D(_object):
this = _libBornAgainCore.new_Bin1D(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_setmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_set
__swig_getmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_get
@@ -3914,7 +3915,7 @@ class Bin1DKVector(_object):
this = _libBornAgainCore.new_Bin1DKVector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def getMidPoint(self):
@@ -3979,7 +3980,7 @@ class Bin1DCVector(_object):
this = _libBornAgainCore.new_Bin1DCVector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def getMidPoint(self):
@@ -4276,7 +4277,7 @@ class VariableBinAxis(IAxis):
this = _libBornAgainCore.new_VariableBinAxis(name, nbins, bin_boundaries)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_VariableBinAxis
__del__ = lambda self: None
@@ -4449,7 +4450,7 @@ class ConstKBinAxis(VariableBinAxis):
this = _libBornAgainCore.new_ConstKBinAxis(name, nbins, start, end)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ConstKBinAxis
__del__ = lambda self: None
@@ -4527,7 +4528,7 @@ class CustomBinAxis(VariableBinAxis):
this = _libBornAgainCore.new_CustomBinAxis(name, nbins, start, end)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_CustomBinAxis
__del__ = lambda self: None
@@ -4704,7 +4705,7 @@ class ISample(ICloneable, INode):
this = _libBornAgainCore.new_ISample(_self, )
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ISample
__del__ = lambda self: None
@@ -4933,7 +4934,7 @@ class IObservable(_object):
this = _libBornAgainCore.new_IObservable(_self, )
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def __disown__(self):
self.this.disown()
@@ -4976,7 +4977,7 @@ class IFitObserver(IObserver):
this = _libBornAgainCore.new_IFitObserver(_self, update_every_nth)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def notify(self, subject):
@@ -5098,7 +5099,7 @@ class FitStrategyDefault(IFitStrategy):
this = _libBornAgainCore.new_FitStrategyDefault()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -5224,7 +5225,7 @@ class IntensityFunctionLog(IIntensityFunction):
this = _libBornAgainCore.new_IntensityFunctionLog()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
IntensityFunctionLog_swigregister = _libBornAgainCore.IntensityFunctionLog_swigregister
IntensityFunctionLog_swigregister(IntensityFunctionLog)
@@ -5285,7 +5286,7 @@ class IntensityFunctionSqrt(IIntensityFunction):
this = _libBornAgainCore.new_IntensityFunctionSqrt()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
IntensityFunctionSqrt_swigregister = _libBornAgainCore.IntensityFunctionSqrt_swigregister
IntensityFunctionSqrt_swigregister(IntensityFunctionSqrt)
@@ -5389,7 +5390,7 @@ class IntensityNormalizer(IIntensityNormalizer):
this = _libBornAgainCore.new_IntensityNormalizer(scale, shift)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityNormalizer
__del__ = lambda self: None
@@ -5480,7 +5481,7 @@ class IntensityScaleAndShiftNormalizer(IntensityNormalizer):
this = _libBornAgainCore.new_IntensityScaleAndShiftNormalizer(scale, shift)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityScaleAndShiftNormalizer
__del__ = lambda self: None
@@ -5603,7 +5604,7 @@ class SquaredFunctionDefault(ISquaredFunction):
this = _libBornAgainCore.new_SquaredFunctionDefault()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SquaredFunctionDefault
__del__ = lambda self: None
@@ -5900,7 +5901,7 @@ class ChiSquaredModule(IChiSquaredModule):
this = _libBornAgainCore.new_ChiSquaredModule(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ChiSquaredModule
__del__ = lambda self: None
@@ -5977,7 +5978,7 @@ class FitObject(INode, INoncopyable):
this = _libBornAgainCore.new_FitObject(simulation, real_data, weight)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitObject
__del__ = lambda self: None
@@ -6129,7 +6130,7 @@ class FitOptions(_object):
this = _libBornAgainCore.new_FitOptions()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitOptions
__del__ = lambda self: None
@@ -6192,7 +6193,7 @@ class FitParameter(libBornAgainFit.IFitParameter):
this = _libBornAgainCore.new_FitParameter(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitParameter
__del__ = lambda self: None
@@ -6333,7 +6334,7 @@ class FitSuite(IObservable):
this = _libBornAgainCore.new_FitSuite()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitSuite
__del__ = lambda self: None
@@ -6765,7 +6766,7 @@ class FitSuiteObjects(INode, INoncopyable):
this = _libBornAgainCore.new_FitSuiteObjects()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitSuiteObjects
__del__ = lambda self: None
@@ -7116,11 +7117,7 @@ def Bessel_J1c(*args):
"""
return _libBornAgainCore.Bessel_J1c(*args)
-
-_libBornAgainCore.FORWARD_FFT_swigconstant(_libBornAgainCore)
FORWARD_FFT = _libBornAgainCore.FORWARD_FFT
-
-_libBornAgainCore.BACKWARD_FFT_swigconstant(_libBornAgainCore)
BACKWARD_FFT = _libBornAgainCore.BACKWARD_FFT
def FastFourierTransform(*args):
@@ -7205,7 +7202,7 @@ class AdjustMinimizerStrategy(IFitStrategy):
this = _libBornAgainCore.new_AdjustMinimizerStrategy(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -7278,7 +7275,7 @@ class IMultiLayerBuilder(IParameterized):
this = _libBornAgainCore.new_IMultiLayerBuilder(_self, )
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def buildSample(self):
@@ -7338,9 +7335,7 @@ class IMultiLayerBuilder(IParameterized):
"""isPythonBuilder() -> bool"""
return _libBornAgainCore.IMultiLayerBuilder_isPythonBuilder()
- if _newclass:
- isPythonBuilder = staticmethod(isPythonBuilder)
- __swig_getmethods__["isPythonBuilder"] = lambda x: isPythonBuilder
+ isPythonBuilder = staticmethod(isPythonBuilder)
__swig_destroy__ = _libBornAgainCore.delete_IMultiLayerBuilder
__del__ = lambda self: None
def __disown__(self):
@@ -7382,7 +7377,7 @@ class INodeVisitor(_object):
this = _libBornAgainCore.new_INodeVisitor()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_INodeVisitor
__del__ = lambda self: None
@@ -7653,7 +7648,7 @@ class Crystal(IClusteredParticles):
this = _libBornAgainCore.new_Crystal(lattice_basis, lattice)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Crystal
__del__ = lambda self: None
@@ -7908,7 +7903,7 @@ class DistributionGate(IDistribution1D):
this = _libBornAgainCore.new_DistributionGate(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionGate
__del__ = lambda self: None
@@ -8037,7 +8032,7 @@ class DistributionLorentz(IDistribution1D):
this = _libBornAgainCore.new_DistributionLorentz(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionLorentz
__del__ = lambda self: None
@@ -8156,7 +8151,7 @@ class DistributionGaussian(IDistribution1D):
this = _libBornAgainCore.new_DistributionGaussian(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionGaussian
__del__ = lambda self: None
@@ -8275,7 +8270,7 @@ class DistributionLogNormal(IDistribution1D):
this = _libBornAgainCore.new_DistributionLogNormal(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionLogNormal
__del__ = lambda self: None
@@ -8416,7 +8411,7 @@ class DistributionCosine(IDistribution1D):
this = _libBornAgainCore.new_DistributionCosine(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionCosine
__del__ = lambda self: None
@@ -8535,7 +8530,7 @@ class DistributionTrapezoid(IDistribution1D):
this = _libBornAgainCore.new_DistributionTrapezoid(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionTrapezoid
__del__ = lambda self: None
@@ -8670,7 +8665,7 @@ class DetectorMask(_object):
this = _libBornAgainCore.new_DetectorMask(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def addMask(self, shape, mask_value):
@@ -8842,7 +8837,7 @@ class Ellipse(IShape2D):
this = _libBornAgainCore.new_Ellipse(xcenter, ycenter, xradius, yradius, theta)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9009,7 +9004,7 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DCauchy(decay_length)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9078,7 +9073,7 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DGauss(decay_length)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9147,7 +9142,7 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DTriangle(decay_length)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9227,7 +9222,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DVoigt(decay_length, eta)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9428,7 +9423,7 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
this = _libBornAgainCore.new_FTDecayFunction2DCauchy(decay_length_x, decay_length_y, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9500,7 +9495,7 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
this = _libBornAgainCore.new_FTDecayFunction2DGauss(decay_length_x, decay_length_y, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9589,7 +9584,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
this = _libBornAgainCore.new_FTDecayFunction2DVoigt(decay_length_x, decay_length_y, eta, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9739,7 +9734,7 @@ class FTDistribution1DCauchy(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DCauchy(omega)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9810,7 +9805,7 @@ class FTDistribution1DGauss(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DGauss(omega)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9881,7 +9876,7 @@ class FTDistribution1DGate(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DGate(omega)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -9952,7 +9947,7 @@ class FTDistribution1DTriangle(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DTriangle(omega)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10023,7 +10018,7 @@ class FTDistribution1DCosine(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DCosine(omega)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10105,7 +10100,7 @@ class FTDistribution1DVoigt(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DVoigt(omega, eta)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10286,7 +10281,7 @@ class FTDistribution2DCauchy(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DCauchy(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10358,7 +10353,7 @@ class FTDistribution2DGauss(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DGauss(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10430,7 +10425,7 @@ class FTDistribution2DGate(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DGate(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10502,7 +10497,7 @@ class FTDistribution2DCone(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DCone(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10591,7 +10586,7 @@ class FTDistribution2DVoigt(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DVoigt(omega_x, omega_y, eta, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -10689,7 +10684,7 @@ class FixedBinAxis(IAxis):
this = _libBornAgainCore.new_FixedBinAxis(name, nbins, start, end)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FixedBinAxis
__del__ = lambda self: None
@@ -10853,7 +10848,7 @@ class IFormFactor(ISample):
this = _libBornAgainCore.new_IFormFactor(_self, )
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IFormFactor
__del__ = lambda self: None
@@ -11150,7 +11145,7 @@ class vector_IFormFactorPtr_t(_object):
this = _libBornAgainCore.new_vector_IFormFactorPtr_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -11239,7 +11234,7 @@ class IFormFactorBorn(IFormFactor):
this = _libBornAgainCore.new_IFormFactorBorn(_self, )
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IFormFactorBorn
__del__ = lambda self: None
@@ -11374,7 +11369,7 @@ class SlicingEffects(_object):
this = _libBornAgainCore.new_SlicingEffects()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SlicingEffects
__del__ = lambda self: None
@@ -11532,7 +11527,7 @@ class PolygonalTopology(_object):
this = _libBornAgainCore.new_PolygonalTopology()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_PolygonalTopology
__del__ = lambda self: None
@@ -11577,7 +11572,7 @@ class PolyhedralTopology(_object):
this = _libBornAgainCore.new_PolyhedralTopology()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_PolyhedralTopology
__del__ = lambda self: None
@@ -11610,7 +11605,7 @@ class PolyhedralEdge(_object):
this = _libBornAgainCore.new_PolyhedralEdge(_Vlow, _Vhig)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def E(self):
@@ -11689,9 +11684,7 @@ class PolyhedralFace(_object):
"""diameter(vector_kvector_t V) -> double"""
return _libBornAgainCore.PolyhedralFace_diameter(V)
- if _newclass:
- diameter = staticmethod(diameter)
- __swig_getmethods__["diameter"] = lambda x: diameter
+ diameter = staticmethod(diameter)
def __init__(self, *args):
"""
@@ -11716,7 +11709,7 @@ class PolyhedralFace(_object):
this = _libBornAgainCore.new_PolyhedralFace(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def area(self):
@@ -12097,7 +12090,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorAnisoPyramid(length, width, height, alpha)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -12212,7 +12205,7 @@ class FormFactorBox(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorBox(length, width, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -12341,7 +12334,7 @@ class FormFactorCone(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorCone(radius, height, alpha)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -12470,7 +12463,7 @@ class FormFactorCone6(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorCone6(base_edge, height, alpha)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -12561,7 +12554,7 @@ class FormFactorCrystal(IFormFactor):
this = _libBornAgainCore.new_FormFactorCrystal(lattice, basis_form_factor, meso_form_factor)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FormFactorCrystal
__del__ = lambda self: None
@@ -12711,7 +12704,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorCuboctahedron(length, height, height_ratio, alpha)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -12823,7 +12816,7 @@ class FormFactorCylinder(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorCylinder(radius, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -12931,7 +12924,7 @@ class FormFactorDecoratorDebyeWaller(IFormFactorDecorator):
this = _libBornAgainCore.new_FormFactorDecoratorDebyeWaller(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13020,7 +13013,7 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorDodecahedron(edge)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13091,7 +13084,7 @@ class FormFactorDot(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorDot()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13190,7 +13183,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorEllipsoidalCylinder(radius_x, radius_y, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13313,7 +13306,7 @@ class FormFactorFullSphere(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorFullSphere(radius)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13443,7 +13436,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorFullSpheroid(radius, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13549,7 +13542,7 @@ class FormFactorGauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorGauss(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13668,7 +13661,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorHemiEllipsoid(radius_x, radius_y, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FormFactorHemiEllipsoid
__del__ = lambda self: None
@@ -13791,7 +13784,7 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorIcosahedron(edge)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -13876,7 +13869,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongBoxGauss(length, width, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14005,7 +13998,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongBoxLorentz(length, width, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14134,7 +14127,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple1Gauss(length, width, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14263,7 +14256,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple1Lorentz(length, width, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14395,7 +14388,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple2Gauss(length, width, height, asymmetry)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14535,7 +14528,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple2Lorentz(length, width, height, asymmetry)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14661,7 +14654,7 @@ class FormFactorLorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLorentz(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14777,7 +14770,7 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
this = _libBornAgainCore.new_FormFactorPrism3(base_edge, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14859,7 +14852,7 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
this = _libBornAgainCore.new_FormFactorPrism6(base_edge, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -14944,7 +14937,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorPyramid(base_edge, height, alpha)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15049,7 +15042,7 @@ class FormFactorRipple1(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorRipple1(length, width, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15181,7 +15174,7 @@ class FormFactorRipple2(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorRipple2(length, width, height, asymmetry)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15306,7 +15299,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorSphereGaussianRadius(mean, sigma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15391,7 +15384,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorSphereLogNormalRadius(mean, scale_param, n_samples)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15476,7 +15469,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorSphereUniformRadius(mean, full_width)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15575,7 +15568,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorTetrahedron(base_edge, height, alpha)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15677,7 +15670,7 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorTruncatedCube(length, removed_length)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15773,7 +15766,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorTruncatedSphere(radius, height, dh)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -15906,7 +15899,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorTruncatedSpheroid(radius, height, height_flattening, dh)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -16033,7 +16026,7 @@ class FormFactorWeighted(IFormFactor):
this = _libBornAgainCore.new_FormFactorWeighted()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FormFactorWeighted
__del__ = lambda self: None
@@ -16449,7 +16442,7 @@ class SimulationOptions(_object):
this = _libBornAgainCore.new_SimulationOptions()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def isIntegrate(self):
@@ -16647,7 +16640,7 @@ class GISASSimulation(Simulation):
this = _libBornAgainCore.new_GISASSimulation(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_GISASSimulation
__del__ = lambda self: None
@@ -17313,9 +17306,7 @@ class IHistogram(_object):
"""createHistogram(IntensityData source) -> IHistogram"""
return _libBornAgainCore.IHistogram_createHistogram(source)
- if _newclass:
- createHistogram = staticmethod(createHistogram)
- __swig_getmethods__["createHistogram"] = lambda x: createHistogram
+ createHistogram = staticmethod(createHistogram)
def createFrom(*args):
"""
@@ -17324,9 +17315,7 @@ class IHistogram(_object):
"""
return _libBornAgainCore.IHistogram_createFrom(*args)
- if _newclass:
- createFrom = staticmethod(createFrom)
- __swig_getmethods__["createFrom"] = lambda x: createFrom
+ createFrom = staticmethod(createFrom)
def createOutputData(self, *args):
"""
@@ -17478,7 +17467,7 @@ class Histogram1D(IHistogram):
this = _libBornAgainCore.new_Histogram1D(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -17585,9 +17574,7 @@ class Histogram1D(IHistogram):
"""dynamicCast(IHistogram pHistogram) -> Histogram1D"""
return _libBornAgainCore.Histogram1D_dynamicCast(pHistogram)
- if _newclass:
- dynamicCast = staticmethod(dynamicCast)
- __swig_getmethods__["dynamicCast"] = lambda x: dynamicCast
+ dynamicCast = staticmethod(dynamicCast)
__swig_destroy__ = _libBornAgainCore.delete_Histogram1D
__del__ = lambda self: None
Histogram1D_swigregister = _libBornAgainCore.Histogram1D_swigregister
@@ -17633,7 +17620,7 @@ class Histogram2D(IHistogram):
this = _libBornAgainCore.new_Histogram2D(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -17759,9 +17746,7 @@ class Histogram2D(IHistogram):
"""dynamicCast(IHistogram pHistogram) -> Histogram2D"""
return _libBornAgainCore.Histogram2D_dynamicCast(pHistogram)
- if _newclass:
- dynamicCast = staticmethod(dynamicCast)
- __swig_getmethods__["dynamicCast"] = lambda x: dynamicCast
+ dynamicCast = staticmethod(dynamicCast)
__swig_destroy__ = _libBornAgainCore.delete_Histogram2D
__del__ = lambda self: None
Histogram2D_swigregister = _libBornAgainCore.Histogram2D_swigregister
@@ -17807,7 +17792,7 @@ class HomogeneousMaterial(INamed):
this = _libBornAgainCore.new_HomogeneousMaterial(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_HomogeneousMaterial
__del__ = lambda self: None
@@ -17824,34 +17809,24 @@ class HomogeneousMaterial(INamed):
return _libBornAgainCore.HomogeneousMaterial_inverted(self)
- def refractiveIndex(self):
+ def refractiveIndex(self, wavelength):
"""
- refractiveIndex(HomogeneousMaterial self) -> complex_t
+ refractiveIndex(HomogeneousMaterial self, double wavelength) -> complex_t
complex_t HomogeneousMaterial::refractiveIndex() const
"""
- return _libBornAgainCore.HomogeneousMaterial_refractiveIndex(self)
+ return _libBornAgainCore.HomogeneousMaterial_refractiveIndex(self, wavelength)
- def refractiveIndex2(self):
+ def refractiveIndex2(self, wavelength):
"""
- refractiveIndex2(HomogeneousMaterial self) -> complex_t
+ refractiveIndex2(HomogeneousMaterial self, double wavelength) -> complex_t
complex_t HomogeneousMaterial::refractiveIndex2() const
"""
- return _libBornAgainCore.HomogeneousMaterial_refractiveIndex2(self)
-
-
- def setRefractiveIndex(self, refractive_index):
- """
- setRefractiveIndex(HomogeneousMaterial self, complex_t const refractive_index)
-
- void HomogeneousMaterial::setRefractiveIndex(const complex_t refractive_index)
-
- """
- return _libBornAgainCore.HomogeneousMaterial_setRefractiveIndex(self, refractive_index)
+ return _libBornAgainCore.HomogeneousMaterial_refractiveIndex2(self, wavelength)
def isScalarMaterial(self):
@@ -17888,26 +17863,14 @@ class HomogeneousMaterial(INamed):
return _libBornAgainCore.HomogeneousMaterial_magnetization(self)
- def setMagnetization(self, magnetization):
- """
- setMagnetization(HomogeneousMaterial self, kvector_t magnetization)
-
- void HomogeneousMaterial::setMagnetization(const kvector_t magnetization)
+ def materialData(self):
+ """materialData(HomogeneousMaterial self) -> complex_t"""
+ return _libBornAgainCore.HomogeneousMaterial_materialData(self)
- Set the magnetizationd (in A/m)
- """
- return _libBornAgainCore.HomogeneousMaterial_setMagnetization(self, magnetization)
-
-
- def scalarSLD(self, wavevectors):
- """
- scalarSLD(HomogeneousMaterial self, WavevectorInfo wavevectors) -> complex_t
-
- complex_t HomogeneousMaterial::scalarSLD(const WavevectorInfo &wavevectors) const
-
- """
- return _libBornAgainCore.HomogeneousMaterial_scalarSLD(self, wavevectors)
+ def scalarSubtrSLD(self, wavevectors):
+ """scalarSubtrSLD(HomogeneousMaterial self, WavevectorInfo wavevectors) -> complex_t"""
+ return _libBornAgainCore.HomogeneousMaterial_scalarSubtrSLD(self, wavevectors)
def transformedMaterial(self, transform):
@@ -18500,7 +18463,7 @@ class IInterferenceFunction(ISample):
this = _libBornAgainCore.new_IInterferenceFunction(_self, )
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def __disown__(self):
self.this.disown()
@@ -18841,7 +18804,7 @@ class ParticleLimits(_object):
this = _libBornAgainCore.new_ParticleLimits()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleLimits
__del__ = lambda self: None
@@ -19142,17 +19105,13 @@ class IRotation(ISample):
"""createRotation(Transform3D const & transform) -> IRotation"""
return _libBornAgainCore.IRotation_createRotation(transform)
- if _newclass:
- createRotation = staticmethod(createRotation)
- __swig_getmethods__["createRotation"] = lambda x: createRotation
+ createRotation = staticmethod(createRotation)
def createIdentity():
"""createIdentity() -> IRotation"""
return _libBornAgainCore.IRotation_createIdentity()
- if _newclass:
- createIdentity = staticmethod(createIdentity)
- __swig_getmethods__["createIdentity"] = lambda x: createIdentity
+ createIdentity = staticmethod(createIdentity)
__swig_destroy__ = _libBornAgainCore.delete_IRotation
__del__ = lambda self: None
@@ -19277,7 +19236,7 @@ class RotationX(IRotation):
this = _libBornAgainCore.new_RotationX(angle)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -19373,7 +19332,7 @@ class RotationY(IRotation):
this = _libBornAgainCore.new_RotationY(angle)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -19470,7 +19429,7 @@ class RotationZ(IRotation):
this = _libBornAgainCore.new_RotationZ(angle)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -19572,7 +19531,7 @@ class RotationEuler(IRotation):
this = _libBornAgainCore.new_RotationEuler(alpha, beta, gamma)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -19730,7 +19689,7 @@ class SimpleSelectionRule(ISelectionRule):
this = _libBornAgainCore.new_SimpleSelectionRule(a, b, c, modulus)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SimpleSelectionRule
__del__ = lambda self: None
@@ -19788,7 +19747,7 @@ class Instrument(INode):
this = _libBornAgainCore.new_Instrument(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Instrument
__del__ = lambda self: None
@@ -20153,33 +20112,25 @@ class IntensityDataIOFactory(_object):
"""readOutputData(std::string const & file_name) -> IntensityData"""
return _libBornAgainCore.IntensityDataIOFactory_readOutputData(file_name)
- if _newclass:
- readOutputData = staticmethod(readOutputData)
- __swig_getmethods__["readOutputData"] = lambda x: readOutputData
+ readOutputData = staticmethod(readOutputData)
def readIntensityData(file_name):
"""readIntensityData(std::string const & file_name) -> IHistogram"""
return _libBornAgainCore.IntensityDataIOFactory_readIntensityData(file_name)
- if _newclass:
- readIntensityData = staticmethod(readIntensityData)
- __swig_getmethods__["readIntensityData"] = lambda x: readIntensityData
+ readIntensityData = staticmethod(readIntensityData)
def writeOutputData(data, file_name):
"""writeOutputData(IntensityData data, std::string const & file_name)"""
return _libBornAgainCore.IntensityDataIOFactory_writeOutputData(data, file_name)
- if _newclass:
- writeOutputData = staticmethod(writeOutputData)
- __swig_getmethods__["writeOutputData"] = lambda x: writeOutputData
+ writeOutputData = staticmethod(writeOutputData)
def writeIntensityData(histogram, file_name):
"""writeIntensityData(IHistogram histogram, std::string const & file_name)"""
return _libBornAgainCore.IntensityDataIOFactory_writeIntensityData(histogram, file_name)
- if _newclass:
- writeIntensityData = staticmethod(writeIntensityData)
- __swig_getmethods__["writeIntensityData"] = lambda x: writeIntensityData
+ writeIntensityData = staticmethod(writeIntensityData)
def __init__(self):
"""
@@ -20195,7 +20146,7 @@ class IntensityDataIOFactory(_object):
this = _libBornAgainCore.new_IntensityDataIOFactory()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityDataIOFactory
__del__ = lambda self: None
@@ -20259,7 +20210,7 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunction1DLattice(length, xi)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction1DLattice
__del__ = lambda self: None
@@ -20384,7 +20335,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunctionRadialParaCrystal(peak_distance, damping_length)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -20594,7 +20545,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunction2DLattice(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DLattice
__del__ = lambda self: None
@@ -20630,9 +20581,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DLattice_createSquare(lattice_length, xi)
- if _newclass:
- createSquare = staticmethod(createSquare)
- __swig_getmethods__["createSquare"] = lambda x: createSquare
+ createSquare = staticmethod(createSquare)
def createHexagonal(lattice_length, xi=0.0):
"""
@@ -20641,9 +20590,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DLattice_createHexagonal(lattice_length, xi)
- if _newclass:
- createHexagonal = staticmethod(createHexagonal)
- __swig_getmethods__["createHexagonal"] = lambda x: createHexagonal
+ createHexagonal = staticmethod(createHexagonal)
def setDecayFunction(self, decay):
"""
@@ -20813,7 +20760,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunction2DParaCrystal(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DParaCrystal
__del__ = lambda self: None
@@ -20851,9 +20798,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_createSquare(lattice_length, damping_length, domain_size_1, domain_size_2)
- if _newclass:
- createSquare = staticmethod(createSquare)
- __swig_getmethods__["createSquare"] = lambda x: createSquare
+ createSquare = staticmethod(createSquare)
def createHexagonal(lattice_length, damping_length=0.0, domain_size_1=0.0, domain_size_2=0.0):
"""
@@ -20864,9 +20809,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_createHexagonal(lattice_length, damping_length, domain_size_1, domain_size_2)
- if _newclass:
- createHexagonal = staticmethod(createHexagonal)
- __swig_getmethods__["createHexagonal"] = lambda x: createHexagonal
+ createHexagonal = staticmethod(createHexagonal)
def setDomainSizes(self, size_1, size_2):
"""
@@ -21072,7 +21015,7 @@ class InterferenceFunctionNone(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunctionNone()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -21220,7 +21163,7 @@ class SphericalDetector(IDetector2D):
this = _libBornAgainCore.new_SphericalDetector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -21296,7 +21239,7 @@ class SphericalPixel(IPixel):
this = _libBornAgainCore.new_SphericalPixel(alpha_bin, phi_bin)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SphericalPixel
__del__ = lambda self: None
@@ -21385,7 +21328,7 @@ class IsGISAXSDetector(SphericalDetector):
this = _libBornAgainCore.new_IsGISAXSDetector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -21445,7 +21388,7 @@ class Lattice(INode):
this = _libBornAgainCore.new_Lattice(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Lattice
__del__ = lambda self: None
@@ -21598,17 +21541,13 @@ class Lattice(INode):
"""createFCCLattice(double a) -> Lattice"""
return _libBornAgainCore.Lattice_createFCCLattice(a)
- if _newclass:
- createFCCLattice = staticmethod(createFCCLattice)
- __swig_getmethods__["createFCCLattice"] = lambda x: createFCCLattice
+ createFCCLattice = staticmethod(createFCCLattice)
def createTrigonalLattice(a, c):
"""createTrigonalLattice(double a, double c) -> Lattice"""
return _libBornAgainCore.Lattice_createTrigonalLattice(a, c)
- if _newclass:
- createTrigonalLattice = staticmethod(createTrigonalLattice)
- __swig_getmethods__["createTrigonalLattice"] = lambda x: createTrigonalLattice
+ createTrigonalLattice = staticmethod(createTrigonalLattice)
def onChange(self):
"""
@@ -21668,7 +21607,7 @@ class Lattice1DParameters(_object):
this = _libBornAgainCore.new_Lattice1DParameters(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_setmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_set
__swig_getmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_get
@@ -21807,7 +21746,7 @@ class BasicLattice(Lattice2D):
this = _libBornAgainCore.new_BasicLattice(length1, length2, angle, rotation_angle)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -21900,7 +21839,7 @@ class SquareLattice(Lattice2D):
this = _libBornAgainCore.new_SquareLattice(length, rotation_angle)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -21993,7 +21932,7 @@ class HexagonalLattice(Lattice2D):
this = _libBornAgainCore.new_HexagonalLattice(length, rotation_angle)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -22108,7 +22047,7 @@ class Layer(ISample):
this = _libBornAgainCore.new_Layer(material, thickness)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Layer
__del__ = lambda self: None
@@ -22191,28 +22130,6 @@ class Layer(ISample):
return _libBornAgainCore.Layer_setMaterial(self, material)
- def refractiveIndex(self):
- """
- refractiveIndex(Layer self) -> complex_t
-
- complex_t Layer::refractiveIndex() const
-
- """
- return _libBornAgainCore.Layer_refractiveIndex(self)
-
-
- def refractiveIndex2(self):
- """
- refractiveIndex2(Layer self) -> complex_t
-
- complex_t Layer::refractiveIndex2() const
-
- squared refractive index
-
- """
- return _libBornAgainCore.Layer_refractiveIndex2(self)
-
-
def addLayout(self, decoration):
"""
addLayout(Layer self, ILayout decoration)
@@ -22370,7 +22287,7 @@ class LayerRoughness(ISample):
this = _libBornAgainCore.new_LayerRoughness(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -22531,7 +22448,7 @@ class Line(IShape2D):
this = _libBornAgainCore.new_Line(x1, y1, x2, y2)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -22597,7 +22514,7 @@ class VerticalLine(IShape2D):
this = _libBornAgainCore.new_VerticalLine(x)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -22673,7 +22590,7 @@ class HorizontalLine(IShape2D):
this = _libBornAgainCore.new_HorizontalLine(y)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -22743,7 +22660,7 @@ class MesoCrystal(IParticle):
this = _libBornAgainCore.new_MesoCrystal(particle_structure, form_factor)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_MesoCrystal
__del__ = lambda self: None
@@ -22830,7 +22747,7 @@ class MultiLayer(ISample):
this = _libBornAgainCore.new_MultiLayer()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_MultiLayer
__del__ = lambda self: None
@@ -23239,7 +23156,7 @@ class OffSpecSimulation(Simulation):
this = _libBornAgainCore.new_OffSpecSimulation(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_OffSpecSimulation
__del__ = lambda self: None
@@ -23367,7 +23284,7 @@ class IntensityData(_object):
this = _libBornAgainCore.new_IntensityData()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityData
__del__ = lambda self: None
@@ -23758,9 +23675,10 @@ class IntensityData(_object):
return _libBornAgainCore.IntensityData___isub__(self, right)
- def __idiv__(self, right):
- """__idiv__(IntensityData self, IntensityData right) -> IntensityData"""
- return _libBornAgainCore.IntensityData___idiv__(self, right)
+ def __itruediv__(self, *args):
+ return _libBornAgainCore.IntensityData___itruediv__(self, *args)
+ __idiv__ = __itruediv__
+
def __imul__(self, right):
@@ -23850,7 +23768,7 @@ class ParameterDistribution(IParameterized):
this = _libBornAgainCore.new_ParameterDistribution(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParameterDistribution
__del__ = lambda self: None
@@ -24000,7 +23918,7 @@ class ParameterPool(ICloneable):
this = _libBornAgainCore.new_ParameterPool()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParameterPool
__del__ = lambda self: None
@@ -24213,7 +24131,7 @@ class ParameterSample(_object):
this = _libBornAgainCore.new_ParameterSample(_value, _weight)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_setmethods__["value"] = _libBornAgainCore.ParameterSample_value_set
__swig_getmethods__["value"] = _libBornAgainCore.ParameterSample_value_get
@@ -24387,7 +24305,7 @@ class ParameterSampleVector(_object):
this = _libBornAgainCore.new_ParameterSampleVector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -24473,7 +24391,7 @@ class Particle(IParticle):
this = _libBornAgainCore.new_Particle(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -24534,16 +24452,6 @@ class Particle(IParticle):
return _libBornAgainCore.Particle_material(self)
- def refractiveIndex(self):
- """
- refractiveIndex(Particle self) -> complex_t
-
- complex_t Particle::refractiveIndex() const
-
- """
- return _libBornAgainCore.Particle_refractiveIndex(self)
-
-
def setFormFactor(self, form_factor):
"""
setFormFactor(Particle self, IFormFactor form_factor)
@@ -24601,7 +24509,7 @@ class ParticleComposition(IParticle):
this = _libBornAgainCore.new_ParticleComposition(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleComposition
__del__ = lambda self: None
@@ -24744,7 +24652,7 @@ class ParticleCoreShell(IParticle):
this = _libBornAgainCore.new_ParticleCoreShell(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleCoreShell
__del__ = lambda self: None
@@ -24849,7 +24757,7 @@ class ParticleDistribution(IAbstractParticle):
this = _libBornAgainCore.new_ParticleDistribution(prototype, par_distr)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -24974,7 +24882,7 @@ class ParticleLayout(ILayout):
this = _libBornAgainCore.new_ParticleLayout(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleLayout
__del__ = lambda self: None
@@ -25149,7 +25057,7 @@ class Polygon(IShape2D):
this = _libBornAgainCore.new_Polygon(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Polygon
__del__ = lambda self: None
@@ -25233,7 +25141,7 @@ class RealParameter(IParameterReal):
this = _libBornAgainCore.new_RealParameter(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self, *args):
@@ -25390,7 +25298,7 @@ class Rectangle(IShape2D):
this = _libBornAgainCore.new_Rectangle(xlow, ylow, xup, yup)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -25506,7 +25414,7 @@ class RectangularDetector(IDetector2D):
this = _libBornAgainCore.new_RectangularDetector(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def clone(self):
@@ -25767,7 +25675,7 @@ class RectangularPixel(IPixel):
this = _libBornAgainCore.new_RectangularPixel(corner_pos, width, height)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_RectangularPixel
__del__ = lambda self: None
@@ -25854,7 +25762,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
this = _libBornAgainCore.new_ResolutionFunction2DGaussian(sigma_x, sigma_y)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def evaluateCDF(self, x, y):
@@ -25945,7 +25853,7 @@ class SpecularSimulation(ICloneable, IParameterized):
this = _libBornAgainCore.new_SpecularSimulation(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SpecularSimulation
__del__ = lambda self: None
@@ -26134,7 +26042,7 @@ class ThreadInfo(_object):
this = _libBornAgainCore.new_ThreadInfo()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_setmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_set
__swig_getmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_get
@@ -26183,7 +26091,7 @@ class SampleBuilderFactoryTemp(_object):
this = _libBornAgainCore.new_SampleBuilderFactoryTemp()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def createItem(self, item_key):
@@ -26287,7 +26195,7 @@ class SampleBuilderFactory(SampleBuilderFactoryTemp):
this = _libBornAgainCore.new_SampleBuilderFactory()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def createSample(self, name):
@@ -26332,7 +26240,7 @@ class SimulationFactoryTemp(_object):
this = _libBornAgainCore.new_SimulationFactoryTemp()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def createItem(self, item_key):
@@ -26436,7 +26344,7 @@ class SimulationFactory(SimulationFactoryTemp):
this = _libBornAgainCore.new_SimulationFactory()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SimulationFactory
__del__ = lambda self: None
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index a5cf7818250787c82f45dc80106d5c6ef6444876..97db633e504ee1d0f6d3df88310ea03bd83c166c 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.8
+ * Version 3.0.12
*
* 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
@@ -107,9 +107,11 @@ template <typename T> T SwigValueInit() {
#endif
/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# ifndef GCC_HASCLASSVISIBILITY
-# define GCC_HASCLASSVISIBILITY
+#if defined(__GNUC__)
+# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+# ifndef GCC_HASCLASSVISIBILITY
+# define GCC_HASCLASSVISIBILITY
+# endif
# endif
#endif
@@ -669,16 +671,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
char d = *(c++);
unsigned char uu;
if ((d >= '0') && (d <= '9'))
- uu = ((d - '0') << 4);
+ uu = (unsigned char)((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f'))
- uu = ((d - ('a'-10)) << 4);
+ uu = (unsigned char)((d - ('a'-10)) << 4);
else
return (char *) 0;
d = *(c++);
if ((d >= '0') && (d <= '9'))
- uu |= (d - '0');
+ uu |= (unsigned char)(d - '0');
else if ((d >= 'a') && (d <= 'f'))
- uu |= (d - ('a'-10));
+ uu |= (unsigned char)(d - ('a'-10));
else
return (char *) 0;
*u = uu;
@@ -861,10 +863,6 @@ PyString_FromFormat(const char *fmt, ...) {
}
#endif
-/* Add PyObject_Del for old Pythons */
-#if PY_VERSION_HEX < 0x01060000
-# define PyObject_Del(op) PyMem_DEL((op))
-#endif
#ifndef PyObject_DEL
# define PyObject_DEL PyObject_Del
#endif
@@ -979,6 +977,7 @@ typedef destructor freefunc;
#if PY_VERSION_HEX < 0x03020000
#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
+#define Py_hash_t long
#endif
/* -----------------------------------------------------------------------------
@@ -1927,7 +1926,6 @@ SwigPyObject_TypeOnce(void) {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX >= 0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else
@@ -1938,7 +1936,7 @@ SwigPyObject_TypeOnce(void) {
sizeof(SwigPyObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)SwigPyObject_dealloc, /* tp_dealloc */
- 0, /* tp_print */
+ 0, /* tp_print */
#if PY_VERSION_HEX < 0x02020000
(getattrfunc)SwigPyObject_getattr, /* tp_getattr */
#else
@@ -1946,7 +1944,7 @@ SwigPyObject_TypeOnce(void) {
#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 */
+ 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
#else
(cmpfunc)SwigPyObject_compare, /* tp_compare */
#endif
@@ -1956,7 +1954,7 @@ SwigPyObject_TypeOnce(void) {
0, /* tp_as_mapping */
(hashfunc)0, /* tp_hash */
(ternaryfunc)0, /* tp_call */
- 0, /* tp_str */
+ 0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
@@ -2119,7 +2117,6 @@ SwigPyPacked_TypeOnce(void) {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX>=0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else
@@ -3787,7 +3784,7 @@ static swig_module_info swig_module = {swig_types, 308, 0, 0, 0, 0};
#endif
#define SWIG_name "_libBornAgainCore"
-#define SWIGVERSION 0x030008
+#define SWIGVERSION 0x030012
#define SWIG_VERSION SWIGVERSION
@@ -3886,6 +3883,7 @@ namespace swig {
#endif
+#include <typeinfo>
#include <stdexcept>
@@ -4035,7 +4033,7 @@ SWIG_AsVal_double (PyObject *obj, double *val)
return SWIG_OK;
#if PY_VERSION_HEX < 0x03000000
} else if (PyInt_Check(obj)) {
- if (val) *val = PyInt_AsLong(obj);
+ if (val) *val = (double) PyInt_AsLong(obj);
return SWIG_OK;
#endif
} else if (PyLong_Check(obj)) {
@@ -4156,23 +4154,109 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
}
+#include <limits.h>
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+# define LLONG_MAX __LONG_LONG_MAX__
+# define LLONG_MIN (-LLONG_MAX - 1LL)
+# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
+#endif
+
+
+#if defined(LLONG_MAX) && !defined(SWIG_LONG_LONG_AVAILABLE)
+# define SWIG_LONG_LONG_AVAILABLE
+#endif
+
+
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_long_SS_long (PyObject *obj, unsigned long long *val)
+{
+ int res = SWIG_TypeError;
+ if (PyLong_Check(obj)) {
+ unsigned long long v = PyLong_AsUnsignedLongLong(obj);
+ if (!PyErr_Occurred()) {
+ if (val) *val = v;
+ return SWIG_OK;
+ } else {
+ PyErr_Clear();
+ res = SWIG_OverflowError;
+ }
+ } else {
+ unsigned long v;
+ res = SWIG_AsVal_unsigned_SS_long (obj,&v);
+ if (SWIG_IsOK(res)) {
+ if (val) *val = v;
+ return res;
+ }
+ }
+#ifdef SWIG_PYTHON_CAST_MODE
+ {
+ const double mant_max = 1LL << DBL_MANT_DIG;
+ double d;
+ res = SWIG_AsVal_double (obj,&d);
+ if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, 0, mant_max))
+ return SWIG_OverflowError;
+ if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) {
+ if (val) *val = (unsigned long long)(d);
+ return SWIG_AddCast(res);
+ }
+ res = SWIG_TypeError;
+ }
+#endif
+ return res;
+}
+#endif
+
+
SWIGINTERNINLINE int
SWIG_AsVal_size_t (PyObject * obj, size_t *val)
{
- unsigned long v;
- int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
- if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
+ int res = SWIG_TypeError;
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(size_t) <= sizeof(unsigned long)) {
+#endif
+ unsigned long v;
+ res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else if (sizeof(size_t) <= sizeof(unsigned long long)) {
+ unsigned long long v;
+ res = SWIG_AsVal_unsigned_SS_long_SS_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
+ }
+#endif
return res;
}
- #define SWIG_From_long PyLong_FromLong
+ #define SWIG_From_long PyInt_FromLong
+
+
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERNINLINE PyObject*
+SWIG_From_long_SS_long (long long value)
+{
+ return ((value < LONG_MIN) || (value > LONG_MAX)) ?
+ PyLong_FromLongLong(value) : PyInt_FromLong(static_cast< long >(value));
+}
+#endif
SWIGINTERNINLINE PyObject *
SWIG_From_ptrdiff_t (ptrdiff_t value)
{
- return SWIG_From_long (static_cast< long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(ptrdiff_t) <= sizeof(long)) {
+#endif
+ return SWIG_From_long (static_cast< long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else {
+ /* assume sizeof(ptrdiff_t) <= sizeof(long long) */
+ return SWIG_From_long_SS_long (static_cast< long long >(value));
+ }
+#endif
}
@@ -4226,12 +4310,65 @@ SWIG_AsVal_long (PyObject *obj, long* val)
}
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERN int
+SWIG_AsVal_long_SS_long (PyObject *obj, long long *val)
+{
+ int res = SWIG_TypeError;
+ if (PyLong_Check(obj)) {
+ long long v = PyLong_AsLongLong(obj);
+ if (!PyErr_Occurred()) {
+ if (val) *val = v;
+ return SWIG_OK;
+ } else {
+ PyErr_Clear();
+ res = SWIG_OverflowError;
+ }
+ } else {
+ long v;
+ res = SWIG_AsVal_long (obj,&v);
+ if (SWIG_IsOK(res)) {
+ if (val) *val = v;
+ return res;
+ }
+ }
+#ifdef SWIG_PYTHON_CAST_MODE
+ {
+ const double mant_max = 1LL << DBL_MANT_DIG;
+ const double mant_min = -mant_max;
+ double d;
+ res = SWIG_AsVal_double (obj,&d);
+ if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, mant_min, mant_max))
+ return SWIG_OverflowError;
+ if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, mant_min, mant_max)) {
+ if (val) *val = (long long)(d);
+ return SWIG_AddCast(res);
+ }
+ res = SWIG_TypeError;
+ }
+#endif
+ return res;
+}
+#endif
+
+
SWIGINTERNINLINE int
SWIG_AsVal_ptrdiff_t (PyObject * obj, ptrdiff_t *val)
{
- long v;
- int res = SWIG_AsVal_long (obj, val ? &v : 0);
- if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
+ int res = SWIG_TypeError;
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(ptrdiff_t) <= sizeof(long)) {
+#endif
+ long v;
+ res = SWIG_AsVal_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else if (sizeof(ptrdiff_t) <= sizeof(long long)) {
+ long long v;
+ res = SWIG_AsVal_long_SS_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
+ }
+#endif
return res;
}
@@ -4276,8 +4413,21 @@ namespace swig {
return traits<typename noconst_traits<Type >::noconst_type >::type_name();
}
- template <class Type>
- struct traits_info {
+ template <class Type> struct traits_info {
+ static swig_type_info *type_query(std::string name) {
+ name += " *";
+ return SWIG_TypeQuery(name.c_str());
+ }
+ static swig_type_info *type_info() {
+ static swig_type_info *info = type_query(type_name<Type>());
+ return info;
+ }
+ };
+
+ /*
+ Partial specialization for pointers (traits_info)
+ */
+ template <class Type> struct traits_info<Type *> {
static swig_type_info *type_query(std::string name) {
name += " *";
return SWIG_TypeQuery(name.c_str());
@@ -4294,7 +4444,7 @@ namespace swig {
}
/*
- Partial specialization for pointers
+ Partial specialization for pointers (traits)
*/
template <class Type> struct traits <Type *> {
typedef pointer_category category;
@@ -4364,7 +4514,8 @@ namespace swig {
struct traits_asptr {
static int asptr(PyObject *obj, Type **val) {
Type *p;
- int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
+ swig_type_info *descriptor = type_info<Type>();
+ int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
if (SWIG_IsOK(res)) {
if (val) *val = p;
}
@@ -4512,7 +4663,7 @@ namespace swig {
namespace std {
template <>
- struct less <PyObject *>: public binary_function<PyObject *, PyObject *, bool>
+ struct less <PyObject *>
{
bool
operator()(PyObject * v, PyObject *w) const
@@ -4537,7 +4688,7 @@ namespace std {
};
template <>
- struct less <swig::SwigPtr_PyObject>: public binary_function<swig::SwigPtr_PyObject, swig::SwigPtr_PyObject, bool>
+ struct less <swig::SwigPtr_PyObject>
{
bool
operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
@@ -4547,7 +4698,7 @@ namespace std {
};
template <>
- struct less <swig::SwigVar_PyObject>: public binary_function<swig::SwigVar_PyObject, swig::SwigVar_PyObject, bool>
+ struct less <swig::SwigVar_PyObject>
{
bool
operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const
@@ -4610,7 +4761,7 @@ namespace swig {
if (step == 0) {
throw std::invalid_argument("slice step cannot be zero");
} else if (step > 0) {
- // Required range: 0 <= i < size, 0 <= j < size
+ // Required range: 0 <= i < size, 0 <= j < size, i <= j
if (i < 0) {
ii = 0;
} else if (i < (Difference)size) {
@@ -4618,13 +4769,15 @@ namespace swig {
} else if (insert && (i >= (Difference)size)) {
ii = (Difference)size;
}
- if ( j < 0 ) {
+ if (j < 0) {
jj = 0;
} else {
jj = (j < (Difference)size) ? j : (Difference)size;
}
+ if (jj < ii)
+ jj = ii;
} else {
- // Required range: -1 <= i < size-1, -1 <= j < size-1
+ // Required range: -1 <= i < size-1, -1 <= j < size-1, i >= j
if (i < -1) {
ii = -1;
} else if (i < (Difference) size) {
@@ -4637,6 +4790,8 @@ namespace swig {
} else {
jj = (j < (Difference)size ) ? j : (Difference)(size-1);
}
+ if (ii < jj)
+ ii = jj;
}
}
@@ -4662,6 +4817,13 @@ namespace swig {
seq->erase(position);
}
+ template <class Sequence>
+ struct traits_reserve {
+ static void reserve(Sequence & /*seq*/, typename Sequence::size_type /*n*/) {
+ // This should be specialized for types that support reserve
+ }
+ };
+
template <class Sequence, class Difference>
inline Sequence*
getslice(const Sequence* self, Difference i, Difference j, Py_ssize_t step) {
@@ -4679,6 +4841,7 @@ namespace swig {
return new Sequence(sb, se);
} else {
Sequence *sequence = new Sequence();
+ swig::traits_reserve<Sequence>::reserve(*sequence, (jj - ii + step - 1) / step);
typename Sequence::const_iterator it = sb;
while (it!=se) {
sequence->push_back(*it);
@@ -4689,17 +4852,16 @@ namespace swig {
}
} else {
Sequence *sequence = new Sequence();
- if (ii > jj) {
- typename Sequence::const_reverse_iterator sb = self->rbegin();
- typename Sequence::const_reverse_iterator se = self->rbegin();
- std::advance(sb,size-ii-1);
- std::advance(se,size-jj-1);
- typename Sequence::const_reverse_iterator it = sb;
- while (it!=se) {
- sequence->push_back(*it);
- for (Py_ssize_t c=0; c<-step && it!=se; ++c)
- it++;
- }
+ swig::traits_reserve<Sequence>::reserve(*sequence, (ii - jj - step - 1) / -step);
+ typename Sequence::const_reverse_iterator sb = self->rbegin();
+ typename Sequence::const_reverse_iterator se = self->rbegin();
+ std::advance(sb,size-ii-1);
+ std::advance(se,size-jj-1);
+ typename Sequence::const_reverse_iterator it = sb;
+ while (it!=se) {
+ sequence->push_back(*it);
+ for (Py_ssize_t c=0; c<-step && it!=se; ++c)
+ it++;
}
return sequence;
}
@@ -4713,12 +4875,11 @@ namespace swig {
Difference jj = 0;
swig::slice_adjust(i, j, step, size, ii, jj, true);
if (step > 0) {
- if (jj < ii)
- jj = ii;
if (step == 1) {
size_t ssize = jj - ii;
if (ssize <= is.size()) {
// expanding/staying the same size
+ swig::traits_reserve<Sequence>::reserve(*self, self->size() - ssize + is.size());
typename Sequence::iterator sb = self->begin();
typename InputSeq::const_iterator isit = is.begin();
std::advance(sb,ii);
@@ -4752,8 +4913,6 @@ namespace swig {
}
}
} else {
- if (jj > ii)
- jj = ii;
size_t replacecount = (ii - jj - step - 1) / -step;
if (is.size() != replacecount) {
char msg[1024];
@@ -4779,37 +4938,33 @@ namespace swig {
Difference jj = 0;
swig::slice_adjust(i, j, step, size, ii, jj, true);
if (step > 0) {
- if (jj > ii) {
- typename Sequence::iterator sb = self->begin();
- std::advance(sb,ii);
- if (step == 1) {
- typename Sequence::iterator se = self->begin();
- std::advance(se,jj);
- self->erase(sb,se);
- } else {
- typename Sequence::iterator it = sb;
- size_t delcount = (jj - ii + step - 1) / step;
- while (delcount) {
- it = self->erase(it);
- for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
- it++;
- delcount--;
- }
- }
- }
- } else {
- if (ii > jj) {
- typename Sequence::reverse_iterator sb = self->rbegin();
- std::advance(sb,size-ii-1);
- typename Sequence::reverse_iterator it = sb;
- size_t delcount = (ii - jj - step - 1) / -step;
+ typename Sequence::iterator sb = self->begin();
+ std::advance(sb,ii);
+ if (step == 1) {
+ typename Sequence::iterator se = self->begin();
+ std::advance(se,jj);
+ self->erase(sb,se);
+ } else {
+ typename Sequence::iterator it = sb;
+ size_t delcount = (jj - ii + step - 1) / step;
while (delcount) {
- it = typename Sequence::reverse_iterator(self->erase((++it).base()));
- for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
+ it = self->erase(it);
+ for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
it++;
delcount--;
}
}
+ } else {
+ typename Sequence::reverse_iterator sb = self->rbegin();
+ std::advance(sb,size-ii-1);
+ typename Sequence::reverse_iterator it = sb;
+ size_t delcount = (ii - jj - step - 1) / -step;
+ while (delcount) {
+ it = typename Sequence::reverse_iterator(self->erase((++it).base()));
+ for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
+ it++;
+ delcount--;
+ }
}
}
}
@@ -5308,8 +5463,8 @@ namespace swig {
static int asptr(PyObject *obj, sequence **seq) {
if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
sequence *p;
- if (::SWIG_ConvertPtr(obj,(void**)&p,
- swig::type_info<sequence>(),0) == SWIG_OK) {
+ swig_type_info *descriptor = swig::type_info<sequence>();
+ if (descriptor && SWIG_IsOK(::SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
if (seq) *seq = p;
return SWIG_OLDOBJ;
}
@@ -5348,7 +5503,7 @@ namespace swig {
#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS
swig_type_info *desc = swig::type_info<sequence>();
if (desc && desc->clientdata) {
- return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
+ return SWIG_InternalNewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
}
#endif
size_type size = seq.size();
@@ -5369,6 +5524,13 @@ namespace swig {
namespace swig {
+ template <class T>
+ struct traits_reserve<std::vector<T> > {
+ static void reserve(std::vector<T> &seq, typename std::vector<T>::size_type n) {
+ seq.reserve(n);
+ }
+ };
+
template <class T>
struct traits_asptr<std::vector<T> > {
static int asptr(PyObject *obj, std::vector<T> **vec) {
@@ -5411,14 +5573,33 @@ SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
return (value > LONG_MAX) ?
- PyLong_FromUnsignedLong(value) : PyLong_FromLong(static_cast< long >(value));
+ PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value));
+}
+
+
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERNINLINE PyObject*
+SWIG_From_unsigned_SS_long_SS_long (unsigned long long value)
+{
+ return (value > LONG_MAX) ?
+ PyLong_FromUnsignedLongLong(value) : PyInt_FromLong(static_cast< long >(value));
}
+#endif
SWIGINTERNINLINE PyObject *
SWIG_From_size_t (size_t value)
{
- return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(size_t) <= sizeof(unsigned long)) {
+#endif
+ return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else {
+ /* assume sizeof(size_t) <= sizeof(unsigned long long) */
+ return SWIG_From_unsigned_SS_long_SS_long (static_cast< unsigned long long >(value));
+ }
+#endif
}
SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_Sg____getslice__(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){
@@ -5602,16 +5783,6 @@ SWIGINTERN std::vector< std::vector< double > >::iterator std_vector_Sl_std_vect
SWIGINTERN std::vector< std::vector< double > >::iterator std_vector_Sl_std_vector_Sl_double_Sg__Sg__insert__SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::iterator pos,std::vector< std::vector< double > >::value_type const &x){ return self->insert(pos, x); }
SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg__insert__SWIG_1(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::iterator pos,std::vector< std::vector< double > >::size_type n,std::vector< std::vector< double > >::value_type const &x){ self->insert(pos, n, x); }
-#include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-# define LLONG_MAX __LONG_LONG_MAX__
-# define LLONG_MIN (-LLONG_MAX - 1LL)
-# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
-#endif
-
-
SWIGINTERN int
SWIG_AsVal_int (PyObject * obj, int *val)
{
@@ -5990,7 +6161,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/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/3.0.12/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
@@ -6140,13 +6311,18 @@ SWIGINTERN int
SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
{
#if PY_VERSION_HEX>=0x03000000
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+ if (PyBytes_Check(obj))
+#else
if (PyUnicode_Check(obj))
+#endif
#else
if (PyString_Check(obj))
#endif
{
char *cstr; Py_ssize_t len;
#if PY_VERSION_HEX>=0x03000000
+#if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
if (!alloc && cptr) {
/* We can't allow converting without allocation, since the internal
representation of string in Python 3 is UCS-2/UCS-4 but we require
@@ -6155,8 +6331,9 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
return SWIG_RuntimeError;
}
obj = PyUnicode_AsUTF8String(obj);
- PyBytes_AsStringAndSize(obj, &cstr, &len);
if(alloc) *alloc = SWIG_NEWOBJ;
+#endif
+ PyBytes_AsStringAndSize(obj, &cstr, &len);
#else
PyString_AsStringAndSize(obj, &cstr, &len);
#endif
@@ -6177,26 +6354,34 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
if (*alloc == SWIG_NEWOBJ)
#endif
{
- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1)));
+ *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
*alloc = SWIG_NEWOBJ;
} else {
*cptr = cstr;
*alloc = SWIG_OLDOBJ;
}
} else {
- #if PY_VERSION_HEX>=0x03000000
- assert(0); /* Should never reach here in Python 3 */
- #endif
+#if PY_VERSION_HEX>=0x03000000
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+ *cptr = PyBytes_AsString(obj);
+#else
+ assert(0); /* Should never reach here with Unicode strings in Python 3 */
+#endif
+#else
*cptr = SWIG_Python_str_AsChar(obj);
+#endif
}
}
if (psize) *psize = len + 1;
-#if PY_VERSION_HEX>=0x03000000
+#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
Py_XDECREF(obj);
#endif
return SWIG_OK;
} else {
#if defined(SWIG_PYTHON_2_UNICODE)
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+#error "Cannot use both SWIG_PYTHON_2_UNICODE and SWIG_PYTHON_STRICT_BYTE_CHAR at once"
+#endif
#if PY_VERSION_HEX<0x03000000
if (PyUnicode_Check(obj)) {
char *cstr; Py_ssize_t len;
@@ -6207,7 +6392,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
if (cptr) {
if (alloc) *alloc = SWIG_NEWOBJ;
- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1)));
+ *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
}
if (psize) *psize = len + 1;
@@ -6294,11 +6479,15 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
SWIG_InternalNewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
} else {
#if PY_VERSION_HEX >= 0x03000000
+#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));
#endif
@@ -7067,44 +7256,6 @@ struct SWIG_null_deleter {
#define SWIG_NO_NULL_DELETER_SWIG_BUILTIN_INIT
-
-SWIGINTERN int
-SWIG_AsVal_long_SS_long (PyObject *obj, long long *val)
-{
- int res = SWIG_TypeError;
- if (PyLong_Check(obj)) {
- long long v = PyLong_AsLongLong(obj);
- if (!PyErr_Occurred()) {
- if (val) *val = v;
- return SWIG_OK;
- } else {
- PyErr_Clear();
- res = SWIG_OverflowError;
- }
- } else {
- long v;
- res = SWIG_AsVal_long (obj,&v);
- if (SWIG_IsOK(res)) {
- if (val) *val = v;
- return res;
- }
- }
-#ifdef SWIG_PYTHON_CAST_MODE
- {
- const double mant_max = 1LL << DBL_MANT_DIG;
- const double mant_min = -mant_max;
- double d;
- res = SWIG_AsVal_double (obj,&d);
- if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, mant_min, mant_max)) {
- if (val) *val = (long long)(d);
- return SWIG_AddCast(res);
- }
- res = SWIG_TypeError;
- }
-#endif
- return res;
-}
-
SWIGINTERN RealParameter *IMultiLayerBuilder_registerParameter(IMultiLayerBuilder *self,std::string const &name,int64_t parpointer){
return &((*(self)).registerParameter(name, (double*)parpointer)); }
SWIGINTERN void IMultiLayerBuilder_setParameterValue(IMultiLayerBuilder *self,std::string const &name,double value){
@@ -7416,8 +7567,8 @@ ParameterPool *SwigDirector_IParameterized::createParameterTree() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
@@ -7444,8 +7595,8 @@ void SwigDirector_IParameterized::onChange() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
@@ -7480,8 +7631,8 @@ ParameterPool *SwigDirector_INode::createParameterTree() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
@@ -7508,8 +7659,8 @@ void SwigDirector_INode::onChange() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
@@ -7531,8 +7682,8 @@ void SwigDirector_INode::accept(INodeVisitor *visitor) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
@@ -7553,8 +7704,8 @@ std::string SwigDirector_INode::treeToString() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
@@ -7586,8 +7737,8 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_INode:
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
@@ -7616,8 +7767,8 @@ void SwigDirector_INode::setParent(INode const *newParent) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
@@ -7652,8 +7803,8 @@ ISample *SwigDirector_ISample::clone() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
@@ -7680,8 +7831,8 @@ void SwigDirector_ISample::transferToCPP() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
@@ -7706,8 +7857,8 @@ ParameterPool *SwigDirector_ISample::createParameterTree() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
@@ -7734,8 +7885,8 @@ void SwigDirector_ISample::onChange() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
@@ -7757,8 +7908,8 @@ void SwigDirector_ISample::accept(INodeVisitor *visitor) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
@@ -7779,8 +7930,8 @@ std::string SwigDirector_ISample::treeToString() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
@@ -7809,8 +7960,8 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_ISampl
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
@@ -7840,8 +7991,8 @@ void SwigDirector_ISample::setParent(INode const *newParent) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
@@ -7866,8 +8017,8 @@ HomogeneousMaterial const *SwigDirector_ISample::material() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
@@ -7900,14 +8051,14 @@ SwigDirector_IObservable::~SwigDirector_IObservable() {
void SwigDirector_IObservable::attachObserver(IObservable::observer_t obj) {
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&obj), SWIGTYPE_p_std__shared_ptrT_IObserver_t, 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new IObservable::observer_t((const IObservable::observer_t &)obj)), SWIGTYPE_p_std__shared_ptrT_IObserver_t, SWIG_POINTER_OWN | 0 );
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IObservable.__init__.");
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 0;
- const char * const swig_method_name = "attachObserver";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ const char *const swig_method_name = "attachObserver";
+ PyObject *method = swig_get_method(swig_method_index, swig_method_name);
swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"attachObserver", (char *)"(O)" ,(PyObject *)obj0);
@@ -7927,8 +8078,8 @@ void SwigDirector_IObservable::notifyObservers() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 1;
- const char * const swig_method_name = "notifyObservers";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ const char *const swig_method_name = "notifyObservers";
+ PyObject *method = swig_get_method(swig_method_index, swig_method_name);
swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "notifyObservers", NULL);
@@ -7960,8 +8111,8 @@ void SwigDirector_IFitObserver::notify(IObservable *subject) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 0;
- const char * const swig_method_name = "notify";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ const char *const swig_method_name = "notify";
+ PyObject *method = swig_get_method(swig_method_index, swig_method_name);
swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"notify", (char *)"(O)" ,(PyObject *)obj0);
@@ -7983,8 +8134,8 @@ void SwigDirector_IFitObserver::update(FitSuite *fit_suite) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 1;
- const char * const swig_method_name = "update";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"update", (char *)"(O)" ,(PyObject *)obj0);
@@ -8019,8 +8170,8 @@ ParameterPool *SwigDirector_IMultiLayerBuilder::createParameterTree() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
@@ -8047,8 +8198,8 @@ void SwigDirector_IMultiLayerBuilder::onChange() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
@@ -8073,8 +8224,8 @@ MultiLayer *SwigDirector_IMultiLayerBuilder::buildSample() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "buildSample", NULL);
@@ -8108,8 +8259,8 @@ MultiLayer *SwigDirector_IMultiLayerBuilder::createSample(size_t index) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"createSample", (char *)"(O)" ,(PyObject *)obj0);
@@ -8137,8 +8288,8 @@ size_t SwigDirector_IMultiLayerBuilder::size() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "size", NULL);
@@ -8180,8 +8331,8 @@ IFormFactor *SwigDirector_IFormFactor::clone() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
@@ -8208,8 +8359,8 @@ void SwigDirector_IFormFactor::transferToCPP() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
@@ -8234,8 +8385,8 @@ ParameterPool *SwigDirector_IFormFactor::createParameterTree() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
@@ -8262,8 +8413,8 @@ void SwigDirector_IFormFactor::onChange() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
@@ -8285,8 +8436,8 @@ void SwigDirector_IFormFactor::accept(INodeVisitor *visitor) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
@@ -8307,8 +8458,8 @@ std::string SwigDirector_IFormFactor::treeToString() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
@@ -8337,8 +8488,8 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IFormF
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
@@ -8368,8 +8519,8 @@ void SwigDirector_IFormFactor::setParent(INode const *newParent) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
@@ -8394,8 +8545,8 @@ HomogeneousMaterial const *SwigDirector_IFormFactor::material() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
@@ -8418,14 +8569,14 @@ HomogeneousMaterial const *SwigDirector_IFormFactor::material() const {
void SwigDirector_IFormFactor::setAmbientMaterial(HomogeneousMaterial arg0) {
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&arg0), SWIGTYPE_p_HomogeneousMaterial, 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new HomogeneousMaterial((const HomogeneousMaterial &)arg0)), SWIGTYPE_p_HomogeneousMaterial, SWIG_POINTER_OWN | 0 );
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setAmbientMaterial", (char *)"(O)" ,(PyObject *)obj0);
@@ -8448,8 +8599,8 @@ complex_t SwigDirector_IFormFactor::evaluate(WavevectorInfo const &wavevectors)
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate", (char *)"(O)" ,(PyObject *)obj0);
@@ -8477,8 +8628,8 @@ double SwigDirector_IFormFactor::volume() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "volume", NULL);
@@ -8506,8 +8657,8 @@ double SwigDirector_IFormFactor::radialExtension() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "radialExtension", NULL);
@@ -8537,8 +8688,8 @@ double SwigDirector_IFormFactor::bottomZ(IRotation const &rotation) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"bottomZ", (char *)"(O)" ,(PyObject *)obj0);
@@ -8568,8 +8719,8 @@ double SwigDirector_IFormFactor::topZ(IRotation const &rotation) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"topZ", (char *)"(O)" ,(PyObject *)obj0);
@@ -8600,8 +8751,8 @@ void SwigDirector_IFormFactor::setSpecularInfo(ILayerRTCoefficients const *arg0,
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 15;
- const char * const swig_method_name = "setSpecularInfo";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ const char *const swig_method_name = "setSpecularInfo";
+ PyObject *method = swig_get_method(swig_method_index, swig_method_name);
swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setSpecularInfo", (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
@@ -8625,8 +8776,8 @@ bool SwigDirector_IFormFactor::canSliceAnalytically(IRotation const &rot) const
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 16;
- const char * const swig_method_name = "canSliceAnalytically";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"canSliceAnalytically", (char *)"(O)" ,(PyObject *)obj0);
@@ -8655,19 +8806,19 @@ IFormFactor *SwigDirector_IFormFactor::sliceFormFactor(ZLimits limits, IRotation
IFormFactor *c_result;
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&limits), SWIGTYPE_p_ZLimits, 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new ZLimits((const ZLimits &)limits)), SWIGTYPE_p_ZLimits, SWIG_POINTER_OWN | 0 );
swig::SwigVar_PyObject obj1;
obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(&rot), SWIGTYPE_p_IRotation, 0 );
swig::SwigVar_PyObject obj2;
- obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(&translation), SWIGTYPE_p_BasicVector3DT_double_t, 0 );
+ obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(new kvector_t((const kvector_t &)translation)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
swig_set_inner("sliceFormFactor", true);
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactor.__init__.");
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 17;
- const char * const swig_method_name = "sliceFormFactor";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"sliceFormFactor", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
@@ -8710,8 +8861,8 @@ IFormFactorBorn *SwigDirector_IFormFactorBorn::clone() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
@@ -8738,8 +8889,8 @@ void SwigDirector_IFormFactorBorn::transferToCPP() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
@@ -8764,8 +8915,8 @@ ParameterPool *SwigDirector_IFormFactorBorn::createParameterTree() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
@@ -8792,8 +8943,8 @@ void SwigDirector_IFormFactorBorn::onChange() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
@@ -8815,8 +8966,8 @@ void SwigDirector_IFormFactorBorn::accept(INodeVisitor *visitor) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
@@ -8837,8 +8988,8 @@ std::string SwigDirector_IFormFactorBorn::treeToString() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
@@ -8867,8 +9018,8 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IFormF
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
@@ -8898,8 +9049,8 @@ void SwigDirector_IFormFactorBorn::setParent(INode const *newParent) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
@@ -8924,8 +9075,8 @@ HomogeneousMaterial const *SwigDirector_IFormFactorBorn::material() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
@@ -8948,14 +9099,14 @@ HomogeneousMaterial const *SwigDirector_IFormFactorBorn::material() const {
void SwigDirector_IFormFactorBorn::setAmbientMaterial(HomogeneousMaterial arg0) {
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&arg0), SWIGTYPE_p_HomogeneousMaterial, 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new HomogeneousMaterial((const HomogeneousMaterial &)arg0)), SWIGTYPE_p_HomogeneousMaterial, SWIG_POINTER_OWN | 0 );
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setAmbientMaterial", (char *)"(O)" ,(PyObject *)obj0);
@@ -8978,8 +9129,8 @@ complex_t SwigDirector_IFormFactorBorn::evaluate(WavevectorInfo const &wavevecto
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate", (char *)"(O)" ,(PyObject *)obj0);
@@ -9007,8 +9158,8 @@ double SwigDirector_IFormFactorBorn::volume() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "volume", NULL);
@@ -9036,8 +9187,8 @@ double SwigDirector_IFormFactorBorn::radialExtension() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "radialExtension", NULL);
@@ -9067,8 +9218,8 @@ double SwigDirector_IFormFactorBorn::bottomZ(IRotation const &rotation) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"bottomZ", (char *)"(O)" ,(PyObject *)obj0);
@@ -9098,8 +9249,8 @@ double SwigDirector_IFormFactorBorn::topZ(IRotation const &rotation) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"topZ", (char *)"(O)" ,(PyObject *)obj0);
@@ -9130,8 +9281,8 @@ void SwigDirector_IFormFactorBorn::setSpecularInfo(ILayerRTCoefficients const *a
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 15;
- const char * const swig_method_name = "setSpecularInfo";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ const char *const swig_method_name = "setSpecularInfo";
+ PyObject *method = swig_get_method(swig_method_index, swig_method_name);
swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setSpecularInfo", (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
@@ -9155,8 +9306,8 @@ bool SwigDirector_IFormFactorBorn::canSliceAnalytically(IRotation const &rot) co
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 16;
- const char * const swig_method_name = "canSliceAnalytically";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"canSliceAnalytically", (char *)"(O)" ,(PyObject *)obj0);
@@ -9185,19 +9336,19 @@ IFormFactor *SwigDirector_IFormFactorBorn::sliceFormFactor(ZLimits limits, IRota
IFormFactor *c_result;
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&limits), SWIGTYPE_p_ZLimits, 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new ZLimits((const ZLimits &)limits)), SWIGTYPE_p_ZLimits, SWIG_POINTER_OWN | 0 );
swig::SwigVar_PyObject obj1;
obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(&rot), SWIGTYPE_p_IRotation, 0 );
swig::SwigVar_PyObject obj2;
- obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(&translation), SWIGTYPE_p_BasicVector3DT_double_t, 0 );
+ obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(new kvector_t((const kvector_t &)translation)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
swig_set_inner("sliceFormFactor", true);
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 17;
- const char * const swig_method_name = "sliceFormFactor";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"sliceFormFactor", (char *)"(OOO)" ,(PyObject *)obj0,(PyObject *)obj1,(PyObject *)obj2);
@@ -9222,14 +9373,14 @@ IFormFactor *SwigDirector_IFormFactorBorn::sliceFormFactor(ZLimits limits, IRota
complex_t SwigDirector_IFormFactorBorn::evaluate_for_q(cvector_t q) const {
complex_t c_result;
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&q), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new cvector_t((const cvector_t &)q)), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 );
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IFormFactorBorn.__init__.");
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 18;
- const char * const swig_method_name = "evaluate_for_q";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate_for_q", (char *)"(O)" ,(PyObject *)obj0);
@@ -9271,8 +9422,8 @@ IInterferenceFunction *SwigDirector_IInterferenceFunction::clone() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "clone", NULL);
@@ -9299,8 +9450,8 @@ void SwigDirector_IInterferenceFunction::transferToCPP() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "transferToCPP", NULL);
@@ -9325,8 +9476,8 @@ ParameterPool *SwigDirector_IInterferenceFunction::createParameterTree() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "createParameterTree", NULL);
@@ -9353,8 +9504,8 @@ void SwigDirector_IInterferenceFunction::onChange() {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "onChange", NULL);
@@ -9376,8 +9527,8 @@ void SwigDirector_IInterferenceFunction::accept(INodeVisitor *visitor) const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"accept", (char *)"(O)" ,(PyObject *)obj0);
@@ -9398,8 +9549,8 @@ std::string SwigDirector_IInterferenceFunction::treeToString() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "treeToString", NULL);
@@ -9428,8 +9579,8 @@ std::vector< INode const *,std::allocator< INode const * > > SwigDirector_IInter
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getChildren", NULL);
@@ -9459,8 +9610,8 @@ void SwigDirector_IInterferenceFunction::setParent(INode const *newParent) {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"setParent", (char *)"(O)" ,(PyObject *)obj0);
@@ -9485,8 +9636,8 @@ HomogeneousMaterial const *SwigDirector_IInterferenceFunction::material() const
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "material", NULL);
@@ -9510,14 +9661,14 @@ HomogeneousMaterial const *SwigDirector_IInterferenceFunction::material() const
double SwigDirector_IInterferenceFunction::evaluate(kvector_t const q) const {
double c_result;
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&q), SWIGTYPE_p_BasicVector3DT_double_t, 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new kvector_t((const kvector_t &)q)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IInterferenceFunction.__init__.");
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"evaluate", (char *)"(O)" ,(PyObject *)obj0);
@@ -9545,8 +9696,8 @@ double SwigDirector_IInterferenceFunction::kappa() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 10;
- const char * const swig_method_name = "kappa";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+ const char *const swig_method_name = "kappa";
+ PyObject *method = swig_get_method(swig_method_index, swig_method_name);
swig::SwigVar_PyObject result = PyObject_CallFunction(method, NULL, NULL);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "kappa", NULL);
@@ -9574,8 +9725,8 @@ double SwigDirector_IInterferenceFunction::getParticleDensity() const {
}
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
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);
+ 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);
#else
swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *) "getParticleDensity", NULL);
@@ -10444,22 +10595,11 @@ fail:
SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_swig__SwigPyIterator, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *SHARED_PTR_DISOWN_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *module;
- PyObject *d;
- if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL;
- d = PyModule_GetDict(module);
- if (!d) return NULL;
- SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0)));
- return SWIG_Py_Void();
-}
-
-
SWIGINTERN PyObject *_wrap_vdouble1d_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< double > *arg1 = (std::vector< double > *) 0 ;
@@ -12373,7 +12513,7 @@ fail:
SWIGINTERN PyObject *vdouble1d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -14321,7 +14461,7 @@ fail:
SWIGINTERN PyObject *vdouble2d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -16239,7 +16379,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -18187,7 +18327,7 @@ fail:
SWIGINTERN PyObject *vinteger2d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -20105,7 +20245,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -22023,7 +22163,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -23971,7 +24111,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -24159,7 +24299,7 @@ fail:
SWIGINTERN PyObject *INoncopyable_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_INoncopyable, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -24230,7 +24370,7 @@ fail:
SWIGINTERN PyObject *ICloneable_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ICloneable, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -24405,7 +24545,7 @@ fail:
SWIGINTERN PyObject *INamed_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_INamed, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -24886,7 +25026,7 @@ fail:
SWIGINTERN PyObject *IParameterized_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IParameterized, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -25332,7 +25472,7 @@ fail:
SWIGINTERN PyObject *INode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_INode, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -27229,7 +27369,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_INode_p_std__allocatorT_INode_p_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -29126,7 +29266,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -29934,7 +30074,7 @@ fail:
SWIGINTERN PyObject *kvector_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_BasicVector3DT_double_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -31850,7 +31990,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -32396,7 +32536,7 @@ fail:
SWIGINTERN PyObject *cvector_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -34312,7 +34452,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -34957,7 +35097,7 @@ fail:
SWIGINTERN PyObject *WavevectorInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_WavevectorInfo, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -35312,7 +35452,7 @@ fail:
SWIGINTERN PyObject *Beam_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Beam, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -35573,7 +35713,7 @@ fail:
SWIGINTERN PyObject *Bin1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Bin1D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -35945,7 +36085,7 @@ fail:
SWIGINTERN PyObject *Bin1DKVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Bin1DKVector, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -36283,7 +36423,7 @@ fail:
SWIGINTERN PyObject *Bin1DCVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Bin1DCVector, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -36782,7 +36922,7 @@ fail:
SWIGINTERN PyObject *IAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IAxis, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -37197,7 +37337,7 @@ fail:
SWIGINTERN PyObject *VariableBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_VariableBinAxis, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -37343,7 +37483,7 @@ fail:
SWIGINTERN PyObject *ConstKBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ConstKBinAxis, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -37542,7 +37682,7 @@ fail:
SWIGINTERN PyObject *CustomBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_CustomBinAxis, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -37738,7 +37878,7 @@ fail:
SWIGINTERN PyObject *IShape2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IShape2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -37916,7 +38056,7 @@ fail:
SWIGINTERN PyObject *ISample_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ISample, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -38327,7 +38467,7 @@ fail:
SWIGINTERN PyObject *IChiSquaredModule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IChiSquaredModule, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -38409,7 +38549,7 @@ fail:
SWIGINTERN PyObject *IObserver_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__shared_ptrT_IObserver_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -38563,7 +38703,7 @@ fail:
SWIGINTERN PyObject *IObservable_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IObservable, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -38782,7 +38922,7 @@ fail:
SWIGINTERN PyObject *IFitObserver_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__shared_ptrT_IFitObserver_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -38883,7 +39023,7 @@ fail:
SWIGINTERN PyObject *IFitStrategy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFitStrategy, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -38967,7 +39107,7 @@ fail:
SWIGINTERN PyObject *FitStrategyDefault_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FitStrategyDefault, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -39048,7 +39188,7 @@ fail:
SWIGINTERN PyObject *IIntensityFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IIntensityFunction, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -39142,7 +39282,7 @@ fail:
SWIGINTERN PyObject *IntensityFunctionLog_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IntensityFunctionLog, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -39236,7 +39376,7 @@ fail:
SWIGINTERN PyObject *IntensityFunctionSqrt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IntensityFunctionSqrt, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -39383,7 +39523,7 @@ fail:
SWIGINTERN PyObject *IIntensityNormalizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IIntensityNormalizer, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -39678,7 +39818,7 @@ fail:
SWIGINTERN PyObject *IntensityNormalizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IntensityNormalizer, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -39906,7 +40046,7 @@ fail:
SWIGINTERN PyObject *IntensityScaleAndShiftNormalizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IntensityScaleAndShiftNormalizer, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -40125,7 +40265,7 @@ fail:
SWIGINTERN PyObject *ISquaredFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ISquaredFunction, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -40357,7 +40497,7 @@ fail:
SWIGINTERN PyObject *SquaredFunctionDefault_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SquaredFunctionDefault, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -40487,7 +40627,7 @@ fail:
SWIGINTERN PyObject *SquaredFunctionSimError_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SquaredFunctionSimError, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -40617,7 +40757,7 @@ fail:
SWIGINTERN PyObject *SquaredFunctionMeanSquaredError_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SquaredFunctionMeanSquaredError, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -40747,7 +40887,7 @@ fail:
SWIGINTERN PyObject *SquaredFunctionSystematicError_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SquaredFunctionSystematicError, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -40877,7 +41017,7 @@ fail:
SWIGINTERN PyObject *SquaredFunctionGaussianError_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SquaredFunctionGaussianError, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -41053,7 +41193,7 @@ fail:
SWIGINTERN PyObject *ChiSquaredModule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ChiSquaredModule, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -41637,7 +41777,7 @@ fail:
SWIGINTERN PyObject *FitObject_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FitObject, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -41782,7 +41922,7 @@ fail:
SWIGINTERN PyObject *FitOptions_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FitOptions, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -42467,7 +42607,7 @@ fail:
SWIGINTERN PyObject *FitParameter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FitParameter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -44635,7 +44775,7 @@ fail:
SWIGINTERN PyObject *FitSuite_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FitSuite, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -45533,7 +45673,7 @@ fail:
SWIGINTERN PyObject *FitSuiteObjects_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FitSuiteObjects, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -46081,28 +46221,6 @@ fail:
}
-SWIGINTERN PyObject *FORWARD_FFT_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *module;
- PyObject *d;
- if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL;
- d = PyModule_GetDict(module);
- if (!d) return NULL;
- SWIG_Python_SetConstant(d, "FORWARD_FFT",SWIG_From_int(static_cast< int >(MathFunctions::FORWARD_FFT)));
- return SWIG_Py_Void();
-}
-
-
-SWIGINTERN PyObject *BACKWARD_FFT_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *module;
- PyObject *d;
- if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL;
- d = PyModule_GetDict(module);
- if (!d) return NULL;
- SWIG_Python_SetConstant(d, "BACKWARD_FFT",SWIG_From_int(static_cast< int >(MathFunctions::BACKWARD_FFT)));
- return SWIG_Py_Void();
-}
-
-
SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< complex_t,std::allocator< complex_t > > *arg1 = 0 ;
@@ -46841,7 +46959,7 @@ fail:
SWIGINTERN PyObject *AdjustMinimizerStrategy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_AdjustMinimizerStrategy, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -47365,7 +47483,7 @@ fail:
SWIGINTERN PyObject *IMultiLayerBuilder_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -52338,7 +52456,7 @@ fail:
SWIGINTERN PyObject *INodeVisitor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_INodeVisitor, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -52567,7 +52685,7 @@ fail:
SWIGINTERN PyObject *IClusteredParticles_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IClusteredParticles, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -52911,7 +53029,7 @@ fail:
SWIGINTERN PyObject *Crystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Crystal, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -53538,7 +53656,7 @@ fail:
SWIGINTERN PyObject *IDistribution1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IDistribution1D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -53982,7 +54100,7 @@ fail:
SWIGINTERN PyObject *DistributionGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_DistributionGate, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -54404,7 +54522,7 @@ fail:
SWIGINTERN PyObject *DistributionLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_DistributionLorentz, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -54826,7 +54944,7 @@ fail:
SWIGINTERN PyObject *DistributionGaussian_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_DistributionGaussian, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -55323,7 +55441,7 @@ fail:
SWIGINTERN PyObject *DistributionLogNormal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_DistributionLogNormal, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -55745,7 +55863,7 @@ fail:
SWIGINTERN PyObject *DistributionCosine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_DistributionCosine, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -56241,7 +56359,7 @@ fail:
SWIGINTERN PyObject *DistributionTrapezoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_DistributionTrapezoid, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -56701,7 +56819,7 @@ fail:
SWIGINTERN PyObject *DetectorMask_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_DetectorMask, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -57198,7 +57316,7 @@ fail:
SWIGINTERN PyObject *Ellipse_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Ellipse, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -57301,7 +57419,7 @@ fail:
SWIGINTERN PyObject *IFTDecayFunction1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFTDecayFunction1D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -57434,7 +57552,7 @@ fail:
SWIGINTERN PyObject *FTDecayFunction1DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DCauchy, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -57567,7 +57685,7 @@ fail:
SWIGINTERN PyObject *FTDecayFunction1DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DGauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -57700,7 +57818,7 @@ fail:
SWIGINTERN PyObject *FTDecayFunction1DTriangle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DTriangle, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -57864,7 +57982,7 @@ fail:
SWIGINTERN PyObject *FTDecayFunction1DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction1DVoigt, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -58162,7 +58280,7 @@ fail:
SWIGINTERN PyObject *IFTDecayFunction2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFTDecayFunction2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -58413,7 +58531,7 @@ fail:
SWIGINTERN PyObject *FTDecayFunction2DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction2DCauchy, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -58664,7 +58782,7 @@ fail:
SWIGINTERN PyObject *FTDecayFunction2DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction2DGauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -58967,7 +59085,7 @@ fail:
SWIGINTERN PyObject *FTDecayFunction2DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDecayFunction2DVoigt, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -59100,7 +59218,7 @@ fail:
SWIGINTERN PyObject *IFTDistribution1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFTDistribution1D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -59233,7 +59351,7 @@ fail:
SWIGINTERN PyObject *FTDistribution1DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DCauchy, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -59366,7 +59484,7 @@ fail:
SWIGINTERN PyObject *FTDistribution1DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DGauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -59499,7 +59617,7 @@ fail:
SWIGINTERN PyObject *FTDistribution1DGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DGate, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -59632,7 +59750,7 @@ fail:
SWIGINTERN PyObject *FTDistribution1DTriangle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DTriangle, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -59765,7 +59883,7 @@ fail:
SWIGINTERN PyObject *FTDistribution1DCosine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DCosine, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -59929,7 +60047,7 @@ fail:
SWIGINTERN PyObject *FTDistribution1DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution1DVoigt, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -60137,7 +60255,7 @@ fail:
SWIGINTERN PyObject *IFTDistribution2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFTDistribution2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -60388,7 +60506,7 @@ fail:
SWIGINTERN PyObject *FTDistribution2DCauchy_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DCauchy, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -60639,7 +60757,7 @@ fail:
SWIGINTERN PyObject *FTDistribution2DGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DGauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -60890,7 +61008,7 @@ fail:
SWIGINTERN PyObject *FTDistribution2DGate_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DGate, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -61141,7 +61259,7 @@ fail:
SWIGINTERN PyObject *FTDistribution2DCone_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DCone, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -61444,7 +61562,7 @@ fail:
SWIGINTERN PyObject *FTDistribution2DVoigt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FTDistribution2DVoigt, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -61824,7 +61942,7 @@ fail:
SWIGINTERN PyObject *FixedBinAxis_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FixedBinAxis, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -62472,7 +62590,7 @@ fail:
SWIGINTERN PyObject *IFormFactor_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFormFactor, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -64423,7 +64541,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -64928,7 +65046,7 @@ fail:
SWIGINTERN PyObject *IFormFactorBorn_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFormFactorBorn, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -65125,7 +65243,7 @@ fail:
SWIGINTERN PyObject *SlicingEffects_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SlicingEffects, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -65355,7 +65473,7 @@ fail:
SWIGINTERN PyObject *IFormFactorDecorator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFormFactorDecorator, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -65500,7 +65618,7 @@ fail:
SWIGINTERN PyObject *PolygonalTopology_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_PolygonalTopology, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -65645,7 +65763,7 @@ fail:
SWIGINTERN PyObject *PolyhedralTopology_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_PolyhedralTopology, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -65899,7 +66017,7 @@ fail:
SWIGINTERN PyObject *PolyhedralEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_PolyhedralEdge, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -66379,7 +66497,7 @@ fail:
SWIGINTERN PyObject *PolyhedralFace_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_PolyhedralFace, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -66550,7 +66668,7 @@ fail:
SWIGINTERN PyObject *FormFactorPolyhedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPolyhedron, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -66683,7 +66801,7 @@ fail:
SWIGINTERN PyObject *FormFactorPolygonalPrism_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPolygonalPrism, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -66794,7 +66912,7 @@ fail:
SWIGINTERN PyObject *FormFactorPolygonalSurface_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPolygonalSurface, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -67011,7 +67129,7 @@ fail:
SWIGINTERN PyObject *FormFactorAnisoPyramid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorAnisoPyramid, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -67258,7 +67376,7 @@ fail:
SWIGINTERN PyObject *FormFactorBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorBox, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -67505,7 +67623,7 @@ fail:
SWIGINTERN PyObject *FormFactorCone_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCone, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -67691,7 +67809,7 @@ fail:
SWIGINTERN PyObject *FormFactorCone6_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCone6, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -68004,7 +68122,7 @@ fail:
SWIGINTERN PyObject *FormFactorCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCrystal, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -68221,7 +68339,7 @@ fail:
SWIGINTERN PyObject *FormFactorCuboctahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCuboctahedron, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -68437,7 +68555,7 @@ fail:
SWIGINTERN PyObject *FormFactorCylinder_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCylinder, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -68684,7 +68802,7 @@ fail:
SWIGINTERN PyObject *FormFactorDecoratorDebyeWaller_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorDecoratorDebyeWaller, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -68808,7 +68926,7 @@ fail:
SWIGINTERN PyObject *FormFactorDodecahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorDodecahedron, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -68962,7 +69080,7 @@ fail:
SWIGINTERN PyObject *FormFactorDot_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorDot, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -69209,7 +69327,7 @@ fail:
SWIGINTERN PyObject *FormFactorEllipsoidalCylinder_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorEllipsoidalCylinder, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -69462,7 +69580,7 @@ fail:
SWIGINTERN PyObject *FormFactorFullSphere_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorFullSphere, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -69678,7 +69796,7 @@ fail:
SWIGINTERN PyObject *FormFactorFullSpheroid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorFullSpheroid, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -69964,7 +70082,7 @@ fail:
SWIGINTERN PyObject *FormFactorGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorGauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -70211,7 +70329,7 @@ fail:
SWIGINTERN PyObject *FormFactorHemiEllipsoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorHemiEllipsoid, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -70335,7 +70453,7 @@ fail:
SWIGINTERN PyObject *FormFactorIcosahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorIcosahedron, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -70582,7 +70700,7 @@ fail:
SWIGINTERN PyObject *FormFactorLongBoxGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongBoxGauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -70829,7 +70947,7 @@ fail:
SWIGINTERN PyObject *FormFactorLongBoxLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongBoxLorentz, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -71076,7 +71194,7 @@ fail:
SWIGINTERN PyObject *FormFactorLongRipple1Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple1Gauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -71323,7 +71441,7 @@ fail:
SWIGINTERN PyObject *FormFactorLongRipple1Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple1Lorentz, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -71601,7 +71719,7 @@ fail:
SWIGINTERN PyObject *FormFactorLongRipple2Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple2Gauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -71879,7 +71997,7 @@ fail:
SWIGINTERN PyObject *FormFactorLongRipple2Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLongRipple2Lorentz, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -72165,7 +72283,7 @@ fail:
SWIGINTERN PyObject *FormFactorLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorLorentz, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -72298,7 +72416,7 @@ fail:
SWIGINTERN PyObject *FormFactorPrism3_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPrism3, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -72431,7 +72549,7 @@ fail:
SWIGINTERN PyObject *FormFactorPrism6_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPrism6, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -72617,7 +72735,7 @@ fail:
SWIGINTERN PyObject *FormFactorPyramid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorPyramid, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -72864,7 +72982,7 @@ fail:
SWIGINTERN PyObject *FormFactorRipple1_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple1, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -73142,7 +73260,7 @@ fail:
SWIGINTERN PyObject *FormFactorRipple2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple2, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -73314,7 +73432,7 @@ fail:
SWIGINTERN PyObject *FormFactorSphereGaussianRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSphereGaussianRadius, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -73495,7 +73613,7 @@ fail:
SWIGINTERN PyObject *FormFactorSphereLogNormalRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -73667,7 +73785,7 @@ fail:
SWIGINTERN PyObject *FormFactorSphereUniformRadius_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSphereUniformRadius, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -73853,7 +73971,7 @@ fail:
SWIGINTERN PyObject *FormFactorTetrahedron_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTetrahedron, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -74008,7 +74126,7 @@ fail:
SWIGINTERN PyObject *FormFactorTruncatedCube_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTruncatedCube, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -74346,7 +74464,7 @@ fail:
SWIGINTERN PyObject *FormFactorTruncatedSphere_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTruncatedSphere, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -74736,7 +74854,7 @@ fail:
SWIGINTERN PyObject *FormFactorTruncatedSpheroid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorTruncatedSpheroid, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -75120,7 +75238,7 @@ fail:
SWIGINTERN PyObject *FormFactorWeighted_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorWeighted, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -76318,7 +76436,7 @@ fail:
SWIGINTERN PyObject *Simulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Simulation, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -76846,7 +76964,7 @@ fail:
SWIGINTERN PyObject *SimulationOptions_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SimulationOptions, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -77678,7 +77796,7 @@ fail:
SWIGINTERN PyObject *GISASSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_GISASSimulation, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -79668,7 +79786,7 @@ fail:
SWIGINTERN PyObject *IHistogram_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IHistogram, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -80267,7 +80385,7 @@ fail:
SWIGINTERN PyObject *Histogram1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Histogram1D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -81307,7 +81425,7 @@ fail:
SWIGINTERN PyObject *Histogram2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Histogram2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -81679,18 +81797,27 @@ fail:
SWIGINTERN PyObject *_wrap_HomogeneousMaterial_refractiveIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
HomogeneousMaterial *arg1 = (HomogeneousMaterial *) 0 ;
+ double arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
+ double val2 ;
+ int ecode2 = 0 ;
PyObject * obj0 = 0 ;
+ PyObject * obj1 = 0 ;
complex_t result;
- if (!PyArg_ParseTuple(args,(char *)"O:HomogeneousMaterial_refractiveIndex",&obj0)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial_refractiveIndex",&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HomogeneousMaterial, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_refractiveIndex" "', argument " "1"" of type '" "HomogeneousMaterial const *""'");
}
arg1 = reinterpret_cast< HomogeneousMaterial * >(argp1);
- result = ((HomogeneousMaterial const *)arg1)->refractiveIndex();
+ ecode2 = SWIG_AsVal_double(obj1, &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial_refractiveIndex" "', argument " "2"" of type '" "double""'");
+ }
+ arg2 = static_cast< double >(val2);
+ result = ((HomogeneousMaterial const *)arg1)->refractiveIndex(arg2);
resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
@@ -81701,49 +81828,28 @@ fail:
SWIGINTERN PyObject *_wrap_HomogeneousMaterial_refractiveIndex2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
HomogeneousMaterial *arg1 = (HomogeneousMaterial *) 0 ;
+ double arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
- PyObject * obj0 = 0 ;
- complex_t result;
-
- if (!PyArg_ParseTuple(args,(char *)"O:HomogeneousMaterial_refractiveIndex2",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HomogeneousMaterial, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_refractiveIndex2" "', argument " "1"" of type '" "HomogeneousMaterial const *""'");
- }
- arg1 = reinterpret_cast< HomogeneousMaterial * >(argp1);
- result = ((HomogeneousMaterial const *)arg1)->refractiveIndex2();
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial_setRefractiveIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- HomogeneousMaterial *arg1 = (HomogeneousMaterial *) 0 ;
- complex_t arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- std::complex< double > val2 ;
+ double val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
+ complex_t result;
- if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial_setRefractiveIndex",&obj0,&obj1)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial_refractiveIndex2",&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HomogeneousMaterial, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_setRefractiveIndex" "', argument " "1"" of type '" "HomogeneousMaterial *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_refractiveIndex2" "', argument " "1"" of type '" "HomogeneousMaterial const *""'");
}
arg1 = reinterpret_cast< HomogeneousMaterial * >(argp1);
- ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+ ecode2 = SWIG_AsVal_double(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial_setRefractiveIndex" "', argument " "2"" of type '" "complex_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial_refractiveIndex2" "', argument " "2"" of type '" "double""'");
}
- arg2 = static_cast< complex_t >(val2);
- (arg1)->setRefractiveIndex(arg2);
- resultobj = SWIG_Py_Void();
+ arg2 = static_cast< double >(val2);
+ result = ((HomogeneousMaterial const *)arg1)->refractiveIndex2(arg2);
+ resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
return NULL;
@@ -81816,45 +81922,29 @@ fail:
}
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial_setMagnetization(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial_materialData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
HomogeneousMaterial *arg1 = (HomogeneousMaterial *) 0 ;
- kvector_t arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
- void *argp2 ;
- int res2 = 0 ;
PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
+ complex_t result;
- if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial_setMagnetization",&obj0,&obj1)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"O:HomogeneousMaterial_materialData",&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HomogeneousMaterial, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_setMagnetization" "', argument " "1"" of type '" "HomogeneousMaterial *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_materialData" "', argument " "1"" of type '" "HomogeneousMaterial const *""'");
}
arg1 = reinterpret_cast< HomogeneousMaterial * >(argp1);
- {
- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HomogeneousMaterial_setMagnetization" "', argument " "2"" of type '" "kvector_t const""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HomogeneousMaterial_setMagnetization" "', argument " "2"" of type '" "kvector_t const""'");
- } else {
- kvector_t * temp = reinterpret_cast< kvector_t * >(argp2);
- arg2 = *temp;
- if (SWIG_IsNewObj(res2)) delete temp;
- }
- }
- (arg1)->setMagnetization(arg2);
- resultobj = SWIG_Py_Void();
+ result = ((HomogeneousMaterial const *)arg1)->materialData();
+ resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial_scalarSLD(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial_scalarSubtrSLD(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
HomogeneousMaterial *arg1 = (HomogeneousMaterial *) 0 ;
WavevectorInfo *arg2 = 0 ;
@@ -81866,18 +81956,18 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial_scalarSLD(PyObject *SWIGUNUSEDPAR
PyObject * obj1 = 0 ;
complex_t result;
- if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial_scalarSLD",&obj0,&obj1)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial_scalarSubtrSLD",&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_HomogeneousMaterial, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_scalarSLD" "', argument " "1"" of type '" "HomogeneousMaterial const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HomogeneousMaterial_scalarSubtrSLD" "', argument " "1"" of type '" "HomogeneousMaterial const *""'");
}
arg1 = reinterpret_cast< HomogeneousMaterial * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_WavevectorInfo, 0 | 0);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HomogeneousMaterial_scalarSLD" "', argument " "2"" of type '" "WavevectorInfo const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HomogeneousMaterial_scalarSubtrSLD" "', argument " "2"" of type '" "WavevectorInfo const &""'");
}
if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HomogeneousMaterial_scalarSLD" "', argument " "2"" of type '" "WavevectorInfo const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HomogeneousMaterial_scalarSubtrSLD" "', argument " "2"" of type '" "WavevectorInfo const &""'");
}
arg2 = reinterpret_cast< WavevectorInfo * >(argp2);
result = ((HomogeneousMaterial const *)arg1)->scalarSubtrSLD((WavevectorInfo const &)*arg2);
@@ -81924,7 +82014,7 @@ fail:
SWIGINTERN PyObject *HomogeneousMaterial_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_HomogeneousMaterial, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -83234,7 +83324,7 @@ fail:
SWIGINTERN PyObject *IDetector2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IDetector2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -83314,7 +83404,7 @@ fail:
SWIGINTERN PyObject *IDetectorResolution_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IDetectorResolution, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -83594,7 +83684,7 @@ fail:
SWIGINTERN PyObject *IInterferenceFunction_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IInterferenceFunction, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -83853,7 +83943,7 @@ fail:
SWIGINTERN PyObject *ILayout_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ILayout, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -84023,7 +84113,7 @@ fail:
SWIGINTERN PyObject *IAbstractParticle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IAbstractParticle, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -84266,7 +84356,7 @@ fail:
SWIGINTERN PyObject *IParameterReal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IParameterT_double_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -84411,7 +84501,7 @@ fail:
SWIGINTERN PyObject *ParticleLimits_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParticleLimits, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85117,7 +85207,7 @@ fail:
SWIGINTERN PyObject *IParticle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IParticle, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85207,7 +85297,7 @@ fail:
SWIGINTERN PyObject *IResolutionFunction2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IResolutionFunction2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85391,7 +85481,7 @@ fail:
SWIGINTERN PyObject *IRotation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IRotation, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85621,7 +85711,7 @@ fail:
SWIGINTERN PyObject *RotationX_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RotationX, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85789,7 +85879,7 @@ fail:
SWIGINTERN PyObject *RotationY_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RotationY, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -86005,7 +86095,7 @@ fail:
SWIGINTERN PyObject *RotationZ_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RotationZ, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -86235,7 +86325,7 @@ fail:
SWIGINTERN PyObject *RotationEuler_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RotationEuler, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -86319,7 +86409,7 @@ fail:
SWIGINTERN PyObject *ISelectionRule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ISelectionRule, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -86452,7 +86542,7 @@ fail:
SWIGINTERN PyObject *SimpleSelectionRule_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SimpleSelectionRule, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -87692,7 +87782,7 @@ fail:
SWIGINTERN PyObject *Instrument_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Instrument, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -88398,7 +88488,7 @@ fail:
SWIGINTERN PyObject *IntensityDataIOFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IntensityDataIOFactory, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -88625,7 +88715,7 @@ fail:
SWIGINTERN PyObject *InterferenceFunction1DLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction1DLattice, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -89079,7 +89169,7 @@ fail:
SWIGINTERN PyObject *InterferenceFunctionRadialParaCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionRadialParaCrystal, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -89767,7 +89857,7 @@ fail:
SWIGINTERN PyObject *InterferenceFunction2DLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction2DLattice, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -91126,7 +91216,7 @@ fail:
SWIGINTERN PyObject *InterferenceFunction2DParaCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunction2DParaCrystal, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -91258,7 +91348,7 @@ fail:
SWIGINTERN PyObject *InterferenceFunctionNone_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_InterferenceFunctionNone, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -91459,7 +91549,7 @@ fail:
SWIGINTERN PyObject *IPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IPixel, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -91762,7 +91852,7 @@ fail:
SWIGINTERN PyObject *SphericalDetector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SphericalDetector, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -92010,7 +92100,7 @@ fail:
SWIGINTERN PyObject *SphericalPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SphericalPixel, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -92269,7 +92359,7 @@ fail:
SWIGINTERN PyObject *IsGISAXSDetector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IsGISAXSDetector, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -92910,7 +93000,7 @@ fail:
SWIGINTERN PyObject *Lattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Lattice, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -93127,7 +93217,7 @@ fail:
SWIGINTERN PyObject *Lattice1DParameters_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Lattice1DParameters, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -93339,7 +93429,7 @@ fail:
SWIGINTERN PyObject *Lattice2D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Lattice2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -93668,7 +93758,7 @@ fail:
SWIGINTERN PyObject *BasicLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_BasicLattice, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -93937,7 +94027,7 @@ fail:
SWIGINTERN PyObject *SquareLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SquareLattice, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -94206,7 +94296,7 @@ fail:
SWIGINTERN PyObject *HexagonalLattice_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_HexagonalLattice, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -94531,50 +94621,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_Layer_refractiveIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Layer *arg1 = (Layer *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject * obj0 = 0 ;
- complex_t result;
-
- if (!PyArg_ParseTuple(args,(char *)"O:Layer_refractiveIndex",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_refractiveIndex" "', argument " "1"" of type '" "Layer const *""'");
- }
- arg1 = reinterpret_cast< Layer * >(argp1);
- result = ((Layer const *)arg1)->refractiveIndex();
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Layer_refractiveIndex2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Layer *arg1 = (Layer *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject * obj0 = 0 ;
- complex_t result;
-
- if (!PyArg_ParseTuple(args,(char *)"O:Layer_refractiveIndex2",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Layer, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Layer_refractiveIndex2" "', argument " "1"" of type '" "Layer const *""'");
- }
- arg1 = reinterpret_cast< Layer * >(argp1);
- result = ((Layer const *)arg1)->refractiveIndex2();
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_Layer_addLayout(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
Layer *arg1 = (Layer *) 0 ;
@@ -94968,7 +95014,7 @@ fail:
SWIGINTERN PyObject *Layer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Layer, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -95382,7 +95428,7 @@ fail:
SWIGINTERN PyObject *LayerRoughness_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_LayerRoughness, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -95627,7 +95673,7 @@ fail:
SWIGINTERN PyObject *Line_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Line, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -95867,7 +95913,7 @@ fail:
SWIGINTERN PyObject *VerticalLine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_VerticalLine, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -96107,7 +96153,7 @@ fail:
SWIGINTERN PyObject *HorizontalLine_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_HorizontalLine, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -96287,7 +96333,7 @@ fail:
SWIGINTERN PyObject *MesoCrystal_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_MesoCrystal, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -97243,7 +97289,7 @@ fail:
SWIGINTERN PyObject *MultiLayer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_MultiLayer, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -97719,7 +97765,7 @@ fail:
SWIGINTERN PyObject *OffSpecSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_OffSpecSimulation, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -99265,7 +99311,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IntensityData___idiv__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData___itruediv__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
OutputData< double > *arg1 = (OutputData< double > *) 0 ;
OutputData< double > *arg2 = 0 ;
@@ -99277,18 +99323,18 @@ SWIGINTERN PyObject *_wrap_IntensityData___idiv__(PyObject *SWIGUNUSEDPARM(self)
PyObject * obj1 = 0 ;
OutputData< double > *result = 0 ;
- if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___idiv__",&obj0,&obj1)) SWIG_fail;
+ 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_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___idiv__" "', argument " "1"" of type '" "OutputData< double > *""'");
+ 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);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData___idiv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData___itruediv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
}
if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IntensityData___idiv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IntensityData___itruediv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
}
arg2 = reinterpret_cast< OutputData< double > * >(argp2);
result = (OutputData< double > *) &(arg1)->operator /=((OutputData< double > const &)*arg2);
@@ -99502,7 +99548,7 @@ fail:
SWIGINTERN PyObject *IntensityData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_OutputDataT_double_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -100229,7 +100275,7 @@ fail:
SWIGINTERN PyObject *ParameterDistribution_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParameterDistribution, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -100863,7 +100909,7 @@ fail:
SWIGINTERN PyObject *ParameterPool_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParameterPool, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -101113,7 +101159,7 @@ fail:
SWIGINTERN PyObject *ParameterSample_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParameterSample, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -103029,7 +103075,7 @@ fail:
SWIGINTERN PyObject *ParameterSampleVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -103389,28 +103435,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_Particle_refractiveIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Particle *arg1 = (Particle *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject * obj0 = 0 ;
- complex_t result;
-
- if (!PyArg_ParseTuple(args,(char *)"O:Particle_refractiveIndex",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Particle, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Particle_refractiveIndex" "', argument " "1"" of type '" "Particle const *""'");
- }
- arg1 = reinterpret_cast< Particle * >(argp1);
- result = ((Particle const *)arg1)->refractiveIndex();
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_Particle_setFormFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
Particle *arg1 = (Particle *) 0 ;
@@ -103489,7 +103513,7 @@ fail:
SWIGINTERN PyObject *Particle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Particle, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -103951,7 +103975,7 @@ fail:
SWIGINTERN PyObject *ParticleComposition_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParticleComposition, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -104279,7 +104303,7 @@ fail:
SWIGINTERN PyObject *ParticleCoreShell_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParticleCoreShell, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -104522,7 +104546,7 @@ fail:
SWIGINTERN PyObject *ParticleDistribution_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParticleDistribution, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -105215,7 +105239,7 @@ fail:
SWIGINTERN PyObject *ParticleLayout_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ParticleLayout, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -105611,7 +105635,7 @@ fail:
SWIGINTERN PyObject *Polygon_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Polygon, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -106451,7 +106475,7 @@ fail:
SWIGINTERN PyObject *RealParameter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RealParameter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -106806,7 +106830,7 @@ fail:
SWIGINTERN PyObject *Rectangle_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_Rectangle, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -107902,7 +107926,7 @@ fail:
SWIGINTERN PyObject *RectangularDetector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RectangularDetector, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -108167,7 +108191,7 @@ fail:
SWIGINTERN PyObject *RectangularPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RectangularPixel, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -108362,7 +108386,7 @@ fail:
SWIGINTERN PyObject *ResolutionFunction2DGaussian_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ResolutionFunction2DGaussian, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -109009,7 +109033,7 @@ fail:
SWIGINTERN PyObject *SpecularSimulation_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SpecularSimulation, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -109258,7 +109282,7 @@ fail:
SWIGINTERN PyObject *ThreadInfo_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_ThreadInfo, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -109637,7 +109661,7 @@ fail:
SWIGINTERN PyObject *SampleBuilderFactoryTemp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -109716,7 +109740,7 @@ fail:
SWIGINTERN PyObject *SampleBuilderFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SampleBuilderFactory, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -110085,7 +110109,7 @@ fail:
SWIGINTERN PyObject *SimulationFactoryTemp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFactoryT_std__string_GISASSimulation_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -110126,7 +110150,7 @@ fail:
SWIGINTERN PyObject *SimulationFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_SimulationFactory, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -110160,7 +110184,6 @@ static PyMethodDef SwigMethods[] = {
"SwigPyIterator___sub__(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t\n"
""},
{ (char *)"SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_VARARGS, NULL},
- { (char *)"SHARED_PTR_DISOWN_swigconstant", SHARED_PTR_DISOWN_swigconstant, 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"},
@@ -113369,8 +113392,6 @@ static PyMethodDef SwigMethods[] = {
"Complex Bessel function Bessel_J1(x)/x. \n"
"\n"
""},
- { (char *)"FORWARD_FFT_swigconstant", FORWARD_FFT_swigconstant, METH_VARARGS, NULL},
- { (char *)"BACKWARD_FFT_swigconstant", BACKWARD_FFT_swigconstant, METH_VARARGS, NULL},
{ (char *)"FastFourierTransform", _wrap_FastFourierTransform, METH_VARARGS, (char *)"\n"
"FastFourierTransform(vector_complex_t data, MathFunctions::EFFTDirection tcase) -> vector_complex_t\n"
"FastFourierTransform(vdouble1d_t data, MathFunctions::EFFTDirection tcase) -> vector_complex_t\n"
@@ -119081,23 +119102,17 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ (char *)"HomogeneousMaterial_refractiveIndex", _wrap_HomogeneousMaterial_refractiveIndex, METH_VARARGS, (char *)"\n"
- "HomogeneousMaterial_refractiveIndex(HomogeneousMaterial self) -> complex_t\n"
+ "HomogeneousMaterial_refractiveIndex(HomogeneousMaterial self, double wavelength) -> complex_t\n"
"\n"
"complex_t HomogeneousMaterial::refractiveIndex() const \n"
"\n"
""},
{ (char *)"HomogeneousMaterial_refractiveIndex2", _wrap_HomogeneousMaterial_refractiveIndex2, METH_VARARGS, (char *)"\n"
- "HomogeneousMaterial_refractiveIndex2(HomogeneousMaterial self) -> complex_t\n"
+ "HomogeneousMaterial_refractiveIndex2(HomogeneousMaterial self, double wavelength) -> complex_t\n"
"\n"
"complex_t HomogeneousMaterial::refractiveIndex2() const \n"
"\n"
""},
- { (char *)"HomogeneousMaterial_setRefractiveIndex", _wrap_HomogeneousMaterial_setRefractiveIndex, METH_VARARGS, (char *)"\n"
- "HomogeneousMaterial_setRefractiveIndex(HomogeneousMaterial self, complex_t const refractive_index)\n"
- "\n"
- "void HomogeneousMaterial::setRefractiveIndex(const complex_t refractive_index)\n"
- "\n"
- ""},
{ (char *)"HomogeneousMaterial_isScalarMaterial", _wrap_HomogeneousMaterial_isScalarMaterial, METH_VARARGS, (char *)"\n"
"HomogeneousMaterial_isScalarMaterial(HomogeneousMaterial self) -> bool\n"
"\n"
@@ -119120,20 +119135,8 @@ static PyMethodDef SwigMethods[] = {
"Get the magnetization (in A/m) \n"
"\n"
""},
- { (char *)"HomogeneousMaterial_setMagnetization", _wrap_HomogeneousMaterial_setMagnetization, METH_VARARGS, (char *)"\n"
- "HomogeneousMaterial_setMagnetization(HomogeneousMaterial self, kvector_t magnetization)\n"
- "\n"
- "void HomogeneousMaterial::setMagnetization(const kvector_t magnetization)\n"
- "\n"
- "Set the magnetizationd (in A/m) \n"
- "\n"
- ""},
- { (char *)"HomogeneousMaterial_scalarSLD", _wrap_HomogeneousMaterial_scalarSLD, METH_VARARGS, (char *)"\n"
- "HomogeneousMaterial_scalarSLD(HomogeneousMaterial self, WavevectorInfo wavevectors) -> complex_t\n"
- "\n"
- "complex_t HomogeneousMaterial::scalarSLD(const WavevectorInfo &wavevectors) const \n"
- "\n"
- ""},
+ { (char *)"HomogeneousMaterial_materialData", _wrap_HomogeneousMaterial_materialData, METH_VARARGS, (char *)"HomogeneousMaterial_materialData(HomogeneousMaterial self) -> complex_t"},
+ { (char *)"HomogeneousMaterial_scalarSubtrSLD", _wrap_HomogeneousMaterial_scalarSubtrSLD, METH_VARARGS, (char *)"HomogeneousMaterial_scalarSubtrSLD(HomogeneousMaterial self, WavevectorInfo wavevectors) -> complex_t"},
{ (char *)"HomogeneousMaterial_transformedMaterial", _wrap_HomogeneousMaterial_transformedMaterial, METH_VARARGS, (char *)"\n"
"HomogeneousMaterial_transformedMaterial(HomogeneousMaterial self, Transform3D const & transform) -> HomogeneousMaterial\n"
"\n"
@@ -121506,20 +121509,6 @@ static PyMethodDef SwigMethods[] = {
"void Layer::setMaterial(HomogeneousMaterial material)\n"
"\n"
""},
- { (char *)"Layer_refractiveIndex", _wrap_Layer_refractiveIndex, METH_VARARGS, (char *)"\n"
- "Layer_refractiveIndex(Layer self) -> complex_t\n"
- "\n"
- "complex_t Layer::refractiveIndex() const \n"
- "\n"
- ""},
- { (char *)"Layer_refractiveIndex2", _wrap_Layer_refractiveIndex2, METH_VARARGS, (char *)"\n"
- "Layer_refractiveIndex2(Layer self) -> complex_t\n"
- "\n"
- "complex_t Layer::refractiveIndex2() const\n"
- "\n"
- "squared refractive index \n"
- "\n"
- ""},
{ (char *)"Layer_addLayout", _wrap_Layer_addLayout, METH_VARARGS, (char *)"\n"
"Layer_addLayout(Layer self, ILayout decoration)\n"
"\n"
@@ -122456,7 +122445,7 @@ static PyMethodDef SwigMethods[] = {
""},
{ (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___idiv__", _wrap_IntensityData___idiv__, METH_VARARGS, (char *)"IntensityData___idiv__(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_getValue(IntensityData self, size_t index) -> double\n"
@@ -122834,12 +122823,6 @@ static PyMethodDef SwigMethods[] = {
"Returns nullptr, unless overwritten to return a specific material. \n"
"\n"
""},
- { (char *)"Particle_refractiveIndex", _wrap_Particle_refractiveIndex, METH_VARARGS, (char *)"\n"
- "Particle_refractiveIndex(Particle self) -> complex_t\n"
- "\n"
- "complex_t Particle::refractiveIndex() const \n"
- "\n"
- ""},
{ (char *)"Particle_setFormFactor", _wrap_Particle_setFormFactor, METH_VARARGS, (char *)"\n"
"Particle_setFormFactor(Particle self, IFormFactor form_factor)\n"
"\n"
@@ -128134,7 +128117,6 @@ extern "C" {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX >= 0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else
@@ -128366,13 +128348,13 @@ SWIG_init(void) {
static PyGetSetDef thisown_getset_def = {
(char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
};
- PyObject *metatype_args;
PyTypeObject *builtin_pytype;
int builtin_base_count;
swig_type_info *builtin_basetype;
PyObject *tuple;
PyGetSetDescrObject *static_getset;
PyTypeObject *metatype;
+ PyTypeObject *swigpyobject;
SwigPyClientData *cd;
PyObject *public_interface, *public_symbol;
PyObject *this_descr;
@@ -128387,14 +128369,9 @@ SWIG_init(void) {
(void)static_getset;
(void)self;
- /* metatype is used to implement static member variables. */
- metatype_args = Py_BuildValue("(s(O){})", "SwigPyObjectType", &PyType_Type);
- assert(metatype_args);
- metatype = (PyTypeObject *) PyType_Type.tp_call((PyObject *) &PyType_Type, metatype_args, NULL);
+ /* Metaclass is used to implement static member variables */
+ metatype = SwigPyObjectType();
assert(metatype);
- Py_DECREF(metatype_args);
- metatype->tp_setattro = (setattrofunc) &SwigPyObjectType_setattro;
- assert(PyType_Ready(metatype) >= 0);
#endif
/* Fix SwigMethods to carry the callback ptrs when needed */
@@ -128412,13 +128389,15 @@ SWIG_init(void) {
SWIG_InitializeModule(0);
#ifdef SWIGPYTHON_BUILTIN
+ swigpyobject = SwigPyObject_TypeOnce();
+
SwigPyObject_stype = SWIG_MangledTypeQuery("_p_SwigPyObject");
assert(SwigPyObject_stype);
cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
if (!cd) {
SwigPyObject_stype->clientdata = &SwigPyObject_clientdata;
- SwigPyObject_clientdata.pytype = SwigPyObject_TypeOnce();
- } else if (SwigPyObject_TypeOnce()->tp_basicsize != cd->pytype->tp_basicsize) {
+ SwigPyObject_clientdata.pytype = swigpyobject;
+ } else if (swigpyobject->tp_basicsize != cd->pytype->tp_basicsize) {
PyErr_SetString(PyExc_RuntimeError, "Import error: attempted to load two incompatible swig-generated modules.");
# if PY_VERSION_HEX >= 0x03000000
return NULL;
@@ -128449,29 +128428,32 @@ SWIG_init(void) {
SWIG_InstallConstants(d,swig_const_table);
+ SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0)));
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*)"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);
+ 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 *)"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);
+ 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)));
SWIG_Python_SetConstant(d, "IHistogram_AVERAGE",SWIG_From_int(static_cast< int >(IHistogram::AVERAGE)));
SWIG_Python_SetConstant(d, "IHistogram_STANDARD_ERROR",SWIG_From_int(static_cast< int >(IHistogram::STANDARD_ERROR)));
diff --git a/auto/Wrap/libBornAgainCore_wrap.h b/auto/Wrap/libBornAgainCore_wrap.h
index 2074809c7219fc08a8d5d48cf1e18b23aca7c328..39090c917c2f3f29e4904bde8afe11b36672919b 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.8
+ * Version 3.0.12
*
* 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
diff --git a/auto/Wrap/libBornAgainFit.py b/auto/Wrap/libBornAgainFit.py
index 822afd1b5725f5e10708d674f578ffa299c0dc9e..c00961de0baadadd95cd6e832874867dfc003b69 100644
--- a/auto/Wrap/libBornAgainFit.py
+++ b/auto/Wrap/libBornAgainFit.py
@@ -1,15 +1,22 @@
# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 3.0.8
+# Version 3.0.12
#
# 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
-if version_info >= (2, 6, 0):
+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
@@ -19,22 +26,27 @@ if version_info >= (2, 6, 0):
except ImportError:
import _libBornAgainFit
return _libBornAgainFit
- if fp is not None:
- try:
- _mod = imp.load_module('_libBornAgainFit', fp, pathname, description)
- finally:
+ try:
+ _mod = imp.load_module('_libBornAgainFit', fp, pathname, description)
+ finally:
+ if fp is not None:
fp.close()
- return _mod
+ return _mod
_libBornAgainFit = swig_import_helper()
del swig_import_helper
else:
import _libBornAgainFit
-del version_info
+del _swig_python_version_info
+
try:
_swig_property = property
except NameError:
pass # Python < 2.2 doesn't have 'property'.
+try:
+ import builtins as __builtin__
+except ImportError:
+ import __builtin__
def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
if (name == "thisown"):
@@ -59,41 +71,34 @@ def _swig_setattr(self, class_type, name, value):
return _swig_setattr_nondynamic(self, class_type, name, value, 0)
-def _swig_getattr_nondynamic(self, class_type, name, static=1):
+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)
- if (not static):
- return object.__getattr__(self, name)
- else:
- raise AttributeError(name)
-
-def _swig_getattr(self, class_type, name):
- return _swig_getattr_nondynamic(self, class_type, name, 0)
+ raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
def _swig_repr(self):
try:
strthis = "proxy of " + self.this.__repr__()
- except Exception:
+ except __builtin__.Exception:
strthis = ""
return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
try:
_object = object
_newclass = 1
-except AttributeError:
+except __builtin__.Exception:
class _object:
pass
_newclass = 0
-
try:
import weakref
weakref_proxy = weakref.proxy
-except Exception:
+except __builtin__.Exception:
weakref_proxy = lambda x: x
@@ -204,8 +209,6 @@ class SwigPyIterator(_object):
SwigPyIterator_swigregister = _libBornAgainFit.SwigPyIterator_swigregister
SwigPyIterator_swigregister(SwigPyIterator)
-
-_libBornAgainFit.SHARED_PTR_DISOWN_swigconstant(_libBornAgainFit)
SHARED_PTR_DISOWN = _libBornAgainFit.SHARED_PTR_DISOWN
class vdouble1d_t(_object):
"""Proxy of C++ std::vector<(double)> class."""
@@ -359,7 +362,7 @@ class vdouble1d_t(_object):
this = _libBornAgainFit.new_vdouble1d_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -564,7 +567,7 @@ class vdouble2d_t(_object):
this = _libBornAgainFit.new_vdouble2d_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -769,7 +772,7 @@ class vector_integer_t(_object):
this = _libBornAgainFit.new_vector_integer_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -974,7 +977,7 @@ class vector_longinteger_t(_object):
this = _libBornAgainFit.new_vector_longinteger_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1179,7 +1182,7 @@ class vector_complex_t(_object):
this = _libBornAgainFit.new_vector_complex_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1384,7 +1387,7 @@ class vector_string_t(_object):
this = _libBornAgainFit.new_vector_string_t(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def push_back(self, x):
@@ -1463,7 +1466,7 @@ class RealLimits(_object):
this = _libBornAgainFit.new_RealLimits()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def hasLowerLimit(self):
@@ -1614,49 +1617,37 @@ class RealLimits(_object):
"""lowerLimited(double bound_value) -> RealLimits"""
return _libBornAgainFit.RealLimits_lowerLimited(bound_value)
- if _newclass:
- lowerLimited = staticmethod(lowerLimited)
- __swig_getmethods__["lowerLimited"] = lambda x: lowerLimited
+ lowerLimited = staticmethod(lowerLimited)
def positive():
"""positive() -> RealLimits"""
return _libBornAgainFit.RealLimits_positive()
- if _newclass:
- positive = staticmethod(positive)
- __swig_getmethods__["positive"] = lambda x: positive
+ positive = staticmethod(positive)
def nonnegative():
"""nonnegative() -> RealLimits"""
return _libBornAgainFit.RealLimits_nonnegative()
- if _newclass:
- nonnegative = staticmethod(nonnegative)
- __swig_getmethods__["nonnegative"] = lambda x: nonnegative
+ nonnegative = staticmethod(nonnegative)
def upperLimited(bound_value):
"""upperLimited(double bound_value) -> RealLimits"""
return _libBornAgainFit.RealLimits_upperLimited(bound_value)
- if _newclass:
- upperLimited = staticmethod(upperLimited)
- __swig_getmethods__["upperLimited"] = lambda x: upperLimited
+ upperLimited = staticmethod(upperLimited)
def limited(left_bound_value, right_bound_value):
"""limited(double left_bound_value, double right_bound_value) -> RealLimits"""
return _libBornAgainFit.RealLimits_limited(left_bound_value, right_bound_value)
- if _newclass:
- limited = staticmethod(limited)
- __swig_getmethods__["limited"] = lambda x: limited
+ limited = staticmethod(limited)
def limitless():
"""limitless() -> RealLimits"""
return _libBornAgainFit.RealLimits_limitless()
- if _newclass:
- limitless = staticmethod(limitless)
- __swig_getmethods__["limitless"] = lambda x: limitless
+ limitless = staticmethod(limitless)
def toString(self):
"""
@@ -1792,64 +1783,50 @@ class AttLimits(_object):
this = _libBornAgainFit.new_AttLimits()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def limitless():
"""limitless() -> AttLimits"""
return _libBornAgainFit.AttLimits_limitless()
- if _newclass:
- limitless = staticmethod(limitless)
- __swig_getmethods__["limitless"] = lambda x: limitless
+ limitless = staticmethod(limitless)
def lowerLimited(bound_value):
"""lowerLimited(double bound_value) -> AttLimits"""
return _libBornAgainFit.AttLimits_lowerLimited(bound_value)
- if _newclass:
- lowerLimited = staticmethod(lowerLimited)
- __swig_getmethods__["lowerLimited"] = lambda x: lowerLimited
+ lowerLimited = staticmethod(lowerLimited)
def positive():
"""positive() -> AttLimits"""
return _libBornAgainFit.AttLimits_positive()
- if _newclass:
- positive = staticmethod(positive)
- __swig_getmethods__["positive"] = lambda x: positive
+ positive = staticmethod(positive)
def nonnegative():
"""nonnegative() -> AttLimits"""
return _libBornAgainFit.AttLimits_nonnegative()
- if _newclass:
- nonnegative = staticmethod(nonnegative)
- __swig_getmethods__["nonnegative"] = lambda x: nonnegative
+ nonnegative = staticmethod(nonnegative)
def upperLimited(bound_value):
"""upperLimited(double bound_value) -> AttLimits"""
return _libBornAgainFit.AttLimits_upperLimited(bound_value)
- if _newclass:
- upperLimited = staticmethod(upperLimited)
- __swig_getmethods__["upperLimited"] = lambda x: upperLimited
+ upperLimited = staticmethod(upperLimited)
def limited(left_bound_value, right_bound_value):
"""limited(double left_bound_value, double right_bound_value) -> AttLimits"""
return _libBornAgainFit.AttLimits_limited(left_bound_value, right_bound_value)
- if _newclass:
- limited = staticmethod(limited)
- __swig_getmethods__["limited"] = lambda x: limited
+ limited = staticmethod(limited)
def fixed():
"""fixed() -> AttLimits"""
return _libBornAgainFit.AttLimits_fixed()
- if _newclass:
- fixed = staticmethod(fixed)
- __swig_getmethods__["fixed"] = lambda x: fixed
+ fixed = staticmethod(fixed)
def isFixed(self):
"""
@@ -2161,7 +2138,7 @@ class IFitParameter(_object):
this = _libBornAgainFit.new_IFitParameter(*args)
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainFit.delete_IFitParameter
__del__ = lambda self: None
@@ -2405,7 +2382,7 @@ class FitParameterSet(_object):
this = _libBornAgainFit.new_FitParameterSet()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainFit.delete_FitParameterSet
__del__ = lambda self: None
@@ -2650,7 +2627,7 @@ class MinimizerCatalogue(_object):
this = _libBornAgainFit.new_MinimizerCatalogue()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
def toString(self):
@@ -2717,33 +2694,25 @@ class MinimizerFactory(_object):
"""
return _libBornAgainFit.MinimizerFactory_createMinimizer(*args)
- if _newclass:
- createMinimizer = staticmethod(createMinimizer)
- __swig_getmethods__["createMinimizer"] = lambda x: createMinimizer
+ createMinimizer = staticmethod(createMinimizer)
def printCatalogue():
"""printCatalogue()"""
return _libBornAgainFit.MinimizerFactory_printCatalogue()
- if _newclass:
- printCatalogue = staticmethod(printCatalogue)
- __swig_getmethods__["printCatalogue"] = lambda x: printCatalogue
+ printCatalogue = staticmethod(printCatalogue)
def catalogueToString():
"""catalogueToString() -> std::string"""
return _libBornAgainFit.MinimizerFactory_catalogueToString()
- if _newclass:
- catalogueToString = staticmethod(catalogueToString)
- __swig_getmethods__["catalogueToString"] = lambda x: catalogueToString
+ catalogueToString = staticmethod(catalogueToString)
def catalogue():
"""catalogue() -> MinimizerCatalogue"""
return _libBornAgainFit.MinimizerFactory_catalogue()
- if _newclass:
- catalogue = staticmethod(catalogue)
- __swig_getmethods__["catalogue"] = lambda x: catalogue
+ catalogue = staticmethod(catalogue)
def __init__(self):
"""
@@ -2759,7 +2728,7 @@ class MinimizerFactory(_object):
this = _libBornAgainFit.new_MinimizerFactory()
try:
self.this.append(this)
- except Exception:
+ except __builtin__.Exception:
self.this = this
__swig_destroy__ = _libBornAgainFit.delete_MinimizerFactory
__del__ = lambda self: None
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 182abc5541c99f92f98a78439a7f630a79c6657c..b7e76296fa52e76b425d572277650073a06b751e 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.8
+ * Version 3.0.12
*
* 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
@@ -107,9 +107,11 @@ template <typename T> T SwigValueInit() {
#endif
/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# ifndef GCC_HASCLASSVISIBILITY
-# define GCC_HASCLASSVISIBILITY
+#if defined(__GNUC__)
+# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+# ifndef GCC_HASCLASSVISIBILITY
+# define GCC_HASCLASSVISIBILITY
+# endif
# endif
#endif
@@ -669,16 +671,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
char d = *(c++);
unsigned char uu;
if ((d >= '0') && (d <= '9'))
- uu = ((d - '0') << 4);
+ uu = (unsigned char)((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f'))
- uu = ((d - ('a'-10)) << 4);
+ uu = (unsigned char)((d - ('a'-10)) << 4);
else
return (char *) 0;
d = *(c++);
if ((d >= '0') && (d <= '9'))
- uu |= (d - '0');
+ uu |= (unsigned char)(d - '0');
else if ((d >= 'a') && (d <= 'f'))
- uu |= (d - ('a'-10));
+ uu |= (unsigned char)(d - ('a'-10));
else
return (char *) 0;
*u = uu;
@@ -861,10 +863,6 @@ PyString_FromFormat(const char *fmt, ...) {
}
#endif
-/* Add PyObject_Del for old Pythons */
-#if PY_VERSION_HEX < 0x01060000
-# define PyObject_Del(op) PyMem_DEL((op))
-#endif
#ifndef PyObject_DEL
# define PyObject_DEL PyObject_Del
#endif
@@ -979,6 +977,7 @@ typedef destructor freefunc;
#if PY_VERSION_HEX < 0x03020000
#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
+#define Py_hash_t long
#endif
/* -----------------------------------------------------------------------------
@@ -1927,7 +1926,6 @@ SwigPyObject_TypeOnce(void) {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX >= 0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else
@@ -1938,7 +1936,7 @@ SwigPyObject_TypeOnce(void) {
sizeof(SwigPyObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)SwigPyObject_dealloc, /* tp_dealloc */
- 0, /* tp_print */
+ 0, /* tp_print */
#if PY_VERSION_HEX < 0x02020000
(getattrfunc)SwigPyObject_getattr, /* tp_getattr */
#else
@@ -1946,7 +1944,7 @@ SwigPyObject_TypeOnce(void) {
#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 */
+ 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
#else
(cmpfunc)SwigPyObject_compare, /* tp_compare */
#endif
@@ -1956,7 +1954,7 @@ SwigPyObject_TypeOnce(void) {
0, /* tp_as_mapping */
(hashfunc)0, /* tp_hash */
(ternaryfunc)0, /* tp_call */
- 0, /* tp_str */
+ 0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
@@ -2119,7 +2117,6 @@ SwigPyPacked_TypeOnce(void) {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX>=0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else
@@ -3525,7 +3522,7 @@ static swig_module_info swig_module = {swig_types, 46, 0, 0, 0, 0};
#endif
#define SWIG_name "_libBornAgainFit"
-#define SWIGVERSION 0x030008
+#define SWIGVERSION 0x030012
#define SWIG_VERSION SWIGVERSION
@@ -3624,6 +3621,7 @@ namespace swig {
#endif
+#include <typeinfo>
#include <stdexcept>
@@ -3773,7 +3771,7 @@ SWIG_AsVal_double (PyObject *obj, double *val)
return SWIG_OK;
#if PY_VERSION_HEX < 0x03000000
} else if (PyInt_Check(obj)) {
- if (val) *val = PyInt_AsLong(obj);
+ if (val) *val = (double) PyInt_AsLong(obj);
return SWIG_OK;
#endif
} else if (PyLong_Check(obj)) {
@@ -3894,23 +3892,109 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
}
+#include <limits.h>
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+# define LLONG_MAX __LONG_LONG_MAX__
+# define LLONG_MIN (-LLONG_MAX - 1LL)
+# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
+#endif
+
+
+#if defined(LLONG_MAX) && !defined(SWIG_LONG_LONG_AVAILABLE)
+# define SWIG_LONG_LONG_AVAILABLE
+#endif
+
+
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_long_SS_long (PyObject *obj, unsigned long long *val)
+{
+ int res = SWIG_TypeError;
+ if (PyLong_Check(obj)) {
+ unsigned long long v = PyLong_AsUnsignedLongLong(obj);
+ if (!PyErr_Occurred()) {
+ if (val) *val = v;
+ return SWIG_OK;
+ } else {
+ PyErr_Clear();
+ res = SWIG_OverflowError;
+ }
+ } else {
+ unsigned long v;
+ res = SWIG_AsVal_unsigned_SS_long (obj,&v);
+ if (SWIG_IsOK(res)) {
+ if (val) *val = v;
+ return res;
+ }
+ }
+#ifdef SWIG_PYTHON_CAST_MODE
+ {
+ const double mant_max = 1LL << DBL_MANT_DIG;
+ double d;
+ res = SWIG_AsVal_double (obj,&d);
+ if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, 0, mant_max))
+ return SWIG_OverflowError;
+ if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) {
+ if (val) *val = (unsigned long long)(d);
+ return SWIG_AddCast(res);
+ }
+ res = SWIG_TypeError;
+ }
+#endif
+ return res;
+}
+#endif
+
+
SWIGINTERNINLINE int
SWIG_AsVal_size_t (PyObject * obj, size_t *val)
{
- unsigned long v;
- int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
- if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
+ int res = SWIG_TypeError;
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(size_t) <= sizeof(unsigned long)) {
+#endif
+ unsigned long v;
+ res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else if (sizeof(size_t) <= sizeof(unsigned long long)) {
+ unsigned long long v;
+ res = SWIG_AsVal_unsigned_SS_long_SS_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
+ }
+#endif
return res;
}
- #define SWIG_From_long PyLong_FromLong
+ #define SWIG_From_long PyInt_FromLong
+
+
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERNINLINE PyObject*
+SWIG_From_long_SS_long (long long value)
+{
+ return ((value < LONG_MIN) || (value > LONG_MAX)) ?
+ PyLong_FromLongLong(value) : PyInt_FromLong(static_cast< long >(value));
+}
+#endif
SWIGINTERNINLINE PyObject *
SWIG_From_ptrdiff_t (ptrdiff_t value)
{
- return SWIG_From_long (static_cast< long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(ptrdiff_t) <= sizeof(long)) {
+#endif
+ return SWIG_From_long (static_cast< long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else {
+ /* assume sizeof(ptrdiff_t) <= sizeof(long long) */
+ return SWIG_From_long_SS_long (static_cast< long long >(value));
+ }
+#endif
}
@@ -3964,12 +4048,65 @@ SWIG_AsVal_long (PyObject *obj, long* val)
}
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERN int
+SWIG_AsVal_long_SS_long (PyObject *obj, long long *val)
+{
+ int res = SWIG_TypeError;
+ if (PyLong_Check(obj)) {
+ long long v = PyLong_AsLongLong(obj);
+ if (!PyErr_Occurred()) {
+ if (val) *val = v;
+ return SWIG_OK;
+ } else {
+ PyErr_Clear();
+ res = SWIG_OverflowError;
+ }
+ } else {
+ long v;
+ res = SWIG_AsVal_long (obj,&v);
+ if (SWIG_IsOK(res)) {
+ if (val) *val = v;
+ return res;
+ }
+ }
+#ifdef SWIG_PYTHON_CAST_MODE
+ {
+ const double mant_max = 1LL << DBL_MANT_DIG;
+ const double mant_min = -mant_max;
+ double d;
+ res = SWIG_AsVal_double (obj,&d);
+ if (SWIG_IsOK(res) && !SWIG_CanCastAsInteger(&d, mant_min, mant_max))
+ return SWIG_OverflowError;
+ if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, mant_min, mant_max)) {
+ if (val) *val = (long long)(d);
+ return SWIG_AddCast(res);
+ }
+ res = SWIG_TypeError;
+ }
+#endif
+ return res;
+}
+#endif
+
+
SWIGINTERNINLINE int
SWIG_AsVal_ptrdiff_t (PyObject * obj, ptrdiff_t *val)
{
- long v;
- int res = SWIG_AsVal_long (obj, val ? &v : 0);
- if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
+ int res = SWIG_TypeError;
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(ptrdiff_t) <= sizeof(long)) {
+#endif
+ long v;
+ res = SWIG_AsVal_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else if (sizeof(ptrdiff_t) <= sizeof(long long)) {
+ long long v;
+ res = SWIG_AsVal_long_SS_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
+ }
+#endif
return res;
}
@@ -4014,8 +4151,21 @@ namespace swig {
return traits<typename noconst_traits<Type >::noconst_type >::type_name();
}
- template <class Type>
- struct traits_info {
+ template <class Type> struct traits_info {
+ static swig_type_info *type_query(std::string name) {
+ name += " *";
+ return SWIG_TypeQuery(name.c_str());
+ }
+ static swig_type_info *type_info() {
+ static swig_type_info *info = type_query(type_name<Type>());
+ return info;
+ }
+ };
+
+ /*
+ Partial specialization for pointers (traits_info)
+ */
+ template <class Type> struct traits_info<Type *> {
static swig_type_info *type_query(std::string name) {
name += " *";
return SWIG_TypeQuery(name.c_str());
@@ -4032,7 +4182,7 @@ namespace swig {
}
/*
- Partial specialization for pointers
+ Partial specialization for pointers (traits)
*/
template <class Type> struct traits <Type *> {
typedef pointer_category category;
@@ -4102,7 +4252,8 @@ namespace swig {
struct traits_asptr {
static int asptr(PyObject *obj, Type **val) {
Type *p;
- int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
+ swig_type_info *descriptor = type_info<Type>();
+ int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
if (SWIG_IsOK(res)) {
if (val) *val = p;
}
@@ -4250,7 +4401,7 @@ namespace swig {
namespace std {
template <>
- struct less <PyObject *>: public binary_function<PyObject *, PyObject *, bool>
+ struct less <PyObject *>
{
bool
operator()(PyObject * v, PyObject *w) const
@@ -4275,7 +4426,7 @@ namespace std {
};
template <>
- struct less <swig::SwigPtr_PyObject>: public binary_function<swig::SwigPtr_PyObject, swig::SwigPtr_PyObject, bool>
+ struct less <swig::SwigPtr_PyObject>
{
bool
operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
@@ -4285,7 +4436,7 @@ namespace std {
};
template <>
- struct less <swig::SwigVar_PyObject>: public binary_function<swig::SwigVar_PyObject, swig::SwigVar_PyObject, bool>
+ struct less <swig::SwigVar_PyObject>
{
bool
operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const
@@ -4348,7 +4499,7 @@ namespace swig {
if (step == 0) {
throw std::invalid_argument("slice step cannot be zero");
} else if (step > 0) {
- // Required range: 0 <= i < size, 0 <= j < size
+ // Required range: 0 <= i < size, 0 <= j < size, i <= j
if (i < 0) {
ii = 0;
} else if (i < (Difference)size) {
@@ -4356,13 +4507,15 @@ namespace swig {
} else if (insert && (i >= (Difference)size)) {
ii = (Difference)size;
}
- if ( j < 0 ) {
+ if (j < 0) {
jj = 0;
} else {
jj = (j < (Difference)size) ? j : (Difference)size;
}
+ if (jj < ii)
+ jj = ii;
} else {
- // Required range: -1 <= i < size-1, -1 <= j < size-1
+ // Required range: -1 <= i < size-1, -1 <= j < size-1, i >= j
if (i < -1) {
ii = -1;
} else if (i < (Difference) size) {
@@ -4375,6 +4528,8 @@ namespace swig {
} else {
jj = (j < (Difference)size ) ? j : (Difference)(size-1);
}
+ if (ii < jj)
+ ii = jj;
}
}
@@ -4400,6 +4555,13 @@ namespace swig {
seq->erase(position);
}
+ template <class Sequence>
+ struct traits_reserve {
+ static void reserve(Sequence & /*seq*/, typename Sequence::size_type /*n*/) {
+ // This should be specialized for types that support reserve
+ }
+ };
+
template <class Sequence, class Difference>
inline Sequence*
getslice(const Sequence* self, Difference i, Difference j, Py_ssize_t step) {
@@ -4417,6 +4579,7 @@ namespace swig {
return new Sequence(sb, se);
} else {
Sequence *sequence = new Sequence();
+ swig::traits_reserve<Sequence>::reserve(*sequence, (jj - ii + step - 1) / step);
typename Sequence::const_iterator it = sb;
while (it!=se) {
sequence->push_back(*it);
@@ -4427,17 +4590,16 @@ namespace swig {
}
} else {
Sequence *sequence = new Sequence();
- if (ii > jj) {
- typename Sequence::const_reverse_iterator sb = self->rbegin();
- typename Sequence::const_reverse_iterator se = self->rbegin();
- std::advance(sb,size-ii-1);
- std::advance(se,size-jj-1);
- typename Sequence::const_reverse_iterator it = sb;
- while (it!=se) {
- sequence->push_back(*it);
- for (Py_ssize_t c=0; c<-step && it!=se; ++c)
- it++;
- }
+ swig::traits_reserve<Sequence>::reserve(*sequence, (ii - jj - step - 1) / -step);
+ typename Sequence::const_reverse_iterator sb = self->rbegin();
+ typename Sequence::const_reverse_iterator se = self->rbegin();
+ std::advance(sb,size-ii-1);
+ std::advance(se,size-jj-1);
+ typename Sequence::const_reverse_iterator it = sb;
+ while (it!=se) {
+ sequence->push_back(*it);
+ for (Py_ssize_t c=0; c<-step && it!=se; ++c)
+ it++;
}
return sequence;
}
@@ -4451,12 +4613,11 @@ namespace swig {
Difference jj = 0;
swig::slice_adjust(i, j, step, size, ii, jj, true);
if (step > 0) {
- if (jj < ii)
- jj = ii;
if (step == 1) {
size_t ssize = jj - ii;
if (ssize <= is.size()) {
// expanding/staying the same size
+ swig::traits_reserve<Sequence>::reserve(*self, self->size() - ssize + is.size());
typename Sequence::iterator sb = self->begin();
typename InputSeq::const_iterator isit = is.begin();
std::advance(sb,ii);
@@ -4490,8 +4651,6 @@ namespace swig {
}
}
} else {
- if (jj > ii)
- jj = ii;
size_t replacecount = (ii - jj - step - 1) / -step;
if (is.size() != replacecount) {
char msg[1024];
@@ -4517,37 +4676,33 @@ namespace swig {
Difference jj = 0;
swig::slice_adjust(i, j, step, size, ii, jj, true);
if (step > 0) {
- if (jj > ii) {
- typename Sequence::iterator sb = self->begin();
- std::advance(sb,ii);
- if (step == 1) {
- typename Sequence::iterator se = self->begin();
- std::advance(se,jj);
- self->erase(sb,se);
- } else {
- typename Sequence::iterator it = sb;
- size_t delcount = (jj - ii + step - 1) / step;
- while (delcount) {
- it = self->erase(it);
- for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
- it++;
- delcount--;
- }
- }
- }
- } else {
- if (ii > jj) {
- typename Sequence::reverse_iterator sb = self->rbegin();
- std::advance(sb,size-ii-1);
- typename Sequence::reverse_iterator it = sb;
- size_t delcount = (ii - jj - step - 1) / -step;
+ typename Sequence::iterator sb = self->begin();
+ std::advance(sb,ii);
+ if (step == 1) {
+ typename Sequence::iterator se = self->begin();
+ std::advance(se,jj);
+ self->erase(sb,se);
+ } else {
+ typename Sequence::iterator it = sb;
+ size_t delcount = (jj - ii + step - 1) / step;
while (delcount) {
- it = typename Sequence::reverse_iterator(self->erase((++it).base()));
- for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
+ it = self->erase(it);
+ for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
it++;
delcount--;
}
}
+ } else {
+ typename Sequence::reverse_iterator sb = self->rbegin();
+ std::advance(sb,size-ii-1);
+ typename Sequence::reverse_iterator it = sb;
+ size_t delcount = (ii - jj - step - 1) / -step;
+ while (delcount) {
+ it = typename Sequence::reverse_iterator(self->erase((++it).base()));
+ for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
+ it++;
+ delcount--;
+ }
}
}
}
@@ -5046,8 +5201,8 @@ namespace swig {
static int asptr(PyObject *obj, sequence **seq) {
if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
sequence *p;
- if (::SWIG_ConvertPtr(obj,(void**)&p,
- swig::type_info<sequence>(),0) == SWIG_OK) {
+ swig_type_info *descriptor = swig::type_info<sequence>();
+ if (descriptor && SWIG_IsOK(::SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
if (seq) *seq = p;
return SWIG_OLDOBJ;
}
@@ -5086,7 +5241,7 @@ namespace swig {
#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS
swig_type_info *desc = swig::type_info<sequence>();
if (desc && desc->clientdata) {
- return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
+ return SWIG_InternalNewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
}
#endif
size_type size = seq.size();
@@ -5107,6 +5262,13 @@ namespace swig {
namespace swig {
+ template <class T>
+ struct traits_reserve<std::vector<T> > {
+ static void reserve(std::vector<T> &seq, typename std::vector<T>::size_type n) {
+ seq.reserve(n);
+ }
+ };
+
template <class T>
struct traits_asptr<std::vector<T> > {
static int asptr(PyObject *obj, std::vector<T> **vec) {
@@ -5149,14 +5311,33 @@ SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
return (value > LONG_MAX) ?
- PyLong_FromUnsignedLong(value) : PyLong_FromLong(static_cast< long >(value));
+ PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value));
}
+#ifdef SWIG_LONG_LONG_AVAILABLE
+SWIGINTERNINLINE PyObject*
+SWIG_From_unsigned_SS_long_SS_long (unsigned long long value)
+{
+ return (value > LONG_MAX) ?
+ PyLong_FromUnsignedLongLong(value) : PyInt_FromLong(static_cast< long >(value));
+}
+#endif
+
+
SWIGINTERNINLINE PyObject *
SWIG_From_size_t (size_t value)
{
- return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ if (sizeof(size_t) <= sizeof(unsigned long)) {
+#endif
+ return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
+#ifdef SWIG_LONG_LONG_AVAILABLE
+ } else {
+ /* assume sizeof(size_t) <= sizeof(unsigned long long) */
+ return SWIG_From_unsigned_SS_long_SS_long (static_cast< unsigned long long >(value));
+ }
+#endif
}
SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_Sg____getslice__(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){
@@ -5340,16 +5521,6 @@ SWIGINTERN std::vector< std::vector< double > >::iterator std_vector_Sl_std_vect
SWIGINTERN std::vector< std::vector< double > >::iterator std_vector_Sl_std_vector_Sl_double_Sg__Sg__insert__SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::iterator pos,std::vector< std::vector< double > >::value_type const &x){ return self->insert(pos, x); }
SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg__insert__SWIG_1(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::iterator pos,std::vector< std::vector< double > >::size_type n,std::vector< std::vector< double > >::value_type const &x){ self->insert(pos, n, x); }
-#include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-# define LLONG_MAX __LONG_LONG_MAX__
-# define LLONG_MIN (-LLONG_MAX - 1LL)
-# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
-#endif
-
-
SWIGINTERN int
SWIG_AsVal_int (PyObject * obj, int *val)
{
@@ -5627,7 +5798,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/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/3.0.12/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
@@ -5777,13 +5948,18 @@ SWIGINTERN int
SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
{
#if PY_VERSION_HEX>=0x03000000
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+ if (PyBytes_Check(obj))
+#else
if (PyUnicode_Check(obj))
+#endif
#else
if (PyString_Check(obj))
#endif
{
char *cstr; Py_ssize_t len;
#if PY_VERSION_HEX>=0x03000000
+#if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
if (!alloc && cptr) {
/* We can't allow converting without allocation, since the internal
representation of string in Python 3 is UCS-2/UCS-4 but we require
@@ -5792,8 +5968,9 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
return SWIG_RuntimeError;
}
obj = PyUnicode_AsUTF8String(obj);
- PyBytes_AsStringAndSize(obj, &cstr, &len);
if(alloc) *alloc = SWIG_NEWOBJ;
+#endif
+ PyBytes_AsStringAndSize(obj, &cstr, &len);
#else
PyString_AsStringAndSize(obj, &cstr, &len);
#endif
@@ -5814,26 +5991,34 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
if (*alloc == SWIG_NEWOBJ)
#endif
{
- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1)));
+ *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
*alloc = SWIG_NEWOBJ;
} else {
*cptr = cstr;
*alloc = SWIG_OLDOBJ;
}
} else {
- #if PY_VERSION_HEX>=0x03000000
- assert(0); /* Should never reach here in Python 3 */
- #endif
+#if PY_VERSION_HEX>=0x03000000
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+ *cptr = PyBytes_AsString(obj);
+#else
+ assert(0); /* Should never reach here with Unicode strings in Python 3 */
+#endif
+#else
*cptr = SWIG_Python_str_AsChar(obj);
+#endif
}
}
if (psize) *psize = len + 1;
-#if PY_VERSION_HEX>=0x03000000
+#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
Py_XDECREF(obj);
#endif
return SWIG_OK;
} else {
#if defined(SWIG_PYTHON_2_UNICODE)
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+#error "Cannot use both SWIG_PYTHON_2_UNICODE and SWIG_PYTHON_STRICT_BYTE_CHAR at once"
+#endif
#if PY_VERSION_HEX<0x03000000
if (PyUnicode_Check(obj)) {
char *cstr; Py_ssize_t len;
@@ -5844,7 +6029,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
if (cptr) {
if (alloc) *alloc = SWIG_NEWOBJ;
- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1)));
+ *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
}
if (psize) *psize = len + 1;
@@ -5931,11 +6116,15 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
SWIG_InternalNewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
} else {
#if PY_VERSION_HEX >= 0x03000000
+#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));
#endif
@@ -6970,22 +7159,11 @@ fail:
SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_swig__SwigPyIterator, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *SHARED_PTR_DISOWN_swigconstant(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *module;
- PyObject *d;
- if (!PyArg_ParseTuple(args,(char*)"O:swigconstant", &module)) return NULL;
- d = PyModule_GetDict(module);
- if (!d) return NULL;
- SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0)));
- return SWIG_Py_Void();
-}
-
-
SWIGINTERN PyObject *_wrap_vdouble1d_t_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::vector< double > *arg1 = (std::vector< double > *) 0 ;
@@ -8899,7 +9077,7 @@ fail:
SWIGINTERN PyObject *vdouble1d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -10847,7 +11025,7 @@ fail:
SWIGINTERN PyObject *vdouble2d_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -12765,7 +12943,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -14683,7 +14861,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -16601,7 +16779,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &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();
}
@@ -18549,7 +18727,7 @@ 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 (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -19229,7 +19407,7 @@ fail:
SWIGINTERN PyObject *RealLimits_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RealLimits, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -19671,7 +19849,7 @@ fail:
SWIGINTERN PyObject *AttLimits_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_AttLimits, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -20017,7 +20195,7 @@ fail:
SWIGINTERN PyObject *IMinimizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IMinimizer, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -20925,7 +21103,7 @@ fail:
SWIGINTERN PyObject *IFitParameter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_IFitParameter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -21871,7 +22049,7 @@ fail:
SWIGINTERN PyObject *FitParameterSet_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_FitParameterSet, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -22010,7 +22188,7 @@ fail:
SWIGINTERN PyObject *MinimizerCatalogue_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_MinimizerCatalogue, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -22283,7 +22461,7 @@ fail:
SWIGINTERN PyObject *MinimizerFactory_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_MinimizerFactory, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -22317,7 +22495,6 @@ static PyMethodDef SwigMethods[] = {
"SwigPyIterator___sub__(SwigPyIterator self, SwigPyIterator x) -> ptrdiff_t\n"
""},
{ (char *)"SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_VARARGS, NULL},
- { (char *)"SHARED_PTR_DISOWN_swigconstant", SHARED_PTR_DISOWN_swigconstant, 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"},
@@ -23917,7 +24094,6 @@ extern "C" {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX >= 0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else
@@ -24149,13 +24325,13 @@ SWIG_init(void) {
static PyGetSetDef thisown_getset_def = {
(char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
};
- PyObject *metatype_args;
PyTypeObject *builtin_pytype;
int builtin_base_count;
swig_type_info *builtin_basetype;
PyObject *tuple;
PyGetSetDescrObject *static_getset;
PyTypeObject *metatype;
+ PyTypeObject *swigpyobject;
SwigPyClientData *cd;
PyObject *public_interface, *public_symbol;
PyObject *this_descr;
@@ -24170,14 +24346,9 @@ SWIG_init(void) {
(void)static_getset;
(void)self;
- /* metatype is used to implement static member variables. */
- metatype_args = Py_BuildValue("(s(O){})", "SwigPyObjectType", &PyType_Type);
- assert(metatype_args);
- metatype = (PyTypeObject *) PyType_Type.tp_call((PyObject *) &PyType_Type, metatype_args, NULL);
+ /* Metaclass is used to implement static member variables */
+ metatype = SwigPyObjectType();
assert(metatype);
- Py_DECREF(metatype_args);
- metatype->tp_setattro = (setattrofunc) &SwigPyObjectType_setattro;
- assert(PyType_Ready(metatype) >= 0);
#endif
/* Fix SwigMethods to carry the callback ptrs when needed */
@@ -24195,13 +24366,15 @@ SWIG_init(void) {
SWIG_InitializeModule(0);
#ifdef SWIGPYTHON_BUILTIN
+ swigpyobject = SwigPyObject_TypeOnce();
+
SwigPyObject_stype = SWIG_MangledTypeQuery("_p_SwigPyObject");
assert(SwigPyObject_stype);
cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
if (!cd) {
SwigPyObject_stype->clientdata = &SwigPyObject_clientdata;
- SwigPyObject_clientdata.pytype = SwigPyObject_TypeOnce();
- } else if (SwigPyObject_TypeOnce()->tp_basicsize != cd->pytype->tp_basicsize) {
+ SwigPyObject_clientdata.pytype = swigpyobject;
+ } else if (swigpyobject->tp_basicsize != cd->pytype->tp_basicsize) {
PyErr_SetString(PyExc_RuntimeError, "Import error: attempted to load two incompatible swig-generated modules.");
# if PY_VERSION_HEX >= 0x03000000
return NULL;
@@ -24232,6 +24405,7 @@ SWIG_init(void) {
SWIG_InstallConstants(d,swig_const_table);
+ SWIG_Python_SetConstant(d, "SHARED_PTR_DISOWN",SWIG_From_int(static_cast< int >(0)));
import_array();
diff --git a/auto/Wrap/libBornAgainFit_wrap.h b/auto/Wrap/libBornAgainFit_wrap.h
index 1aa4403ae1c013f289f654df97b603f2aaed04bf..e6c542b09355fb3037e3e588c6f86bfeacf713fe 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.8
+ * Version 3.0.12
*
* 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
diff --git a/auto/Wrap/swig_runtime.h b/auto/Wrap/swig_runtime.h
index 96d50bdb9a2cb380943883a9a7dd1050b29d8bf4..de3fda4358271c36fbaf611150d8bc567608a740 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.8
+ * Version 3.0.12
*
* 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
@@ -75,9 +75,11 @@
#endif
/* exporting methods */
-#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# ifndef GCC_HASCLASSVISIBILITY
-# define GCC_HASCLASSVISIBILITY
+#if defined(__GNUC__)
+# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+# ifndef GCC_HASCLASSVISIBILITY
+# define GCC_HASCLASSVISIBILITY
+# endif
# endif
#endif
@@ -642,16 +644,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
char d = *(c++);
unsigned char uu;
if ((d >= '0') && (d <= '9'))
- uu = ((d - '0') << 4);
+ uu = (unsigned char)((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f'))
- uu = ((d - ('a'-10)) << 4);
+ uu = (unsigned char)((d - ('a'-10)) << 4);
else
return (char *) 0;
d = *(c++);
if ((d >= '0') && (d <= '9'))
- uu |= (d - '0');
+ uu |= (unsigned char)(d - '0');
else if ((d >= 'a') && (d <= 'f'))
- uu |= (d - ('a'-10));
+ uu |= (unsigned char)(d - ('a'-10));
else
return (char *) 0;
*u = uu;
@@ -816,10 +818,6 @@ PyString_FromFormat(const char *fmt, ...) {
}
#endif
-/* Add PyObject_Del for old Pythons */
-#if PY_VERSION_HEX < 0x01060000
-# define PyObject_Del(op) PyMem_DEL((op))
-#endif
#ifndef PyObject_DEL
# define PyObject_DEL PyObject_Del
#endif
@@ -934,6 +932,7 @@ typedef destructor freefunc;
#if PY_VERSION_HEX < 0x03020000
#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
+#define Py_hash_t long
#endif
/* -----------------------------------------------------------------------------
* error manipulation
@@ -1878,7 +1877,6 @@ SwigPyObject_TypeOnce(void) {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX >= 0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else
@@ -1889,7 +1887,7 @@ SwigPyObject_TypeOnce(void) {
sizeof(SwigPyObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)SwigPyObject_dealloc, /* tp_dealloc */
- 0, /* tp_print */
+ 0, /* tp_print */
#if PY_VERSION_HEX < 0x02020000
(getattrfunc)SwigPyObject_getattr, /* tp_getattr */
#else
@@ -1897,7 +1895,7 @@ SwigPyObject_TypeOnce(void) {
#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 */
+ 0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
#else
(cmpfunc)SwigPyObject_compare, /* tp_compare */
#endif
@@ -1907,7 +1905,7 @@ SwigPyObject_TypeOnce(void) {
0, /* tp_as_mapping */
(hashfunc)0, /* tp_hash */
(ternaryfunc)0, /* tp_call */
- 0, /* tp_str */
+ 0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
@@ -2070,7 +2068,6 @@ SwigPyPacked_TypeOnce(void) {
static int type_init = 0;
if (!type_init) {
const PyTypeObject tmp = {
- /* PyObject header changed in Python 3 */
#if PY_VERSION_HEX>=0x03000000
PyVarObject_HEAD_INIT(NULL, 0)
#else