From 1653e28dac4a735a9dfd89fefdadcb20d82a1321 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 22 Feb 2018 13:53:53 +0100
Subject: [PATCH] Unnecessary getters removed from FitSuite
---
Core/Fitting/FitSuite.cpp | 10 -
Core/Fitting/FitSuite.h | 2 -
auto/Wrap/libBornAgainCore.py | 548 +++++-----
auto/Wrap/libBornAgainCore_wrap.cpp | 1524 +++++++++++----------------
auto/Wrap/libBornAgainCore_wrap.h | 2 +-
auto/Wrap/libBornAgainFit.py | 153 +--
auto/Wrap/libBornAgainFit_wrap.cpp | 450 +++-----
auto/Wrap/libBornAgainFit_wrap.h | 2 +-
auto/Wrap/swig_runtime.h | 31 +-
9 files changed, 1135 insertions(+), 1587 deletions(-)
diff --git a/Core/Fitting/FitSuite.cpp b/Core/Fitting/FitSuite.cpp
index 346640c57d8..850ea59b20d 100644
--- a/Core/Fitting/FitSuite.cpp
+++ b/Core/Fitting/FitSuite.cpp
@@ -142,21 +142,11 @@ IHistogram* FitSuite::getChiSquaredMap(size_t i_item) const
return result.release();
}
-const OutputData<double>* FitSuite::getRealOutputData(size_t i_item) const
-{
- return &m_impl->fitObjects()->getRealData(i_item);
-}
-
const OutputData<double>* FitSuite::getSimulationOutputData(size_t i_item) const
{
return &m_impl->fitObjects()->getSimulationData(i_item);
}
-const OutputData<double>* FitSuite::getChiSquaredOutputData(size_t i_item) const
-{
- return &m_impl->fitObjects()->getChiSquaredMap(i_item);
-}
-
std::string FitSuite::parametersToString() const
{
return m_impl->fitObjects()->parametersToString();
diff --git a/Core/Fitting/FitSuite.h b/Core/Fitting/FitSuite.h
index aa6f796d6db..ddb3de30be6 100644
--- a/Core/Fitting/FitSuite.h
+++ b/Core/Fitting/FitSuite.h
@@ -159,9 +159,7 @@ public:
void resetInterrupt();
bool isInterrupted();
- const OutputData<double>* getRealOutputData(size_t i_item = 0) const;
const OutputData<double>* getSimulationOutputData(size_t i_item = 0) const;
- const OutputData<double>* getChiSquaredOutputData(size_t i_item = 0) const;
//! Returns multiline string representing possible fit parameters.
std::string parametersToString() const;
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 9bf93d6cbd7..cbad7e127c8 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -1,22 +1,15 @@
# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 3.0.12
+# Version 3.0.8
#
# Do not make changes to this file unless you know what you are doing--modify
# the SWIG interface file instead.
-from sys import version_info as _swig_python_version_info
-if _swig_python_version_info >= (2, 7, 0):
- def swig_import_helper():
- import importlib
- pkg = __name__.rpartition('.')[0]
- mname = '.'.join((pkg, '_libBornAgainCore')).lstrip('.')
- try:
- return importlib.import_module(mname)
- except ImportError:
- return importlib.import_module('_libBornAgainCore')
- _libBornAgainCore = swig_import_helper()
- del swig_import_helper
-elif _swig_python_version_info >= (2, 6, 0):
+
+
+
+
+from sys import version_info
+if version_info >= (2, 6, 0):
def swig_import_helper():
from os.path import dirname
import imp
@@ -26,27 +19,22 @@ elif _swig_python_version_info >= (2, 6, 0):
except ImportError:
import _libBornAgainCore
return _libBornAgainCore
- try:
- _mod = imp.load_module('_libBornAgainCore', fp, pathname, description)
- finally:
- if fp is not None:
+ if fp is not None:
+ try:
+ _mod = imp.load_module('_libBornAgainCore', fp, pathname, description)
+ finally:
fp.close()
- return _mod
+ return _mod
_libBornAgainCore = swig_import_helper()
del swig_import_helper
else:
import _libBornAgainCore
-del _swig_python_version_info
-
+del 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"):
@@ -71,34 +59,41 @@ def _swig_setattr(self, class_type, name, value):
return _swig_setattr_nondynamic(self, class_type, name, value, 0)
-def _swig_getattr(self, class_type, name):
+def _swig_getattr_nondynamic(self, class_type, name, static=1):
if (name == "thisown"):
return self.this.own()
method = class_type.__swig_getmethods__.get(name, None)
if method:
return method(self)
- raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
+ 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)
def _swig_repr(self):
try:
strthis = "proxy of " + self.this.__repr__()
- except __builtin__.Exception:
+ except Exception:
strthis = ""
return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
try:
_object = object
_newclass = 1
-except __builtin__.Exception:
+except AttributeError:
class _object:
pass
_newclass = 0
+
try:
import weakref
weakref_proxy = weakref.proxy
-except __builtin__.Exception:
+except Exception:
weakref_proxy = lambda x: x
@@ -209,6 +204,8 @@ 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):
@@ -389,7 +386,7 @@ class vdouble1d_t(_object):
this = _libBornAgainCore.new_vdouble1d_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -601,7 +598,7 @@ class vdouble2d_t(_object):
this = _libBornAgainCore.new_vdouble2d_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -813,7 +810,7 @@ class vector_integer_t(_object):
this = _libBornAgainCore.new_vector_integer_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1025,7 +1022,7 @@ class vinteger2d_t(_object):
this = _libBornAgainCore.new_vinteger2d_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1237,7 +1234,7 @@ class vector_longinteger_t(_object):
this = _libBornAgainCore.new_vector_longinteger_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1449,7 +1446,7 @@ class vector_complex_t(_object):
this = _libBornAgainCore.new_vector_complex_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1661,7 +1658,7 @@ class vector_string_t(_object):
this = _libBornAgainCore.new_vector_string_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1828,7 +1825,7 @@ class INamed(_object):
this = _libBornAgainCore.new_INamed(_self, *args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_INamed
__del__ = lambda self: None
@@ -1885,7 +1882,7 @@ class IParameterized(INamed):
this = _libBornAgainCore.new_IParameterized(_self, *args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IParameterized
__del__ = lambda self: None
@@ -2015,19 +2012,25 @@ class IParameterized(INamed):
"""XComponentName(std::string const & base_name) -> std::string"""
return _libBornAgainCore.IParameterized_XComponentName(base_name)
- XComponentName = staticmethod(XComponentName)
+ if _newclass:
+ XComponentName = staticmethod(XComponentName)
+ __swig_getmethods__["XComponentName"] = lambda x: XComponentName
def YComponentName(base_name):
"""YComponentName(std::string const & base_name) -> std::string"""
return _libBornAgainCore.IParameterized_YComponentName(base_name)
- YComponentName = staticmethod(YComponentName)
+ if _newclass:
+ YComponentName = staticmethod(YComponentName)
+ __swig_getmethods__["YComponentName"] = lambda x: YComponentName
def ZComponentName(base_name):
"""ZComponentName(std::string const & base_name) -> std::string"""
return _libBornAgainCore.IParameterized_ZComponentName(base_name)
- ZComponentName = staticmethod(ZComponentName)
+ if _newclass:
+ ZComponentName = staticmethod(ZComponentName)
+ __swig_getmethods__["ZComponentName"] = lambda x: ZComponentName
def __disown__(self):
self.this.disown()
_libBornAgainCore.disown_IParameterized(self)
@@ -2081,7 +2084,7 @@ class INode(IParameterized):
this = _libBornAgainCore.new_INode(_self, )
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_INode
__del__ = lambda self: None
@@ -2354,7 +2357,7 @@ class swig_dummy_type_inode_vector(_object):
this = _libBornAgainCore.new_swig_dummy_type_inode_vector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -2566,7 +2569,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 __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -2778,7 +2781,7 @@ class swig_dummy_type_axisinfo_vector(_object):
this = _libBornAgainCore.new_swig_dummy_type_axisinfo_vector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -2860,7 +2863,7 @@ class kvector_t(_object):
this = _libBornAgainCore.new_kvector_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def x(self):
@@ -3290,7 +3293,7 @@ class vector_kvector_t(_object):
this = _libBornAgainCore.new_vector_kvector_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -3372,7 +3375,7 @@ class cvector_t(_object):
this = _libBornAgainCore.new_cvector_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def x(self):
@@ -3710,7 +3713,7 @@ class vector_cvector_t(_object):
this = _libBornAgainCore.new_vector_cvector_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -3823,7 +3826,9 @@ class WavevectorInfo(_object):
"""GetZeroQ() -> WavevectorInfo"""
return _libBornAgainCore.WavevectorInfo_GetZeroQ()
- GetZeroQ = staticmethod(GetZeroQ)
+ if _newclass:
+ GetZeroQ = staticmethod(GetZeroQ)
+ __swig_getmethods__["GetZeroQ"] = lambda x: GetZeroQ
def __init__(self, *args):
"""
@@ -3836,7 +3841,7 @@ class WavevectorInfo(_object):
this = _libBornAgainCore.new_WavevectorInfo(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def transformed(self, transform):
@@ -3945,7 +3950,7 @@ class Beam(INode):
this = _libBornAgainCore.new_Beam(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Beam
__del__ = lambda self: None
@@ -4132,7 +4137,7 @@ class Bin1D(_object):
this = _libBornAgainCore.new_Bin1D(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_setmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_set
__swig_getmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_get
@@ -4208,7 +4213,7 @@ class Bin1DKVector(_object):
this = _libBornAgainCore.new_Bin1DKVector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def getMidPoint(self):
@@ -4273,7 +4278,7 @@ class Bin1DCVector(_object):
this = _libBornAgainCore.new_Bin1DCVector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def getMidPoint(self):
@@ -4570,7 +4575,7 @@ class VariableBinAxis(IAxis):
this = _libBornAgainCore.new_VariableBinAxis(name, nbins, bin_boundaries)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_VariableBinAxis
__del__ = lambda self: None
@@ -4743,7 +4748,7 @@ class ConstKBinAxis(VariableBinAxis):
this = _libBornAgainCore.new_ConstKBinAxis(name, nbins, start, end)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ConstKBinAxis
__del__ = lambda self: None
@@ -4821,7 +4826,7 @@ class CustomBinAxis(VariableBinAxis):
this = _libBornAgainCore.new_CustomBinAxis(name, nbins, start, end)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_CustomBinAxis
__del__ = lambda self: None
@@ -4998,7 +5003,7 @@ class ISample(ICloneable, INode):
this = _libBornAgainCore.new_ISample(_self, )
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ISample
__del__ = lambda self: None
@@ -5227,7 +5232,7 @@ class IObservable(_object):
this = _libBornAgainCore.new_IObservable(_self, )
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def __disown__(self):
self.this.disown()
@@ -5270,7 +5275,7 @@ class IFitObserver(IObserver):
this = _libBornAgainCore.new_IFitObserver(_self, update_every_nth)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def notify(self, subject):
@@ -5392,7 +5397,7 @@ class FitStrategyDefault(IFitStrategy):
this = _libBornAgainCore.new_FitStrategyDefault()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -5518,7 +5523,7 @@ class IntensityFunctionLog(IIntensityFunction):
this = _libBornAgainCore.new_IntensityFunctionLog()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
IntensityFunctionLog_swigregister = _libBornAgainCore.IntensityFunctionLog_swigregister
IntensityFunctionLog_swigregister(IntensityFunctionLog)
@@ -5579,7 +5584,7 @@ class IntensityFunctionSqrt(IIntensityFunction):
this = _libBornAgainCore.new_IntensityFunctionSqrt()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
IntensityFunctionSqrt_swigregister = _libBornAgainCore.IntensityFunctionSqrt_swigregister
IntensityFunctionSqrt_swigregister(IntensityFunctionSqrt)
@@ -5683,7 +5688,7 @@ class IntensityNormalizer(IIntensityNormalizer):
this = _libBornAgainCore.new_IntensityNormalizer(scale, shift)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityNormalizer
__del__ = lambda self: None
@@ -5774,7 +5779,7 @@ class IntensityScaleAndShiftNormalizer(IntensityNormalizer):
this = _libBornAgainCore.new_IntensityScaleAndShiftNormalizer(scale, shift)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityScaleAndShiftNormalizer
__del__ = lambda self: None
@@ -5897,7 +5902,7 @@ class SquaredFunctionDefault(ISquaredFunction):
this = _libBornAgainCore.new_SquaredFunctionDefault()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SquaredFunctionDefault
__del__ = lambda self: None
@@ -6194,7 +6199,7 @@ class ChiSquaredModule(IChiSquaredModule):
this = _libBornAgainCore.new_ChiSquaredModule(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ChiSquaredModule
__del__ = lambda self: None
@@ -6271,7 +6276,7 @@ class FitObject(INode):
this = _libBornAgainCore.new_FitObject(simulation, real_data, weight)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitObject
__del__ = lambda self: None
@@ -6401,7 +6406,7 @@ class FitOptions(_object):
this = _libBornAgainCore.new_FitOptions()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitOptions
__del__ = lambda self: None
@@ -6464,7 +6469,7 @@ class FitParameter(libBornAgainFit.IFitParameter):
this = _libBornAgainCore.new_FitParameter(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitParameter
__del__ = lambda self: None
@@ -6605,7 +6610,7 @@ class FitSuite(IObservable):
this = _libBornAgainCore.new_FitSuite()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitSuite
__del__ = lambda self: None
@@ -6938,17 +6943,6 @@ class FitSuite(IObservable):
return _libBornAgainCore.FitSuite_isInterrupted(self)
- def getRealOutputData(self, i_item=0):
- """
- getRealOutputData(FitSuite self, size_t i_item=0) -> IntensityData
- getRealOutputData(FitSuite self) -> IntensityData
-
- const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const
-
- """
- return _libBornAgainCore.FitSuite_getRealOutputData(self, i_item)
-
-
def getSimulationOutputData(self, i_item=0):
"""
getSimulationOutputData(FitSuite self, size_t i_item=0) -> IntensityData
@@ -6960,17 +6954,6 @@ class FitSuite(IObservable):
return _libBornAgainCore.FitSuite_getSimulationOutputData(self, i_item)
- def getChiSquaredOutputData(self, i_item=0):
- """
- getChiSquaredOutputData(FitSuite self, size_t i_item=0) -> IntensityData
- getChiSquaredOutputData(FitSuite self) -> IntensityData
-
- const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const
-
- """
- return _libBornAgainCore.FitSuite_getChiSquaredOutputData(self, i_item)
-
-
def parametersToString(self):
"""
parametersToString(FitSuite self) -> std::string
@@ -7039,7 +7022,7 @@ class FitSuiteObjects(INode):
this = _libBornAgainCore.new_FitSuiteObjects()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FitSuiteObjects
__del__ = lambda self: None
@@ -7390,7 +7373,11 @@ 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):
@@ -7484,7 +7471,7 @@ class AdjustMinimizerStrategy(IFitStrategy):
this = _libBornAgainCore.new_AdjustMinimizerStrategy(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -7557,7 +7544,7 @@ class IMultiLayerBuilder(IParameterized):
this = _libBornAgainCore.new_IMultiLayerBuilder(_self, )
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def buildSample(self):
@@ -7617,7 +7604,9 @@ class IMultiLayerBuilder(IParameterized):
"""isPythonBuilder() -> bool"""
return _libBornAgainCore.IMultiLayerBuilder_isPythonBuilder()
- isPythonBuilder = staticmethod(isPythonBuilder)
+ if _newclass:
+ isPythonBuilder = staticmethod(isPythonBuilder)
+ __swig_getmethods__["isPythonBuilder"] = lambda x: isPythonBuilder
__swig_destroy__ = _libBornAgainCore.delete_IMultiLayerBuilder
__del__ = lambda self: None
def __disown__(self):
@@ -7659,7 +7648,7 @@ class INodeVisitor(_object):
this = _libBornAgainCore.new_INodeVisitor()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_INodeVisitor
__del__ = lambda self: None
@@ -7937,7 +7926,7 @@ class Crystal(IClusteredParticles):
this = _libBornAgainCore.new_Crystal(lattice_basis, lattice)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Crystal
__del__ = lambda self: None
@@ -8192,7 +8181,7 @@ class DistributionGate(IDistribution1D):
this = _libBornAgainCore.new_DistributionGate(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionGate
__del__ = lambda self: None
@@ -8321,7 +8310,7 @@ class DistributionLorentz(IDistribution1D):
this = _libBornAgainCore.new_DistributionLorentz(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionLorentz
__del__ = lambda self: None
@@ -8440,7 +8429,7 @@ class DistributionGaussian(IDistribution1D):
this = _libBornAgainCore.new_DistributionGaussian(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionGaussian
__del__ = lambda self: None
@@ -8559,7 +8548,7 @@ class DistributionLogNormal(IDistribution1D):
this = _libBornAgainCore.new_DistributionLogNormal(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionLogNormal
__del__ = lambda self: None
@@ -8700,7 +8689,7 @@ class DistributionCosine(IDistribution1D):
this = _libBornAgainCore.new_DistributionCosine(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionCosine
__del__ = lambda self: None
@@ -8819,7 +8808,7 @@ class DistributionTrapezoid(IDistribution1D):
this = _libBornAgainCore.new_DistributionTrapezoid(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_DistributionTrapezoid
__del__ = lambda self: None
@@ -8954,7 +8943,7 @@ class DetectorMask(_object):
this = _libBornAgainCore.new_DetectorMask(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def addMask(self, shape, mask_value):
@@ -9126,7 +9115,7 @@ class Ellipse(IShape2D):
this = _libBornAgainCore.new_Ellipse(xcenter, ycenter, xradius, yradius, theta)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -9293,7 +9282,7 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DCauchy(decay_length)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -9362,7 +9351,7 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DGauss(decay_length)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -9431,7 +9420,7 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DTriangle(decay_length)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -9511,7 +9500,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
this = _libBornAgainCore.new_FTDecayFunction1DVoigt(decay_length, eta)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -9712,7 +9701,7 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
this = _libBornAgainCore.new_FTDecayFunction2DCauchy(decay_length_x, decay_length_y, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -9784,7 +9773,7 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
this = _libBornAgainCore.new_FTDecayFunction2DGauss(decay_length_x, decay_length_y, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -9873,7 +9862,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
this = _libBornAgainCore.new_FTDecayFunction2DVoigt(decay_length_x, decay_length_y, eta, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10023,7 +10012,7 @@ class FTDistribution1DCauchy(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DCauchy(omega)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10094,7 +10083,7 @@ class FTDistribution1DGauss(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DGauss(omega)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10165,7 +10154,7 @@ class FTDistribution1DGate(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DGate(omega)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10236,7 +10225,7 @@ class FTDistribution1DTriangle(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DTriangle(omega)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10307,7 +10296,7 @@ class FTDistribution1DCosine(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DCosine(omega)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10389,7 +10378,7 @@ class FTDistribution1DVoigt(IFTDistribution1D):
this = _libBornAgainCore.new_FTDistribution1DVoigt(omega, eta)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10570,7 +10559,7 @@ class FTDistribution2DCauchy(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DCauchy(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10642,7 +10631,7 @@ class FTDistribution2DGauss(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DGauss(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10714,7 +10703,7 @@ class FTDistribution2DGate(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DGate(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10786,7 +10775,7 @@ class FTDistribution2DCone(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DCone(omega_x, omega_y, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10875,7 +10864,7 @@ class FTDistribution2DVoigt(IFTDistribution2D):
this = _libBornAgainCore.new_FTDistribution2DVoigt(omega_x, omega_y, eta, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -10973,7 +10962,7 @@ class FixedBinAxis(IAxis):
this = _libBornAgainCore.new_FixedBinAxis(name, nbins, start, end)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FixedBinAxis
__del__ = lambda self: None
@@ -11137,7 +11126,7 @@ class IFormFactor(ISample):
this = _libBornAgainCore.new_IFormFactor(_self, )
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IFormFactor
__del__ = lambda self: None
@@ -11434,7 +11423,7 @@ class vector_IFormFactorPtr_t(_object):
this = _libBornAgainCore.new_vector_IFormFactorPtr_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -11523,7 +11512,7 @@ class IFormFactorBorn(IFormFactor):
this = _libBornAgainCore.new_IFormFactorBorn(_self, )
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IFormFactorBorn
__del__ = lambda self: None
@@ -11658,7 +11647,7 @@ class SlicingEffects(_object):
this = _libBornAgainCore.new_SlicingEffects()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SlicingEffects
__del__ = lambda self: None
@@ -11816,7 +11805,7 @@ class PolygonalTopology(_object):
this = _libBornAgainCore.new_PolygonalTopology()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_PolygonalTopology
__del__ = lambda self: None
@@ -11861,7 +11850,7 @@ class PolyhedralTopology(_object):
this = _libBornAgainCore.new_PolyhedralTopology()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_PolyhedralTopology
__del__ = lambda self: None
@@ -11894,7 +11883,7 @@ class PolyhedralEdge(_object):
this = _libBornAgainCore.new_PolyhedralEdge(_Vlow, _Vhig)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def E(self):
@@ -11973,7 +11962,9 @@ class PolyhedralFace(_object):
"""diameter(vector_kvector_t V) -> double"""
return _libBornAgainCore.PolyhedralFace_diameter(V)
- diameter = staticmethod(diameter)
+ if _newclass:
+ diameter = staticmethod(diameter)
+ __swig_getmethods__["diameter"] = lambda x: diameter
def __init__(self, *args):
"""
@@ -11998,7 +11989,7 @@ class PolyhedralFace(_object):
this = _libBornAgainCore.new_PolyhedralFace(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def area(self):
@@ -12379,7 +12370,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorAnisoPyramid(length, width, height, alpha)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -12494,7 +12485,7 @@ class FormFactorBox(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorBox(length, width, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -12623,7 +12614,7 @@ class FormFactorCone(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorCone(radius, height, alpha)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -12752,7 +12743,7 @@ class FormFactorCone6(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorCone6(base_edge, height, alpha)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -12843,7 +12834,7 @@ class FormFactorCrystal(IFormFactor):
this = _libBornAgainCore.new_FormFactorCrystal(lattice, basis_form_factor, meso_form_factor)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FormFactorCrystal
__del__ = lambda self: None
@@ -12993,7 +12984,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorCuboctahedron(length, height, height_ratio, alpha)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13105,7 +13096,7 @@ class FormFactorCylinder(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorCylinder(radius, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13213,7 +13204,7 @@ class FormFactorDecoratorDebyeWaller(IFormFactorDecorator):
this = _libBornAgainCore.new_FormFactorDecoratorDebyeWaller(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13302,7 +13293,7 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorDodecahedron(edge)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13373,7 +13364,7 @@ class FormFactorDot(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorDot()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13472,7 +13463,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorEllipsoidalCylinder(radius_x, radius_y, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13595,7 +13586,7 @@ class FormFactorFullSphere(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorFullSphere(radius)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13725,7 +13716,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorFullSpheroid(radius, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13831,7 +13822,7 @@ class FormFactorGauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorGauss(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -13950,7 +13941,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorHemiEllipsoid(radius_x, radius_y, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FormFactorHemiEllipsoid
__del__ = lambda self: None
@@ -14073,7 +14064,7 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorIcosahedron(edge)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -14158,7 +14149,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongBoxGauss(length, width, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -14287,7 +14278,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongBoxLorentz(length, width, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -14416,7 +14407,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple1Gauss(length, width, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -14545,7 +14536,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple1Lorentz(length, width, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -14677,7 +14668,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple2Gauss(length, width, height, asymmetry)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -14817,7 +14808,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLongRipple2Lorentz(length, width, height, asymmetry)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -14943,7 +14934,7 @@ class FormFactorLorentz(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorLorentz(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15059,7 +15050,7 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
this = _libBornAgainCore.new_FormFactorPrism3(base_edge, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15141,7 +15132,7 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
this = _libBornAgainCore.new_FormFactorPrism6(base_edge, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15226,7 +15217,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorPyramid(base_edge, height, alpha)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15331,7 +15322,7 @@ class FormFactorRipple1(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorRipple1(length, width, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15463,7 +15454,7 @@ class FormFactorRipple2(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorRipple2(length, width, height, asymmetry)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15588,7 +15579,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorSphereGaussianRadius(mean, sigma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15673,7 +15664,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorSphereLogNormalRadius(mean, scale_param, n_samples)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15758,7 +15749,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorSphereUniformRadius(mean, full_width)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15857,7 +15848,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorTetrahedron(base_edge, height, alpha)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -15959,7 +15950,7 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
this = _libBornAgainCore.new_FormFactorTruncatedCube(length, removed_length)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -16055,7 +16046,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorTruncatedSphere(radius, height, dh)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -16188,7 +16179,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
this = _libBornAgainCore.new_FormFactorTruncatedSpheroid(radius, height, height_flattening, dh)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -16315,7 +16306,7 @@ class FormFactorWeighted(IFormFactor):
this = _libBornAgainCore.new_FormFactorWeighted()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_FormFactorWeighted
__del__ = lambda self: None
@@ -16516,7 +16507,7 @@ class FootprintFactorGaussian(IFootprintFactor):
this = _libBornAgainCore.new_FootprintFactorGaussian(width_ratio)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def accept(self, visitor):
@@ -16587,7 +16578,7 @@ class FootprintFactorSquare(IFootprintFactor):
this = _libBornAgainCore.new_FootprintFactorSquare(width_ratio)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def accept(self, visitor):
@@ -17101,7 +17092,7 @@ class SimulationOptions(_object):
this = _libBornAgainCore.new_SimulationOptions()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def isIntegrate(self):
@@ -17299,7 +17290,7 @@ class GISASSimulation(Simulation2D):
this = _libBornAgainCore.new_GISASSimulation(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_GISASSimulation
__del__ = lambda self: None
@@ -17836,7 +17827,9 @@ class IHistogram(_object):
"""createHistogram(IntensityData source) -> IHistogram"""
return _libBornAgainCore.IHistogram_createHistogram(source)
- createHistogram = staticmethod(createHistogram)
+ if _newclass:
+ createHistogram = staticmethod(createHistogram)
+ __swig_getmethods__["createHistogram"] = lambda x: createHistogram
def createFrom(*args):
"""
@@ -17845,7 +17838,9 @@ class IHistogram(_object):
"""
return _libBornAgainCore.IHistogram_createFrom(*args)
- createFrom = staticmethod(createFrom)
+ if _newclass:
+ createFrom = staticmethod(createFrom)
+ __swig_getmethods__["createFrom"] = lambda x: createFrom
def createOutputData(self, *args):
"""
@@ -17975,7 +17970,7 @@ class Histogram1D(IHistogram):
this = _libBornAgainCore.new_Histogram1D(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -18082,7 +18077,9 @@ class Histogram1D(IHistogram):
"""dynamicCast(IHistogram pHistogram) -> Histogram1D"""
return _libBornAgainCore.Histogram1D_dynamicCast(pHistogram)
- dynamicCast = staticmethod(dynamicCast)
+ if _newclass:
+ dynamicCast = staticmethod(dynamicCast)
+ __swig_getmethods__["dynamicCast"] = lambda x: dynamicCast
__swig_destroy__ = _libBornAgainCore.delete_Histogram1D
__del__ = lambda self: None
Histogram1D_swigregister = _libBornAgainCore.Histogram1D_swigregister
@@ -18128,7 +18125,7 @@ class Histogram2D(IHistogram):
this = _libBornAgainCore.new_Histogram2D(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -18254,7 +18251,9 @@ class Histogram2D(IHistogram):
"""dynamicCast(IHistogram pHistogram) -> Histogram2D"""
return _libBornAgainCore.Histogram2D_dynamicCast(pHistogram)
- dynamicCast = staticmethod(dynamicCast)
+ if _newclass:
+ dynamicCast = staticmethod(dynamicCast)
+ __swig_getmethods__["dynamicCast"] = lambda x: dynamicCast
__swig_destroy__ = _libBornAgainCore.delete_Histogram2D
__del__ = lambda self: None
Histogram2D_swigregister = _libBornAgainCore.Histogram2D_swigregister
@@ -18306,7 +18305,7 @@ class AxisInfo(_object):
this = _libBornAgainCore.new_AxisInfo()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_AxisInfo
__del__ = lambda self: None
@@ -18342,7 +18341,7 @@ class SimulationResult(_object):
this = _libBornAgainCore.new_SimulationResult(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def data(self, *args):
@@ -18487,7 +18486,7 @@ class ConstantBackground(IBackground):
this = _libBornAgainCore.new_ConstantBackground(background_value)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ConstantBackground
__del__ = lambda self: None
@@ -19146,7 +19145,7 @@ class IInterferenceFunction(ISample):
this = _libBornAgainCore.new_IInterferenceFunction(_self, )
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def __disown__(self):
self.this.disown()
@@ -19499,7 +19498,7 @@ class ParticleLimits(_object):
this = _libBornAgainCore.new_ParticleLimits()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleLimits
__del__ = lambda self: None
@@ -19800,13 +19799,17 @@ class IRotation(ISample):
"""createRotation(Transform3D const & transform) -> IRotation"""
return _libBornAgainCore.IRotation_createRotation(transform)
- createRotation = staticmethod(createRotation)
+ if _newclass:
+ createRotation = staticmethod(createRotation)
+ __swig_getmethods__["createRotation"] = lambda x: createRotation
def createIdentity():
"""createIdentity() -> IRotation"""
return _libBornAgainCore.IRotation_createIdentity()
- createIdentity = staticmethod(createIdentity)
+ if _newclass:
+ createIdentity = staticmethod(createIdentity)
+ __swig_getmethods__["createIdentity"] = lambda x: createIdentity
__swig_destroy__ = _libBornAgainCore.delete_IRotation
__del__ = lambda self: None
@@ -19923,7 +19926,7 @@ class IdentityRotation(IRotation):
this = _libBornAgainCore.new_IdentityRotation()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -20021,7 +20024,7 @@ class RotationX(IRotation):
this = _libBornAgainCore.new_RotationX(angle)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -20117,7 +20120,7 @@ class RotationY(IRotation):
this = _libBornAgainCore.new_RotationY(angle)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -20214,7 +20217,7 @@ class RotationZ(IRotation):
this = _libBornAgainCore.new_RotationZ(angle)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -20316,7 +20319,7 @@ class RotationEuler(IRotation):
this = _libBornAgainCore.new_RotationEuler(alpha, beta, gamma)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -20474,7 +20477,7 @@ class SimpleSelectionRule(ISelectionRule):
this = _libBornAgainCore.new_SimpleSelectionRule(a, b, c, modulus)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SimpleSelectionRule
__del__ = lambda self: None
@@ -20532,7 +20535,7 @@ class Instrument(INode):
this = _libBornAgainCore.new_Instrument(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Instrument
__del__ = lambda self: None
@@ -20864,31 +20867,41 @@ class IntensityDataIOFactory(_object):
"""readOutputData(std::string const & file_name) -> IntensityData"""
return _libBornAgainCore.IntensityDataIOFactory_readOutputData(file_name)
- readOutputData = staticmethod(readOutputData)
+ if _newclass:
+ readOutputData = staticmethod(readOutputData)
+ __swig_getmethods__["readOutputData"] = lambda x: readOutputData
def readIntensityData(file_name):
"""readIntensityData(std::string const & file_name) -> IHistogram"""
return _libBornAgainCore.IntensityDataIOFactory_readIntensityData(file_name)
- readIntensityData = staticmethod(readIntensityData)
+ if _newclass:
+ readIntensityData = staticmethod(readIntensityData)
+ __swig_getmethods__["readIntensityData"] = lambda x: readIntensityData
def writeOutputData(data, file_name):
"""writeOutputData(IntensityData data, std::string const & file_name)"""
return _libBornAgainCore.IntensityDataIOFactory_writeOutputData(data, file_name)
- writeOutputData = staticmethod(writeOutputData)
+ if _newclass:
+ writeOutputData = staticmethod(writeOutputData)
+ __swig_getmethods__["writeOutputData"] = lambda x: writeOutputData
def writeIntensityData(histogram, file_name):
"""writeIntensityData(IHistogram histogram, std::string const & file_name)"""
return _libBornAgainCore.IntensityDataIOFactory_writeIntensityData(histogram, file_name)
- writeIntensityData = staticmethod(writeIntensityData)
+ if _newclass:
+ writeIntensityData = staticmethod(writeIntensityData)
+ __swig_getmethods__["writeIntensityData"] = lambda x: writeIntensityData
def writeSimulationResult(result, file_name):
"""writeSimulationResult(SimulationResult result, std::string const & file_name)"""
return _libBornAgainCore.IntensityDataIOFactory_writeSimulationResult(result, file_name)
- writeSimulationResult = staticmethod(writeSimulationResult)
+ if _newclass:
+ writeSimulationResult = staticmethod(writeSimulationResult)
+ __swig_getmethods__["writeSimulationResult"] = lambda x: writeSimulationResult
def __init__(self):
"""
@@ -20904,7 +20917,7 @@ class IntensityDataIOFactory(_object):
this = _libBornAgainCore.new_IntensityDataIOFactory()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityDataIOFactory
__del__ = lambda self: None
@@ -20972,7 +20985,7 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunction1DLattice(length, xi)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction1DLattice
__del__ = lambda self: None
@@ -21097,7 +21110,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunctionRadialParaCrystal(peak_distance, damping_length)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -21307,7 +21320,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunction2DLattice(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DLattice
__del__ = lambda self: None
@@ -21343,7 +21356,9 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DLattice_createSquare(lattice_length, xi)
- createSquare = staticmethod(createSquare)
+ if _newclass:
+ createSquare = staticmethod(createSquare)
+ __swig_getmethods__["createSquare"] = lambda x: createSquare
def createHexagonal(lattice_length, xi=0.0):
"""
@@ -21352,7 +21367,9 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DLattice_createHexagonal(lattice_length, xi)
- createHexagonal = staticmethod(createHexagonal)
+ if _newclass:
+ createHexagonal = staticmethod(createHexagonal)
+ __swig_getmethods__["createHexagonal"] = lambda x: createHexagonal
def setDecayFunction(self, decay):
"""
@@ -21522,7 +21539,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunction2DParaCrystal(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DParaCrystal
__del__ = lambda self: None
@@ -21560,7 +21577,9 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_createSquare(lattice_length, damping_length, domain_size_1, domain_size_2)
- createSquare = staticmethod(createSquare)
+ if _newclass:
+ createSquare = staticmethod(createSquare)
+ __swig_getmethods__["createSquare"] = lambda x: createSquare
def createHexagonal(lattice_length, damping_length=0.0, domain_size_1=0.0, domain_size_2=0.0):
"""
@@ -21571,7 +21590,9 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_createHexagonal(lattice_length, damping_length, domain_size_1, domain_size_2)
- createHexagonal = staticmethod(createHexagonal)
+ if _newclass:
+ createHexagonal = staticmethod(createHexagonal)
+ __swig_getmethods__["createHexagonal"] = lambda x: createHexagonal
def setDomainSizes(self, size_1, size_2):
"""
@@ -21777,7 +21798,7 @@ class InterferenceFunctionNone(IInterferenceFunction):
this = _libBornAgainCore.new_InterferenceFunctionNone()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -21925,7 +21946,7 @@ class SphericalDetector(IDetector2D):
this = _libBornAgainCore.new_SphericalDetector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -22001,7 +22022,7 @@ class SphericalPixel(IPixel):
this = _libBornAgainCore.new_SphericalPixel(alpha_bin, phi_bin)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SphericalPixel
__del__ = lambda self: None
@@ -22090,7 +22111,7 @@ class IsGISAXSDetector(SphericalDetector):
this = _libBornAgainCore.new_IsGISAXSDetector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -22150,7 +22171,7 @@ class Lattice(INode):
this = _libBornAgainCore.new_Lattice(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Lattice
__del__ = lambda self: None
@@ -22303,13 +22324,17 @@ class Lattice(INode):
"""createFCCLattice(double a) -> Lattice"""
return _libBornAgainCore.Lattice_createFCCLattice(a)
- createFCCLattice = staticmethod(createFCCLattice)
+ if _newclass:
+ createFCCLattice = staticmethod(createFCCLattice)
+ __swig_getmethods__["createFCCLattice"] = lambda x: createFCCLattice
def createTrigonalLattice(a, c):
"""createTrigonalLattice(double a, double c) -> Lattice"""
return _libBornAgainCore.Lattice_createTrigonalLattice(a, c)
- createTrigonalLattice = staticmethod(createTrigonalLattice)
+ if _newclass:
+ createTrigonalLattice = staticmethod(createTrigonalLattice)
+ __swig_getmethods__["createTrigonalLattice"] = lambda x: createTrigonalLattice
def onChange(self):
"""
@@ -22369,7 +22394,7 @@ class Lattice1DParameters(_object):
this = _libBornAgainCore.new_Lattice1DParameters(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_setmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_set
__swig_getmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_get
@@ -22508,7 +22533,7 @@ class BasicLattice(Lattice2D):
this = _libBornAgainCore.new_BasicLattice(length1, length2, angle, rotation_angle)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -22601,7 +22626,7 @@ class SquareLattice(Lattice2D):
this = _libBornAgainCore.new_SquareLattice(length, rotation_angle)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -22694,7 +22719,7 @@ class HexagonalLattice(Lattice2D):
this = _libBornAgainCore.new_HexagonalLattice(length, rotation_angle)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -22809,7 +22834,7 @@ class Layer(ISample):
this = _libBornAgainCore.new_Layer(material, thickness)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Layer
__del__ = lambda self: None
@@ -23049,7 +23074,7 @@ class LayerRoughness(ISample):
this = _libBornAgainCore.new_LayerRoughness(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -23210,7 +23235,7 @@ class Line(IShape2D):
this = _libBornAgainCore.new_Line(x1, y1, x2, y2)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -23276,7 +23301,7 @@ class VerticalLine(IShape2D):
this = _libBornAgainCore.new_VerticalLine(x)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -23352,7 +23377,7 @@ class HorizontalLine(IShape2D):
this = _libBornAgainCore.new_HorizontalLine(y)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -23421,7 +23446,7 @@ class Material(_object):
this = _libBornAgainCore.new_Material(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def inverted(self):
@@ -23641,7 +23666,7 @@ class MesoCrystal(IParticle):
this = _libBornAgainCore.new_MesoCrystal(particle_structure, form_factor)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_MesoCrystal
__del__ = lambda self: None
@@ -23728,7 +23753,7 @@ class MultiLayer(ISample):
this = _libBornAgainCore.new_MultiLayer()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_MultiLayer
__del__ = lambda self: None
@@ -24137,7 +24162,7 @@ class OffSpecSimulation(Simulation2D):
this = _libBornAgainCore.new_OffSpecSimulation(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_OffSpecSimulation
__del__ = lambda self: None
@@ -24252,7 +24277,7 @@ class IntensityData(_object):
this = _libBornAgainCore.new_IntensityData()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_IntensityData
__del__ = lambda self: None
@@ -24631,10 +24656,9 @@ class IntensityData(_object):
return _libBornAgainCore.IntensityData___isub__(self, right)
- def __itruediv__(self, *args):
- return _libBornAgainCore.IntensityData___itruediv__(self, *args)
- __idiv__ = __itruediv__
-
+ def __idiv__(self, right):
+ """__idiv__(IntensityData self, IntensityData right) -> IntensityData"""
+ return _libBornAgainCore.IntensityData___idiv__(self, right)
def __imul__(self, right):
@@ -24724,7 +24748,7 @@ class ParameterDistribution(IParameterized):
this = _libBornAgainCore.new_ParameterDistribution(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParameterDistribution
__del__ = lambda self: None
@@ -24874,7 +24898,7 @@ class ParameterPool(ICloneable):
this = _libBornAgainCore.new_ParameterPool()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParameterPool
__del__ = lambda self: None
@@ -25087,7 +25111,7 @@ class ParameterSample(_object):
this = _libBornAgainCore.new_ParameterSample(_value, _weight)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_setmethods__["value"] = _libBornAgainCore.ParameterSample_value_set
__swig_getmethods__["value"] = _libBornAgainCore.ParameterSample_value_get
@@ -25261,7 +25285,7 @@ class ParameterSampleVector(_object):
this = _libBornAgainCore.new_ParameterSampleVector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -25347,7 +25371,7 @@ class Particle(IParticle):
this = _libBornAgainCore.new_Particle(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -25465,7 +25489,7 @@ class ParticleComposition(IParticle):
this = _libBornAgainCore.new_ParticleComposition(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleComposition
__del__ = lambda self: None
@@ -25608,7 +25632,7 @@ class ParticleCoreShell(IParticle):
this = _libBornAgainCore.new_ParticleCoreShell(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleCoreShell
__del__ = lambda self: None
@@ -25713,7 +25737,7 @@ class ParticleDistribution(IAbstractParticle):
this = _libBornAgainCore.new_ParticleDistribution(prototype, par_distr)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -25850,7 +25874,7 @@ class ParticleLayout(ILayout):
this = _libBornAgainCore.new_ParticleLayout(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_ParticleLayout
__del__ = lambda self: None
@@ -26023,7 +26047,7 @@ class PoissonNoiseBackground(IBackground):
this = _libBornAgainCore.new_PoissonNoiseBackground()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_PoissonNoiseBackground
__del__ = lambda self: None
@@ -26094,7 +26118,7 @@ class Polygon(IShape2D):
this = _libBornAgainCore.new_Polygon(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_Polygon
__del__ = lambda self: None
@@ -26178,7 +26202,7 @@ class RealParameter(IParameterReal):
this = _libBornAgainCore.new_RealParameter(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self, *args):
@@ -26335,7 +26359,7 @@ class Rectangle(IShape2D):
this = _libBornAgainCore.new_Rectangle(xlow, ylow, xup, yup)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -26451,7 +26475,7 @@ class RectangularDetector(IDetector2D):
this = _libBornAgainCore.new_RectangularDetector(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def clone(self):
@@ -26722,7 +26746,7 @@ class RectangularPixel(IPixel):
this = _libBornAgainCore.new_RectangularPixel(corner_pos, width, height)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_RectangularPixel
__del__ = lambda self: None
@@ -26819,7 +26843,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
this = _libBornAgainCore.new_ResolutionFunction2DGaussian(sigma_x, sigma_y)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def evaluateCDF(self, x, y):
@@ -26910,7 +26934,7 @@ class SpecularSimulation(Simulation):
this = _libBornAgainCore.new_SpecularSimulation(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SpecularSimulation
__del__ = lambda self: None
@@ -27029,7 +27053,7 @@ class ThreadInfo(_object):
this = _libBornAgainCore.new_ThreadInfo()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_setmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_set
__swig_getmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_get
@@ -27074,7 +27098,7 @@ class SampleBuilderFactoryTemp(_object):
this = _libBornAgainCore.new_SampleBuilderFactoryTemp()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def createItem(self, item_key):
@@ -27178,7 +27202,7 @@ class SampleBuilderFactory(SampleBuilderFactoryTemp):
this = _libBornAgainCore.new_SampleBuilderFactory()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def createSample(self, name):
@@ -27223,7 +27247,7 @@ class SimulationFactoryTemp(_object):
this = _libBornAgainCore.new_SimulationFactoryTemp()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def createItem(self, item_key):
@@ -27327,7 +27351,7 @@ class SimulationFactory(SimulationFactoryTemp):
this = _libBornAgainCore.new_SimulationFactory()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SimulationFactory
__del__ = lambda self: None
@@ -27569,7 +27593,7 @@ class SphericalConverter(UnitConverterSimple):
this = _libBornAgainCore.new_SphericalConverter(detector, beam)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SphericalConverter
__del__ = lambda self: None
@@ -27626,7 +27650,7 @@ class RectangularConverter(UnitConverterSimple):
this = _libBornAgainCore.new_RectangularConverter(detector, beam)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_RectangularConverter
__del__ = lambda self: None
@@ -27683,7 +27707,7 @@ class OffSpecularConverter(UnitConverterSimple):
this = _libBornAgainCore.new_OffSpecularConverter(detector, beam, alpha_axis)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_OffSpecularConverter
__del__ = lambda self: None
@@ -27740,7 +27764,7 @@ class SpecularConverter(UnitConverterSimple):
this = _libBornAgainCore.new_SpecularConverter(beam, alpha_axis)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainCore.delete_SpecularConverter
__del__ = lambda self: None
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index a32acd04e05..6589eb22ffd 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 3.0.8
*
* 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,11 +107,9 @@ template <typename T> T SwigValueInit() {
#endif
/* exporting methods */
-#if defined(__GNUC__)
-# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# ifndef GCC_HASCLASSVISIBILITY
-# define GCC_HASCLASSVISIBILITY
-# endif
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+# ifndef GCC_HASCLASSVISIBILITY
+# define GCC_HASCLASSVISIBILITY
# endif
#endif
@@ -671,16 +669,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
char d = *(c++);
unsigned char uu;
if ((d >= '0') && (d <= '9'))
- uu = (unsigned char)((d - '0') << 4);
+ uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f'))
- uu = (unsigned char)((d - ('a'-10)) << 4);
+ uu = ((d - ('a'-10)) << 4);
else
return (char *) 0;
d = *(c++);
if ((d >= '0') && (d <= '9'))
- uu |= (unsigned char)(d - '0');
+ uu |= (d - '0');
else if ((d >= 'a') && (d <= 'f'))
- uu |= (unsigned char)(d - ('a'-10));
+ uu |= (d - ('a'-10));
else
return (char *) 0;
*u = uu;
@@ -863,6 +861,10 @@ 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
@@ -977,7 +979,6 @@ 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
/* -----------------------------------------------------------------------------
@@ -1926,6 +1927,7 @@ 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
@@ -1936,7 +1938,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
@@ -1944,7 +1946,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
@@ -1954,7 +1956,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 */
@@ -2117,6 +2119,7 @@ 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
@@ -3803,7 +3806,7 @@ static swig_module_info swig_module = {swig_types, 327, 0, 0, 0, 0};
#endif
#define SWIG_name "_libBornAgainCore"
-#define SWIGVERSION 0x030012
+#define SWIGVERSION 0x030008
#define SWIG_VERSION SWIGVERSION
@@ -3902,7 +3905,6 @@ namespace swig {
#endif
-#include <typeinfo>
#include <stdexcept>
@@ -4052,7 +4054,7 @@ SWIG_AsVal_double (PyObject *obj, double *val)
return SWIG_OK;
#if PY_VERSION_HEX < 0x03000000
} else if (PyInt_Check(obj)) {
- if (val) *val = (double) PyInt_AsLong(obj);
+ if (val) *val = PyInt_AsLong(obj);
return SWIG_OK;
#endif
} else if (PyLong_Check(obj)) {
@@ -4173,109 +4175,23 @@ 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)
{
- 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
+ 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);
return res;
}
- #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
+ #define SWIG_From_long PyLong_FromLong
SWIGINTERNINLINE PyObject *
SWIG_From_ptrdiff_t (ptrdiff_t 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
+ return SWIG_From_long (static_cast< long >(value));
}
@@ -4329,65 +4245,12 @@ 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)
{
- 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
+ long v;
+ int res = SWIG_AsVal_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
return res;
}
@@ -4432,21 +4295,8 @@ namespace swig {
return traits<typename noconst_traits<Type >::noconst_type >::type_name();
}
- 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 *> {
+ template <class Type>
+ struct traits_info {
static swig_type_info *type_query(std::string name) {
name += " *";
return SWIG_TypeQuery(name.c_str());
@@ -4463,7 +4313,7 @@ namespace swig {
}
/*
- Partial specialization for pointers (traits)
+ Partial specialization for pointers
*/
template <class Type> struct traits <Type *> {
typedef pointer_category category;
@@ -4533,8 +4383,7 @@ namespace swig {
struct traits_asptr {
static int asptr(PyObject *obj, Type **val) {
Type *p;
- swig_type_info *descriptor = type_info<Type>();
- int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
+ int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
if (SWIG_IsOK(res)) {
if (val) *val = p;
}
@@ -4682,7 +4531,7 @@ namespace swig {
namespace std {
template <>
- struct less <PyObject *>
+ struct less <PyObject *>: public binary_function<PyObject *, PyObject *, bool>
{
bool
operator()(PyObject * v, PyObject *w) const
@@ -4707,7 +4556,7 @@ namespace std {
};
template <>
- struct less <swig::SwigPtr_PyObject>
+ struct less <swig::SwigPtr_PyObject>: public binary_function<swig::SwigPtr_PyObject, swig::SwigPtr_PyObject, bool>
{
bool
operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
@@ -4717,7 +4566,7 @@ namespace std {
};
template <>
- struct less <swig::SwigVar_PyObject>
+ struct less <swig::SwigVar_PyObject>: public binary_function<swig::SwigVar_PyObject, swig::SwigVar_PyObject, bool>
{
bool
operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const
@@ -4780,7 +4629,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, i <= j
+ // Required range: 0 <= i < size, 0 <= j < size
if (i < 0) {
ii = 0;
} else if (i < (Difference)size) {
@@ -4788,15 +4637,13 @@ 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, i >= j
+ // Required range: -1 <= i < size-1, -1 <= j < size-1
if (i < -1) {
ii = -1;
} else if (i < (Difference) size) {
@@ -4809,8 +4656,6 @@ namespace swig {
} else {
jj = (j < (Difference)size ) ? j : (Difference)(size-1);
}
- if (ii < jj)
- ii = jj;
}
}
@@ -4836,13 +4681,6 @@ 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) {
@@ -4860,7 +4698,6 @@ 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);
@@ -4871,16 +4708,17 @@ namespace swig {
}
} else {
Sequence *sequence = new Sequence();
- 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++;
+ 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++;
+ }
}
return sequence;
}
@@ -4894,11 +4732,12 @@ 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);
@@ -4932,6 +4771,8 @@ namespace swig {
}
}
} else {
+ if (jj > ii)
+ jj = ii;
size_t replacecount = (ii - jj - step - 1) / -step;
if (is.size() != replacecount) {
char msg[1024];
@@ -4957,33 +4798,37 @@ namespace swig {
Difference jj = 0;
swig::slice_adjust(i, j, step, size, ii, jj, true);
if (step > 0) {
- 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;
+ 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;
while (delcount) {
- it = self->erase(it);
- for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
+ it = typename Sequence::reverse_iterator(self->erase((++it).base()));
+ for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++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--;
- }
}
}
}
@@ -5482,8 +5327,8 @@ namespace swig {
static int asptr(PyObject *obj, sequence **seq) {
if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
sequence *p;
- swig_type_info *descriptor = swig::type_info<sequence>();
- if (descriptor && SWIG_IsOK(::SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
+ if (::SWIG_ConvertPtr(obj,(void**)&p,
+ swig::type_info<sequence>(),0) == SWIG_OK) {
if (seq) *seq = p;
return SWIG_OLDOBJ;
}
@@ -5522,7 +5367,7 @@ namespace swig {
#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS
swig_type_info *desc = swig::type_info<sequence>();
if (desc && desc->clientdata) {
- return SWIG_InternalNewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
+ return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
}
#endif
size_type size = seq.size();
@@ -5543,13 +5388,6 @@ 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) {
@@ -5592,33 +5430,14 @@ SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
return (value > LONG_MAX) ?
- 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));
+ PyLong_FromUnsignedLong(value) : PyLong_FromLong(static_cast< long >(value));
}
-#endif
SWIGINTERNINLINE PyObject *
SWIG_From_size_t (size_t 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
+ return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
}
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){
@@ -5802,6 +5621,16 @@ 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)
{
@@ -6180,7 +6009,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/3.0.12/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/home/pospelov/software/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
@@ -6330,18 +6159,13 @@ 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
@@ -6350,9 +6174,8 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
return SWIG_RuntimeError;
}
obj = PyUnicode_AsUTF8String(obj);
- if(alloc) *alloc = SWIG_NEWOBJ;
-#endif
PyBytes_AsStringAndSize(obj, &cstr, &len);
+ if(alloc) *alloc = SWIG_NEWOBJ;
#else
PyString_AsStringAndSize(obj, &cstr, &len);
#endif
@@ -6373,34 +6196,26 @@ 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
-#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
+ #if PY_VERSION_HEX>=0x03000000
+ assert(0); /* Should never reach here in Python 3 */
+ #endif
*cptr = SWIG_Python_str_AsChar(obj);
-#endif
}
}
if (psize) *psize = len + 1;
-#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+#if PY_VERSION_HEX>=0x03000000
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;
@@ -6411,7 +6226,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;
@@ -6498,15 +6313,11 @@ 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
@@ -7389,6 +7200,44 @@ 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){
@@ -7700,8 +7549,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);
@@ -7734,8 +7583,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);
@@ -7776,8 +7625,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);
@@ -7810,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);
@@ -7839,8 +7688,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);
@@ -7867,8 +7716,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);
@@ -7906,8 +7755,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);
@@ -7942,8 +7791,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);
@@ -7984,8 +7833,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);
@@ -8018,8 +7867,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);
@@ -8050,8 +7899,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);
@@ -8084,8 +7933,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);
@@ -8113,8 +7962,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);
@@ -8141,8 +7990,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);
@@ -8177,8 +8026,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);
@@ -8214,8 +8063,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);
@@ -8246,8 +8095,8 @@ Material 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);
@@ -8286,14 +8135,14 @@ SwigDirector_IObservable::~SwigDirector_IObservable() {
void SwigDirector_IObservable::attachObserver(IObservable::observer_t obj) {
swig::SwigVar_PyObject obj0;
- 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 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&obj), SWIGTYPE_p_std__shared_ptrT_IObserver_t, 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);
@@ -8319,8 +8168,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);
@@ -8358,8 +8207,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);
@@ -8387,8 +8236,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);
@@ -8429,8 +8278,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);
@@ -8463,8 +8312,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);
@@ -8495,8 +8344,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);
@@ -8536,8 +8385,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);
@@ -8571,8 +8420,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);
@@ -8620,8 +8469,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);
@@ -8654,8 +8503,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);
@@ -8686,8 +8535,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);
@@ -8720,8 +8569,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);
@@ -8749,8 +8598,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);
@@ -8777,8 +8626,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);
@@ -8813,8 +8662,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);
@@ -8850,8 +8699,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);
@@ -8882,8 +8731,8 @@ Material 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);
@@ -8912,14 +8761,14 @@ Material const *SwigDirector_IFormFactor::material() const {
void SwigDirector_IFormFactor::setAmbientMaterial(Material arg0) {
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new Material((const Material &)arg0)), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&arg0), SWIGTYPE_p_Material, 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);
@@ -8948,8 +8797,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);
@@ -8983,8 +8832,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);
@@ -9018,8 +8867,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);
@@ -9055,8 +8904,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);
@@ -9092,8 +8941,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);
@@ -9130,8 +8979,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);
@@ -9161,8 +9010,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);
@@ -9197,19 +9046,19 @@ IFormFactor *SwigDirector_IFormFactor::sliceFormFactor(ZLimits limits, IRotation
IFormFactor *c_result;
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new ZLimits((const ZLimits &)limits)), SWIGTYPE_p_ZLimits, SWIG_POINTER_OWN | 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&limits), SWIGTYPE_p_ZLimits, 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(new kvector_t((const kvector_t &)translation)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
+ obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(&translation), SWIGTYPE_p_BasicVector3DT_double_t, 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);
@@ -9258,8 +9107,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);
@@ -9292,8 +9141,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);
@@ -9324,8 +9173,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);
@@ -9358,8 +9207,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);
@@ -9387,8 +9236,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);
@@ -9415,8 +9264,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);
@@ -9451,8 +9300,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);
@@ -9488,8 +9337,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);
@@ -9520,8 +9369,8 @@ Material 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);
@@ -9550,14 +9399,14 @@ Material const *SwigDirector_IFormFactorBorn::material() const {
void SwigDirector_IFormFactorBorn::setAmbientMaterial(Material arg0) {
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new Material((const Material &)arg0)), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&arg0), SWIGTYPE_p_Material, 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);
@@ -9586,8 +9435,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);
@@ -9621,8 +9470,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);
@@ -9656,8 +9505,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);
@@ -9693,8 +9542,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);
@@ -9730,8 +9579,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);
@@ -9768,8 +9617,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);
@@ -9799,8 +9648,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);
@@ -9835,19 +9684,19 @@ IFormFactor *SwigDirector_IFormFactorBorn::sliceFormFactor(ZLimits limits, IRota
IFormFactor *c_result;
swig::SwigVar_PyObject obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(new ZLimits((const ZLimits &)limits)), SWIGTYPE_p_ZLimits, SWIG_POINTER_OWN | 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&limits), SWIGTYPE_p_ZLimits, 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(new kvector_t((const kvector_t &)translation)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
+ obj2 = SWIG_NewPointerObj(SWIG_as_voidptr(&translation), SWIGTYPE_p_BasicVector3DT_double_t, 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);
@@ -9878,14 +9727,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(new cvector_t((const cvector_t &)q)), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&q), SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 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);
@@ -9933,8 +9782,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);
@@ -9967,8 +9816,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);
@@ -9999,8 +9848,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);
@@ -10033,8 +9882,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);
@@ -10062,8 +9911,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);
@@ -10090,8 +9939,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);
@@ -10126,8 +9975,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);
@@ -10163,8 +10012,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);
@@ -10195,8 +10044,8 @@ Material 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);
@@ -10226,14 +10075,14 @@ Material 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(new kvector_t((const kvector_t &)q)), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
+ obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&q), SWIGTYPE_p_BasicVector3DT_double_t, 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);
@@ -10267,8 +10116,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);
@@ -10302,8 +10151,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);
@@ -11178,11 +11027,22 @@ 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 ;
@@ -13096,7 +12956,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();
}
@@ -15044,7 +14904,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();
}
@@ -16962,7 +16822,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();
}
@@ -18910,7 +18770,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();
}
@@ -20828,7 +20688,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();
}
@@ -22746,7 +22606,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();
}
@@ -24694,7 +24554,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();
}
@@ -24912,7 +24772,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();
}
@@ -25087,7 +24947,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();
}
@@ -25916,7 +25776,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();
}
@@ -26362,7 +26222,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();
}
@@ -28259,7 +28119,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();
}
@@ -30156,7 +30016,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();
}
@@ -32072,7 +31932,7 @@ fail:
SWIGINTERN PyObject *swig_dummy_type_axisinfo_vector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
- if (!PyArg_ParseTuple(args,(char *)"O:swigregister", &obj)) return NULL;
+ if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -32880,7 +32740,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();
}
@@ -34796,7 +34656,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();
}
@@ -35342,7 +35202,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();
}
@@ -37258,7 +37118,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();
}
@@ -37917,7 +37777,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();
}
@@ -38401,7 +38261,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();
}
@@ -38662,7 +38522,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();
}
@@ -39034,7 +38894,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();
}
@@ -39372,7 +39232,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();
}
@@ -39871,7 +39731,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();
}
@@ -40286,7 +40146,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();
}
@@ -40432,7 +40292,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();
}
@@ -40631,7 +40491,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();
}
@@ -40827,7 +40687,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();
}
@@ -41005,7 +40865,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();
}
@@ -41416,7 +41276,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();
}
@@ -41498,7 +41358,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();
}
@@ -41652,7 +41512,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();
}
@@ -41871,7 +41731,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();
}
@@ -41972,7 +41832,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();
}
@@ -42056,7 +41916,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();
}
@@ -42137,7 +41997,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();
}
@@ -42231,7 +42091,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();
}
@@ -42325,7 +42185,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();
}
@@ -42472,7 +42332,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();
}
@@ -42767,7 +42627,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();
}
@@ -42995,7 +42855,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();
}
@@ -43214,7 +43074,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();
}
@@ -43446,7 +43306,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();
}
@@ -43576,7 +43436,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();
}
@@ -43706,7 +43566,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();
}
@@ -43836,7 +43696,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();
}
@@ -43966,7 +43826,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();
}
@@ -44142,7 +44002,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();
}
@@ -44682,7 +44542,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();
}
@@ -44827,7 +44687,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();
}
@@ -45512,7 +45372,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();
}
@@ -47464,105 +47324,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FitSuite_getRealOutputData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FitSuite *arg1 = (FitSuite *) 0 ;
- size_t arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- size_t val2 ;
- int ecode2 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- OutputData< double > *result = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"OO:FitSuite_getRealOutputData",&obj0,&obj1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitSuite, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitSuite_getRealOutputData" "', argument " "1"" of type '" "FitSuite const *""'");
- }
- arg1 = reinterpret_cast< FitSuite * >(argp1);
- ecode2 = SWIG_AsVal_size_t(obj1, &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitSuite_getRealOutputData" "', argument " "2"" of type '" "size_t""'");
- }
- arg2 = static_cast< size_t >(val2);
- result = (OutputData< double > *)((FitSuite const *)arg1)->getRealOutputData(arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OutputDataT_double_t, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitSuite_getRealOutputData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FitSuite *arg1 = (FitSuite *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject * obj0 = 0 ;
- OutputData< double > *result = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"O:FitSuite_getRealOutputData",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitSuite, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitSuite_getRealOutputData" "', argument " "1"" of type '" "FitSuite const *""'");
- }
- arg1 = reinterpret_cast< FitSuite * >(argp1);
- result = (OutputData< double > *)((FitSuite const *)arg1)->getRealOutputData();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OutputDataT_double_t, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitSuite_getRealOutputData(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[3] = {
- 0
- };
- Py_ssize_t ii;
-
- if (!PyTuple_Check(args)) SWIG_fail;
- argc = args ? PyObject_Length(args) : 0;
- for (ii = 0; (ii < 2) && (ii < argc); ii++) {
- argv[ii] = PyTuple_GET_ITEM(args,ii);
- }
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitSuite, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_FitSuite_getRealOutputData__SWIG_1(self, args);
- }
- }
- if (argc == 2) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitSuite, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_size_t(argv[1], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_FitSuite_getRealOutputData__SWIG_0(self, args);
- }
- }
- }
-
-fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitSuite_getRealOutputData'.\n"
- " Possible C/C++ prototypes are:\n"
- " FitSuite::getRealOutputData(size_t) const\n"
- " FitSuite::getRealOutputData() const\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_FitSuite_getSimulationOutputData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FitSuite *arg1 = (FitSuite *) 0 ;
@@ -47662,105 +47423,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FitSuite_getChiSquaredOutputData__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FitSuite *arg1 = (FitSuite *) 0 ;
- size_t arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- size_t val2 ;
- int ecode2 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- OutputData< double > *result = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"OO:FitSuite_getChiSquaredOutputData",&obj0,&obj1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitSuite, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitSuite_getChiSquaredOutputData" "', argument " "1"" of type '" "FitSuite const *""'");
- }
- arg1 = reinterpret_cast< FitSuite * >(argp1);
- ecode2 = SWIG_AsVal_size_t(obj1, &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FitSuite_getChiSquaredOutputData" "', argument " "2"" of type '" "size_t""'");
- }
- arg2 = static_cast< size_t >(val2);
- result = (OutputData< double > *)((FitSuite const *)arg1)->getChiSquaredOutputData(arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OutputDataT_double_t, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitSuite_getChiSquaredOutputData__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FitSuite *arg1 = (FitSuite *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject * obj0 = 0 ;
- OutputData< double > *result = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"O:FitSuite_getChiSquaredOutputData",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FitSuite, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitSuite_getChiSquaredOutputData" "', argument " "1"" of type '" "FitSuite const *""'");
- }
- arg1 = reinterpret_cast< FitSuite * >(argp1);
- result = (OutputData< double > *)((FitSuite const *)arg1)->getChiSquaredOutputData();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OutputDataT_double_t, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitSuite_getChiSquaredOutputData(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[3] = {
- 0
- };
- Py_ssize_t ii;
-
- if (!PyTuple_Check(args)) SWIG_fail;
- argc = args ? PyObject_Length(args) : 0;
- for (ii = 0; (ii < 2) && (ii < argc); ii++) {
- argv[ii] = PyTuple_GET_ITEM(args,ii);
- }
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitSuite, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_FitSuite_getChiSquaredOutputData__SWIG_1(self, args);
- }
- }
- if (argc == 2) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitSuite, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_size_t(argv[1], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_FitSuite_getChiSquaredOutputData__SWIG_0(self, args);
- }
- }
- }
-
-fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'FitSuite_getChiSquaredOutputData'.\n"
- " Possible C/C++ prototypes are:\n"
- " FitSuite::getChiSquaredOutputData(size_t) const\n"
- " FitSuite::getChiSquaredOutputData() const\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_FitSuite_parametersToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FitSuite *arg1 = (FitSuite *) 0 ;
@@ -47829,7 +47491,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();
}
@@ -48628,7 +48290,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();
}
@@ -49198,6 +48860,28 @@ 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 ;
@@ -49958,7 +49642,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();
}
@@ -50482,7 +50166,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();
}
@@ -55770,7 +55454,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();
}
@@ -55999,7 +55683,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();
}
@@ -56343,7 +56027,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();
}
@@ -56970,7 +56654,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();
}
@@ -57414,7 +57098,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();
}
@@ -57836,7 +57520,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();
}
@@ -58258,7 +57942,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();
}
@@ -58755,7 +58439,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();
}
@@ -59177,7 +58861,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();
}
@@ -59673,7 +59357,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();
}
@@ -60133,7 +59817,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();
}
@@ -60630,7 +60314,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();
}
@@ -60733,7 +60417,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();
}
@@ -60866,7 +60550,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();
}
@@ -60999,7 +60683,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();
}
@@ -61132,7 +60816,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();
}
@@ -61296,7 +60980,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();
}
@@ -61594,7 +61278,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();
}
@@ -61845,7 +61529,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();
}
@@ -62096,7 +61780,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();
}
@@ -62399,7 +62083,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();
}
@@ -62532,7 +62216,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();
}
@@ -62665,7 +62349,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();
}
@@ -62798,7 +62482,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();
}
@@ -62931,7 +62615,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();
}
@@ -63064,7 +62748,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();
}
@@ -63197,7 +62881,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();
}
@@ -63361,7 +63045,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();
}
@@ -63569,7 +63253,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();
}
@@ -63820,7 +63504,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();
}
@@ -64071,7 +63755,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();
}
@@ -64322,7 +64006,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();
}
@@ -64573,7 +64257,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();
}
@@ -64876,7 +64560,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();
}
@@ -65256,7 +64940,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();
}
@@ -65904,7 +65588,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();
}
@@ -67855,7 +67539,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();
}
@@ -68360,7 +68044,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();
}
@@ -68557,7 +68241,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();
}
@@ -68787,7 +68471,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();
}
@@ -68932,7 +68616,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();
}
@@ -69077,7 +68761,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();
}
@@ -69331,7 +69015,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();
}
@@ -69811,7 +69495,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();
}
@@ -69982,7 +69666,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();
}
@@ -70115,7 +69799,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();
}
@@ -70226,7 +69910,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();
}
@@ -70443,7 +70127,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();
}
@@ -70690,7 +70374,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();
}
@@ -70937,7 +70621,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();
}
@@ -71123,7 +70807,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();
}
@@ -71436,7 +71120,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();
}
@@ -71653,7 +71337,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();
}
@@ -71869,7 +71553,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();
}
@@ -72116,7 +71800,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();
}
@@ -72240,7 +71924,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();
}
@@ -72394,7 +72078,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();
}
@@ -72641,7 +72325,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();
}
@@ -72894,7 +72578,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();
}
@@ -73110,7 +72794,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();
}
@@ -73396,7 +73080,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();
}
@@ -73643,7 +73327,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();
}
@@ -73767,7 +73451,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();
}
@@ -74014,7 +73698,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();
}
@@ -74261,7 +73945,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();
}
@@ -74508,7 +74192,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();
}
@@ -74755,7 +74439,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();
}
@@ -75033,7 +74717,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();
}
@@ -75311,7 +74995,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();
}
@@ -75597,7 +75281,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();
}
@@ -75730,7 +75414,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();
}
@@ -75863,7 +75547,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();
}
@@ -76049,7 +75733,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();
}
@@ -76296,7 +75980,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();
}
@@ -76574,7 +76258,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();
}
@@ -76746,7 +76430,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();
}
@@ -76927,7 +76611,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();
}
@@ -77099,7 +76783,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();
}
@@ -77285,7 +76969,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();
}
@@ -77440,7 +77124,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();
}
@@ -77778,7 +77462,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();
}
@@ -78168,7 +77852,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();
}
@@ -78552,7 +78236,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();
}
@@ -78685,7 +78369,7 @@ fail:
SWIGINTERN PyObject *IFootprintFactor_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_IFootprintFactor, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -78818,7 +78502,7 @@ fail:
SWIGINTERN PyObject *FootprintFactorGaussian_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_FootprintFactorGaussian, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -78951,7 +78635,7 @@ fail:
SWIGINTERN PyObject *FootprintFactorSquare_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_FootprintFactorSquare, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -80127,7 +79811,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();
}
@@ -80513,7 +80197,7 @@ fail:
SWIGINTERN PyObject *Simulation2D_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_Simulation2D, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -81041,7 +80725,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();
}
@@ -81340,7 +81024,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();
}
@@ -83271,7 +82955,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();
}
@@ -83870,7 +83554,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();
}
@@ -84910,7 +84594,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();
}
@@ -85114,7 +84798,7 @@ fail:
SWIGINTERN PyObject *AxisInfo_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_AxisInfo, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85738,7 +85422,7 @@ fail:
SWIGINTERN PyObject *SimulationResult_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_SimulationResult, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85819,7 +85503,7 @@ fail:
SWIGINTERN PyObject *IBackground_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_IBackground, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -85974,7 +85658,7 @@ fail:
SWIGINTERN PyObject *ConstantBackground_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_ConstantBackground, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -86792,7 +86476,7 @@ fail:
SWIGINTERN PyObject *IDetector_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_IDetector, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -87255,7 +86939,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();
}
@@ -87335,7 +87019,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();
}
@@ -87615,7 +87299,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();
}
@@ -87874,7 +87558,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();
}
@@ -88077,7 +87761,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();
}
@@ -88320,7 +88004,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();
}
@@ -88465,7 +88149,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();
}
@@ -89171,7 +88855,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();
}
@@ -89261,7 +88945,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();
}
@@ -89445,7 +89129,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();
}
@@ -89666,7 +89350,7 @@ fail:
SWIGINTERN PyObject *IdentityRotation_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_IdentityRotation, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -89834,7 +89518,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();
}
@@ -90002,7 +89686,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();
}
@@ -90218,7 +89902,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();
}
@@ -90448,7 +90132,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();
}
@@ -90532,7 +90216,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();
}
@@ -90665,7 +90349,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();
}
@@ -91654,7 +91338,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();
}
@@ -92356,7 +92040,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();
}
@@ -92583,7 +92267,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();
}
@@ -93037,7 +92721,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();
}
@@ -93725,7 +93409,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();
}
@@ -95084,7 +94768,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();
}
@@ -95216,7 +94900,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();
}
@@ -95417,7 +95101,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();
}
@@ -95720,7 +95404,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();
}
@@ -95968,7 +95652,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();
}
@@ -96227,7 +95911,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();
}
@@ -96853,7 +96537,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();
}
@@ -97070,7 +96754,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();
}
@@ -97282,7 +96966,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();
}
@@ -97611,7 +97295,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();
}
@@ -97880,7 +97564,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();
}
@@ -98149,7 +97833,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();
}
@@ -98867,7 +98551,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();
}
@@ -99281,7 +98965,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();
}
@@ -99526,7 +99210,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();
}
@@ -99766,7 +99450,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();
}
@@ -100006,7 +99690,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();
}
@@ -100429,7 +100113,7 @@ fail:
SWIGINTERN PyObject *Material_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_Material, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -101124,7 +100808,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();
}
@@ -102071,7 +101755,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();
}
@@ -102395,7 +102079,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();
}
@@ -103911,7 +103595,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IntensityData___itruediv__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IntensityData___idiv__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
OutputData< double > *arg1 = (OutputData< double > *) 0 ;
OutputData< double > *arg2 = 0 ;
@@ -103923,18 +103607,18 @@ SWIGINTERN PyObject *_wrap_IntensityData___itruediv__(PyObject *SWIGUNUSEDPARM(s
PyObject * obj1 = 0 ;
OutputData< double > *result = 0 ;
- if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___itruediv__",&obj0,&obj1)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OO:IntensityData___idiv__",&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___itruediv__" "', argument " "1"" of type '" "OutputData< double > *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData___idiv__" "', 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___itruediv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData___idiv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
}
if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IntensityData___itruediv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IntensityData___idiv__" "', argument " "2"" of type '" "OutputData< double > const &""'");
}
arg2 = reinterpret_cast< OutputData< double > * >(argp2);
result = (OutputData< double > *) &(arg1)->operator /=((OutputData< double > const &)*arg2);
@@ -104148,7 +103832,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();
}
@@ -104875,7 +104559,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();
}
@@ -105509,7 +105193,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();
}
@@ -105759,7 +105443,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();
}
@@ -107675,7 +107359,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();
}
@@ -108113,7 +107797,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();
}
@@ -108575,7 +108259,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();
}
@@ -108903,7 +108587,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();
}
@@ -109179,7 +108863,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();
}
@@ -109872,7 +109556,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();
}
@@ -109996,7 +109680,7 @@ fail:
SWIGINTERN PyObject *PoissonNoiseBackground_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_PoissonNoiseBackground, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -110392,7 +110076,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();
}
@@ -111232,7 +110916,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();
}
@@ -111587,7 +111271,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();
}
@@ -112705,7 +112389,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();
}
@@ -113010,7 +112694,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();
}
@@ -113205,7 +112889,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();
}
@@ -113832,7 +113516,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();
}
@@ -114029,7 +113713,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();
}
@@ -114408,7 +114092,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();
}
@@ -114487,7 +114171,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();
}
@@ -114856,7 +114540,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_Simulation_t, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -114897,7 +114581,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();
}
@@ -114925,7 +114609,7 @@ fail:
SWIGINTERN PyObject *AxesUnits_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_AxesUnitsWrap, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -115259,7 +114943,7 @@ fail:
SWIGINTERN PyObject *IUnitConverter_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_IUnitConverter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -115549,7 +115233,7 @@ fail:
SWIGINTERN PyObject *UnitConverterSimple_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_UnitConverterSimple, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -115658,7 +115342,7 @@ fail:
SWIGINTERN PyObject *SphericalConverter_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_SphericalConverter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -115767,7 +115451,7 @@ fail:
SWIGINTERN PyObject *RectangularConverter_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_RectangularConverter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -115888,7 +115572,7 @@ fail:
SWIGINTERN PyObject *OffSpecularConverter_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_OffSpecularConverter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -115997,7 +115681,7 @@ fail:
SWIGINTERN PyObject *SpecularConverter_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_SpecularConverter, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
@@ -116031,6 +115715,7 @@ 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"},
@@ -119045,13 +118730,6 @@ static PyMethodDef SwigMethods[] = {
"bool FitSuite::isInterrupted()\n"
"\n"
""},
- { (char *)"FitSuite_getRealOutputData", _wrap_FitSuite_getRealOutputData, METH_VARARGS, (char *)"\n"
- "getRealOutputData(size_t i_item=0) -> IntensityData\n"
- "FitSuite_getRealOutputData(FitSuite self) -> IntensityData\n"
- "\n"
- "const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const\n"
- "\n"
- ""},
{ (char *)"FitSuite_getSimulationOutputData", _wrap_FitSuite_getSimulationOutputData, METH_VARARGS, (char *)"\n"
"getSimulationOutputData(size_t i_item=0) -> IntensityData\n"
"FitSuite_getSimulationOutputData(FitSuite self) -> IntensityData\n"
@@ -119059,13 +118737,6 @@ static PyMethodDef SwigMethods[] = {
"const OutputData< double > * FitSuite::getSimulationOutputData(size_t i_item=0) const\n"
"\n"
""},
- { (char *)"FitSuite_getChiSquaredOutputData", _wrap_FitSuite_getChiSquaredOutputData, METH_VARARGS, (char *)"\n"
- "getChiSquaredOutputData(size_t i_item=0) -> IntensityData\n"
- "FitSuite_getChiSquaredOutputData(FitSuite self) -> IntensityData\n"
- "\n"
- "const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const\n"
- "\n"
- ""},
{ (char *)"FitSuite_parametersToString", _wrap_FitSuite_parametersToString, METH_VARARGS, (char *)"\n"
"FitSuite_parametersToString(FitSuite self) -> std::string\n"
"\n"
@@ -119348,6 +119019,8 @@ 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"
@@ -128730,7 +128403,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___itruediv__", _wrap_IntensityData___itruediv__, METH_VARARGS, (char *)"IntensityData___itruediv__(IntensityData self, IntensityData right) -> IntensityData"},
+ { (char *)"IntensityData___idiv__", _wrap_IntensityData___idiv__, METH_VARARGS, (char *)"IntensityData___idiv__(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"
@@ -134478,6 +134151,7 @@ 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
@@ -134709,13 +134383,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;
@@ -134730,9 +134404,14 @@ SWIG_init(void) {
(void)static_getset;
(void)self;
- /* Metaclass is used to implement static member variables */
- metatype = SwigPyObjectType();
+ /* 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);
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 */
@@ -134750,15 +134429,13 @@ 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;
- } else if (swigpyobject->tp_basicsize != cd->pytype->tp_basicsize) {
+ SwigPyObject_clientdata.pytype = SwigPyObject_TypeOnce();
+ } else if (SwigPyObject_TypeOnce()->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;
@@ -134789,33 +134466,30 @@ 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 *)"barn",Swig_var_barn_get, Swig_var_barn_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"radian",Swig_var_radian_get, Swig_var_radian_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"milliradian",Swig_var_milliradian_get, Swig_var_milliradian_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"degree",Swig_var_degree_get, Swig_var_degree_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"steradian",Swig_var_steradian_get, Swig_var_steradian_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"rad",Swig_var_rad_get, Swig_var_rad_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"mrad",Swig_var_mrad_get, Swig_var_mrad_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"sr",Swig_var_sr_get, Swig_var_sr_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"deg",Swig_var_deg_get, Swig_var_deg_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"tesla",Swig_var_tesla_get, Swig_var_tesla_set);
- SWIG_addvarlink(SWIG_globals(),(char *)"gauss",Swig_var_gauss_get, Swig_var_gauss_set);
- 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)));
+ 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*)"barn",Swig_var_barn_get, Swig_var_barn_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"radian",Swig_var_radian_get, Swig_var_radian_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"milliradian",Swig_var_milliradian_get, Swig_var_milliradian_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"degree",Swig_var_degree_get, Swig_var_degree_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"steradian",Swig_var_steradian_get, Swig_var_steradian_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"rad",Swig_var_rad_get, Swig_var_rad_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"mrad",Swig_var_mrad_get, Swig_var_mrad_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"sr",Swig_var_sr_get, Swig_var_sr_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"deg",Swig_var_deg_get, Swig_var_deg_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"tesla",Swig_var_tesla_get, Swig_var_tesla_set);
+ SWIG_addvarlink(SWIG_globals(),(char*)"gauss",Swig_var_gauss_get, Swig_var_gauss_set);
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 f35447d4844..4901028c873 100644
--- a/auto/Wrap/libBornAgainCore_wrap.h
+++ b/auto/Wrap/libBornAgainCore_wrap.h
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 3.0.8
*
* 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 f92d5fc4806..43da9d0c2fc 100644
--- a/auto/Wrap/libBornAgainFit.py
+++ b/auto/Wrap/libBornAgainFit.py
@@ -1,22 +1,15 @@
# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 3.0.12
+# Version 3.0.8
#
# Do not make changes to this file unless you know what you are doing--modify
# the SWIG interface file instead.
-from sys import version_info as _swig_python_version_info
-if _swig_python_version_info >= (2, 7, 0):
- def swig_import_helper():
- import importlib
- pkg = __name__.rpartition('.')[0]
- mname = '.'.join((pkg, '_libBornAgainFit')).lstrip('.')
- try:
- return importlib.import_module(mname)
- except ImportError:
- return importlib.import_module('_libBornAgainFit')
- _libBornAgainFit = swig_import_helper()
- del swig_import_helper
-elif _swig_python_version_info >= (2, 6, 0):
+
+
+
+
+from sys import version_info
+if version_info >= (2, 6, 0):
def swig_import_helper():
from os.path import dirname
import imp
@@ -26,27 +19,22 @@ elif _swig_python_version_info >= (2, 6, 0):
except ImportError:
import _libBornAgainFit
return _libBornAgainFit
- try:
- _mod = imp.load_module('_libBornAgainFit', fp, pathname, description)
- finally:
- if fp is not None:
+ if fp is not None:
+ try:
+ _mod = imp.load_module('_libBornAgainFit', fp, pathname, description)
+ finally:
fp.close()
- return _mod
+ return _mod
_libBornAgainFit = swig_import_helper()
del swig_import_helper
else:
import _libBornAgainFit
-del _swig_python_version_info
-
+del 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"):
@@ -71,34 +59,41 @@ def _swig_setattr(self, class_type, name, value):
return _swig_setattr_nondynamic(self, class_type, name, value, 0)
-def _swig_getattr(self, class_type, name):
+def _swig_getattr_nondynamic(self, class_type, name, static=1):
if (name == "thisown"):
return self.this.own()
method = class_type.__swig_getmethods__.get(name, None)
if method:
return method(self)
- raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
+ 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)
def _swig_repr(self):
try:
strthis = "proxy of " + self.this.__repr__()
- except __builtin__.Exception:
+ except Exception:
strthis = ""
return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
try:
_object = object
_newclass = 1
-except __builtin__.Exception:
+except AttributeError:
class _object:
pass
_newclass = 0
+
try:
import weakref
weakref_proxy = weakref.proxy
-except __builtin__.Exception:
+except Exception:
weakref_proxy = lambda x: x
@@ -209,6 +204,8 @@ 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."""
@@ -362,7 +359,7 @@ class vdouble1d_t(_object):
this = _libBornAgainFit.new_vdouble1d_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -567,7 +564,7 @@ class vdouble2d_t(_object):
this = _libBornAgainFit.new_vdouble2d_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -772,7 +769,7 @@ class vector_integer_t(_object):
this = _libBornAgainFit.new_vector_integer_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -977,7 +974,7 @@ class vector_longinteger_t(_object):
this = _libBornAgainFit.new_vector_longinteger_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1182,7 +1179,7 @@ class vector_complex_t(_object):
this = _libBornAgainFit.new_vector_complex_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1387,7 +1384,7 @@ class vector_string_t(_object):
this = _libBornAgainFit.new_vector_string_t(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def push_back(self, x):
@@ -1466,7 +1463,7 @@ class RealLimits(_object):
this = _libBornAgainFit.new_RealLimits()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def hasLowerLimit(self):
@@ -1617,37 +1614,49 @@ class RealLimits(_object):
"""lowerLimited(double bound_value) -> RealLimits"""
return _libBornAgainFit.RealLimits_lowerLimited(bound_value)
- lowerLimited = staticmethod(lowerLimited)
+ if _newclass:
+ lowerLimited = staticmethod(lowerLimited)
+ __swig_getmethods__["lowerLimited"] = lambda x: lowerLimited
def positive():
"""positive() -> RealLimits"""
return _libBornAgainFit.RealLimits_positive()
- positive = staticmethod(positive)
+ if _newclass:
+ positive = staticmethod(positive)
+ __swig_getmethods__["positive"] = lambda x: positive
def nonnegative():
"""nonnegative() -> RealLimits"""
return _libBornAgainFit.RealLimits_nonnegative()
- nonnegative = staticmethod(nonnegative)
+ if _newclass:
+ nonnegative = staticmethod(nonnegative)
+ __swig_getmethods__["nonnegative"] = lambda x: nonnegative
def upperLimited(bound_value):
"""upperLimited(double bound_value) -> RealLimits"""
return _libBornAgainFit.RealLimits_upperLimited(bound_value)
- upperLimited = staticmethod(upperLimited)
+ if _newclass:
+ upperLimited = staticmethod(upperLimited)
+ __swig_getmethods__["upperLimited"] = lambda x: 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)
- limited = staticmethod(limited)
+ if _newclass:
+ limited = staticmethod(limited)
+ __swig_getmethods__["limited"] = lambda x: limited
def limitless():
"""limitless() -> RealLimits"""
return _libBornAgainFit.RealLimits_limitless()
- limitless = staticmethod(limitless)
+ if _newclass:
+ limitless = staticmethod(limitless)
+ __swig_getmethods__["limitless"] = lambda x: limitless
def toString(self):
"""
@@ -1783,50 +1792,64 @@ class AttLimits(_object):
this = _libBornAgainFit.new_AttLimits()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def limitless():
"""limitless() -> AttLimits"""
return _libBornAgainFit.AttLimits_limitless()
- limitless = staticmethod(limitless)
+ if _newclass:
+ limitless = staticmethod(limitless)
+ __swig_getmethods__["limitless"] = lambda x: limitless
def lowerLimited(bound_value):
"""lowerLimited(double bound_value) -> AttLimits"""
return _libBornAgainFit.AttLimits_lowerLimited(bound_value)
- lowerLimited = staticmethod(lowerLimited)
+ if _newclass:
+ lowerLimited = staticmethod(lowerLimited)
+ __swig_getmethods__["lowerLimited"] = lambda x: lowerLimited
def positive():
"""positive() -> AttLimits"""
return _libBornAgainFit.AttLimits_positive()
- positive = staticmethod(positive)
+ if _newclass:
+ positive = staticmethod(positive)
+ __swig_getmethods__["positive"] = lambda x: positive
def nonnegative():
"""nonnegative() -> AttLimits"""
return _libBornAgainFit.AttLimits_nonnegative()
- nonnegative = staticmethod(nonnegative)
+ if _newclass:
+ nonnegative = staticmethod(nonnegative)
+ __swig_getmethods__["nonnegative"] = lambda x: nonnegative
def upperLimited(bound_value):
"""upperLimited(double bound_value) -> AttLimits"""
return _libBornAgainFit.AttLimits_upperLimited(bound_value)
- upperLimited = staticmethod(upperLimited)
+ if _newclass:
+ upperLimited = staticmethod(upperLimited)
+ __swig_getmethods__["upperLimited"] = lambda x: 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)
- limited = staticmethod(limited)
+ if _newclass:
+ limited = staticmethod(limited)
+ __swig_getmethods__["limited"] = lambda x: limited
def fixed():
"""fixed() -> AttLimits"""
return _libBornAgainFit.AttLimits_fixed()
- fixed = staticmethod(fixed)
+ if _newclass:
+ fixed = staticmethod(fixed)
+ __swig_getmethods__["fixed"] = lambda x: fixed
def isFixed(self):
"""
@@ -2138,7 +2161,7 @@ class IFitParameter(_object):
this = _libBornAgainFit.new_IFitParameter(*args)
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainFit.delete_IFitParameter
__del__ = lambda self: None
@@ -2382,7 +2405,7 @@ class FitParameterSet(_object):
this = _libBornAgainFit.new_FitParameterSet()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
__swig_destroy__ = _libBornAgainFit.delete_FitParameterSet
__del__ = lambda self: None
@@ -2627,7 +2650,7 @@ class MinimizerCatalogue(_object):
this = _libBornAgainFit.new_MinimizerCatalogue()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except Exception:
self.this = this
def toString(self):
@@ -2716,31 +2739,41 @@ class MinimizerFactory(_object):
"""
return _libBornAgainFit.MinimizerFactory_createMinimizer(*args)
- createMinimizer = staticmethod(createMinimizer)
+ if _newclass:
+ createMinimizer = staticmethod(createMinimizer)
+ __swig_getmethods__["createMinimizer"] = lambda x: createMinimizer
def printCatalogue():
"""printCatalogue()"""
return _libBornAgainFit.MinimizerFactory_printCatalogue()
- printCatalogue = staticmethod(printCatalogue)
+ if _newclass:
+ printCatalogue = staticmethod(printCatalogue)
+ __swig_getmethods__["printCatalogue"] = lambda x: printCatalogue
def catalogueToString():
"""catalogueToString() -> std::string"""
return _libBornAgainFit.MinimizerFactory_catalogueToString()
- catalogueToString = staticmethod(catalogueToString)
+ if _newclass:
+ catalogueToString = staticmethod(catalogueToString)
+ __swig_getmethods__["catalogueToString"] = lambda x: catalogueToString
def catalogueDetailsToString():
"""catalogueDetailsToString() -> std::string"""
return _libBornAgainFit.MinimizerFactory_catalogueDetailsToString()
- catalogueDetailsToString = staticmethod(catalogueDetailsToString)
+ if _newclass:
+ catalogueDetailsToString = staticmethod(catalogueDetailsToString)
+ __swig_getmethods__["catalogueDetailsToString"] = lambda x: catalogueDetailsToString
def catalogue():
"""catalogue() -> MinimizerCatalogue"""
return _libBornAgainFit.MinimizerFactory_catalogue()
- catalogue = staticmethod(catalogue)
+ if _newclass:
+ catalogue = staticmethod(catalogue)
+ __swig_getmethods__["catalogue"] = lambda x: catalogue
def __init__(self):
"""
@@ -2756,7 +2789,7 @@ class MinimizerFactory(_object):
this = _libBornAgainFit.new_MinimizerFactory()
try:
self.this.append(this)
- except __builtin__.Exception:
+ except 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 98b67610386..df2c2eb7a1c 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 3.0.8
*
* 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,11 +107,9 @@ template <typename T> T SwigValueInit() {
#endif
/* exporting methods */
-#if defined(__GNUC__)
-# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# ifndef GCC_HASCLASSVISIBILITY
-# define GCC_HASCLASSVISIBILITY
-# endif
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+# ifndef GCC_HASCLASSVISIBILITY
+# define GCC_HASCLASSVISIBILITY
# endif
#endif
@@ -671,16 +669,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
char d = *(c++);
unsigned char uu;
if ((d >= '0') && (d <= '9'))
- uu = (unsigned char)((d - '0') << 4);
+ uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f'))
- uu = (unsigned char)((d - ('a'-10)) << 4);
+ uu = ((d - ('a'-10)) << 4);
else
return (char *) 0;
d = *(c++);
if ((d >= '0') && (d <= '9'))
- uu |= (unsigned char)(d - '0');
+ uu |= (d - '0');
else if ((d >= 'a') && (d <= 'f'))
- uu |= (unsigned char)(d - ('a'-10));
+ uu |= (d - ('a'-10));
else
return (char *) 0;
*u = uu;
@@ -863,6 +861,10 @@ 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
@@ -977,7 +979,6 @@ 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
/* -----------------------------------------------------------------------------
@@ -1926,6 +1927,7 @@ 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
@@ -1936,7 +1938,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
@@ -1944,7 +1946,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
@@ -1954,7 +1956,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 */
@@ -2117,6 +2119,7 @@ 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
@@ -3523,7 +3526,7 @@ static swig_module_info swig_module = {swig_types, 47, 0, 0, 0, 0};
#endif
#define SWIG_name "_libBornAgainFit"
-#define SWIGVERSION 0x030012
+#define SWIGVERSION 0x030008
#define SWIG_VERSION SWIGVERSION
@@ -3622,7 +3625,6 @@ namespace swig {
#endif
-#include <typeinfo>
#include <stdexcept>
@@ -3772,7 +3774,7 @@ SWIG_AsVal_double (PyObject *obj, double *val)
return SWIG_OK;
#if PY_VERSION_HEX < 0x03000000
} else if (PyInt_Check(obj)) {
- if (val) *val = (double) PyInt_AsLong(obj);
+ if (val) *val = PyInt_AsLong(obj);
return SWIG_OK;
#endif
} else if (PyLong_Check(obj)) {
@@ -3893,109 +3895,23 @@ 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)
{
- 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
+ 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);
return res;
}
- #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
+ #define SWIG_From_long PyLong_FromLong
SWIGINTERNINLINE PyObject *
SWIG_From_ptrdiff_t (ptrdiff_t 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
+ return SWIG_From_long (static_cast< long >(value));
}
@@ -4049,65 +3965,12 @@ 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)
{
- 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
+ long v;
+ int res = SWIG_AsVal_long (obj, val ? &v : 0);
+ if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
return res;
}
@@ -4152,21 +4015,8 @@ namespace swig {
return traits<typename noconst_traits<Type >::noconst_type >::type_name();
}
- 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 *> {
+ template <class Type>
+ struct traits_info {
static swig_type_info *type_query(std::string name) {
name += " *";
return SWIG_TypeQuery(name.c_str());
@@ -4183,7 +4033,7 @@ namespace swig {
}
/*
- Partial specialization for pointers (traits)
+ Partial specialization for pointers
*/
template <class Type> struct traits <Type *> {
typedef pointer_category category;
@@ -4253,8 +4103,7 @@ namespace swig {
struct traits_asptr {
static int asptr(PyObject *obj, Type **val) {
Type *p;
- swig_type_info *descriptor = type_info<Type>();
- int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
+ int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
if (SWIG_IsOK(res)) {
if (val) *val = p;
}
@@ -4402,7 +4251,7 @@ namespace swig {
namespace std {
template <>
- struct less <PyObject *>
+ struct less <PyObject *>: public binary_function<PyObject *, PyObject *, bool>
{
bool
operator()(PyObject * v, PyObject *w) const
@@ -4427,7 +4276,7 @@ namespace std {
};
template <>
- struct less <swig::SwigPtr_PyObject>
+ struct less <swig::SwigPtr_PyObject>: public binary_function<swig::SwigPtr_PyObject, swig::SwigPtr_PyObject, bool>
{
bool
operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
@@ -4437,7 +4286,7 @@ namespace std {
};
template <>
- struct less <swig::SwigVar_PyObject>
+ struct less <swig::SwigVar_PyObject>: public binary_function<swig::SwigVar_PyObject, swig::SwigVar_PyObject, bool>
{
bool
operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const
@@ -4500,7 +4349,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, i <= j
+ // Required range: 0 <= i < size, 0 <= j < size
if (i < 0) {
ii = 0;
} else if (i < (Difference)size) {
@@ -4508,15 +4357,13 @@ 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, i >= j
+ // Required range: -1 <= i < size-1, -1 <= j < size-1
if (i < -1) {
ii = -1;
} else if (i < (Difference) size) {
@@ -4529,8 +4376,6 @@ namespace swig {
} else {
jj = (j < (Difference)size ) ? j : (Difference)(size-1);
}
- if (ii < jj)
- ii = jj;
}
}
@@ -4556,13 +4401,6 @@ 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) {
@@ -4580,7 +4418,6 @@ 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);
@@ -4591,16 +4428,17 @@ namespace swig {
}
} else {
Sequence *sequence = new Sequence();
- 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++;
+ 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++;
+ }
}
return sequence;
}
@@ -4614,11 +4452,12 @@ 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);
@@ -4652,6 +4491,8 @@ namespace swig {
}
}
} else {
+ if (jj > ii)
+ jj = ii;
size_t replacecount = (ii - jj - step - 1) / -step;
if (is.size() != replacecount) {
char msg[1024];
@@ -4677,33 +4518,37 @@ namespace swig {
Difference jj = 0;
swig::slice_adjust(i, j, step, size, ii, jj, true);
if (step > 0) {
- 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;
+ 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;
while (delcount) {
- it = self->erase(it);
- for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
+ it = typename Sequence::reverse_iterator(self->erase((++it).base()));
+ for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++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--;
- }
}
}
}
@@ -5202,8 +5047,8 @@ namespace swig {
static int asptr(PyObject *obj, sequence **seq) {
if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
sequence *p;
- swig_type_info *descriptor = swig::type_info<sequence>();
- if (descriptor && SWIG_IsOK(::SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0))) {
+ if (::SWIG_ConvertPtr(obj,(void**)&p,
+ swig::type_info<sequence>(),0) == SWIG_OK) {
if (seq) *seq = p;
return SWIG_OLDOBJ;
}
@@ -5242,7 +5087,7 @@ namespace swig {
#ifdef SWIG_PYTHON_EXTRA_NATIVE_CONTAINERS
swig_type_info *desc = swig::type_info<sequence>();
if (desc && desc->clientdata) {
- return SWIG_InternalNewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
+ return SWIG_NewPointerObj(new sequence(seq), desc, SWIG_POINTER_OWN);
}
#endif
size_type size = seq.size();
@@ -5263,13 +5108,6 @@ 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) {
@@ -5312,33 +5150,14 @@ SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
return (value > LONG_MAX) ?
- PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value));
+ PyLong_FromUnsignedLong(value) : PyLong_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)
{
-#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
+ return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
}
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){
@@ -5522,6 +5341,16 @@ 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)
{
@@ -5799,7 +5628,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/local/share/swig/3.0.12/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/home/pospelov/software/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
@@ -5949,18 +5778,13 @@ 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
@@ -5969,9 +5793,8 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
return SWIG_RuntimeError;
}
obj = PyUnicode_AsUTF8String(obj);
- if(alloc) *alloc = SWIG_NEWOBJ;
-#endif
PyBytes_AsStringAndSize(obj, &cstr, &len);
+ if(alloc) *alloc = SWIG_NEWOBJ;
#else
PyString_AsStringAndSize(obj, &cstr, &len);
#endif
@@ -5992,34 +5815,26 @@ 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
-#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
+ #if PY_VERSION_HEX>=0x03000000
+ assert(0); /* Should never reach here in Python 3 */
+ #endif
*cptr = SWIG_Python_str_AsChar(obj);
-#endif
}
}
if (psize) *psize = len + 1;
-#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+#if PY_VERSION_HEX>=0x03000000
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;
@@ -6030,7 +5845,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;
@@ -6117,15 +5932,11 @@ 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
@@ -7160,11 +6971,22 @@ 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 ;
@@ -9078,7 +8900,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();
}
@@ -11026,7 +10848,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();
}
@@ -12944,7 +12766,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();
}
@@ -14862,7 +14684,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();
}
@@ -16780,7 +16602,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();
}
@@ -18728,7 +18550,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();
}
@@ -19408,7 +19230,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();
}
@@ -19850,7 +19672,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();
}
@@ -20196,7 +20018,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();
}
@@ -21104,7 +20926,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();
}
@@ -22050,7 +21872,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();
}
@@ -22249,7 +22071,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();
}
@@ -22535,7 +22357,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();
}
@@ -22569,6 +22391,7 @@ 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"},
@@ -24187,6 +24010,7 @@ 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
@@ -24418,13 +24242,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;
@@ -24439,9 +24263,14 @@ SWIG_init(void) {
(void)static_getset;
(void)self;
- /* Metaclass is used to implement static member variables */
- metatype = SwigPyObjectType();
+ /* 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);
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 */
@@ -24459,15 +24288,13 @@ 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;
- } else if (swigpyobject->tp_basicsize != cd->pytype->tp_basicsize) {
+ SwigPyObject_clientdata.pytype = SwigPyObject_TypeOnce();
+ } else if (SwigPyObject_TypeOnce()->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;
@@ -24498,7 +24325,6 @@ 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 e6c542b0935..1aa4403ae1c 100644
--- a/auto/Wrap/libBornAgainFit_wrap.h
+++ b/auto/Wrap/libBornAgainFit_wrap.h
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 3.0.8
*
* 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 de3fda43582..96d50bdb9a2 100644
--- a/auto/Wrap/swig_runtime.h
+++ b/auto/Wrap/swig_runtime.h
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.12
+ * Version 3.0.8
*
* 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,11 +75,9 @@
#endif
/* exporting methods */
-#if defined(__GNUC__)
-# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# ifndef GCC_HASCLASSVISIBILITY
-# define GCC_HASCLASSVISIBILITY
-# endif
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+# ifndef GCC_HASCLASSVISIBILITY
+# define GCC_HASCLASSVISIBILITY
# endif
#endif
@@ -644,16 +642,16 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
char d = *(c++);
unsigned char uu;
if ((d >= '0') && (d <= '9'))
- uu = (unsigned char)((d - '0') << 4);
+ uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f'))
- uu = (unsigned char)((d - ('a'-10)) << 4);
+ uu = ((d - ('a'-10)) << 4);
else
return (char *) 0;
d = *(c++);
if ((d >= '0') && (d <= '9'))
- uu |= (unsigned char)(d - '0');
+ uu |= (d - '0');
else if ((d >= 'a') && (d <= 'f'))
- uu |= (unsigned char)(d - ('a'-10));
+ uu |= (d - ('a'-10));
else
return (char *) 0;
*u = uu;
@@ -818,6 +816,10 @@ 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
@@ -932,7 +934,6 @@ 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
@@ -1877,6 +1878,7 @@ 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
@@ -1887,7 +1889,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
@@ -1895,7 +1897,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
@@ -1905,7 +1907,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 */
@@ -2068,6 +2070,7 @@ 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
--
GitLab