diff --git a/Core/Algorithms/inc/FTDistributions.h b/Core/Algorithms/inc/FTDistributions.h
index 31cd7cc09817142e3268043ead1d9ca92471c44b..545e12b0ff930e9ce88b939c8e14552e5e63bfc2 100644
--- a/Core/Algorithms/inc/FTDistributions.h
+++ b/Core/Algorithms/inc/FTDistributions.h
@@ -33,12 +33,13 @@ protected:
double m_omega;
};
+//! Interface for 2 dimensional distributions in Fourier space
class BA_CORE_API_ IFTDistribution2D : public IParameterized
{
public:
- IFTDistribution2D(double omega_x, double omega_y)
- : m_omega_x(omega_x)
- , m_omega_y(omega_y)
+ IFTDistribution2D(double coherence_length_x, double coherence_length_y)
+ : m_coherence_length_x(coherence_length_x)
+ , m_coherence_length_y(coherence_length_y)
, m_gamma(0.0)
, m_delta(M_PI/2.0) {}
virtual ~IFTDistribution2D() {}
@@ -55,32 +56,77 @@ public:
double getDelta() const { return m_delta; }
//! evaluate IF for q in X,Y coordinates
+ //! A common factor of 2*pi*m_coherence_length_x*m_coherence_length_y is
+ //! applied by the caller if needed
virtual double evaluate(double qx, double qy) const=0;
//! transform back to a*, b* basis:
- virtual void transformToStarBasis(double qX, double qY,
- double alpha, double a, double b, double& qa, double& qb) const=0;
+ void transformToStarBasis(double qX, double qY,
+ double alpha, double a, double b, double& qa, double& qb) const;
+
protected:
- double m_omega_x;
- double m_omega_y;
+ virtual void init_parameters();
+ double m_coherence_length_x;
+ double m_coherence_length_y;
double m_gamma;
double m_delta;
};
+//! 2 dimensional Cauchy distribution in Fourier space
+//! corresponds to exp(-r) in real space
class BA_CORE_API_ FTDistribution2DCauchy : public IFTDistribution2D
{
public:
- FTDistribution2DCauchy(double omega_x, double omega_y);
+ FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y);
virtual ~FTDistribution2DCauchy() {}
virtual FTDistribution2DCauchy *clone() const;
+ virtual double evaluate(double qx, double qy) const;
+};
+
+//! 2 dimensional Gauss distribution in Fourier space
+//! corresponds to exp(-r^2) in real space
+class BA_CORE_API_ FTDistribution2DGauss : public IFTDistribution2D
+{
+public:
+ FTDistribution2DGauss(double coherence_length_x, double coherence_length_y);
+ virtual ~FTDistribution2DGauss() {}
+
+ virtual FTDistribution2DGauss *clone() const;
+
+ virtual double evaluate(double qx, double qy) const;
+};
+
+//! 2 dimensional gate distribution in Fourier space
+//! corresponds to 1 if r<1 (and 0 otherwise) in real space
+class BA_CORE_API_ FTDistribution2DGate : public IFTDistribution2D
+{
+public:
+ FTDistribution2DGate(double coherence_length_x, double coherence_length_y);
+ virtual ~FTDistribution2DGate() {}
+
+ virtual FTDistribution2DGate *clone() const;
+
+ virtual double evaluate(double qx, double qy) const;
+};
+
+//! 2 dimensional Voigt distribution in Fourier space
+//! Corresponds to eta*Gauss + (1-eta)*Cauchy
+class BA_CORE_API_ FTDistribution2DVoigt : public IFTDistribution2D
+{
+public:
+ FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y,
+ double eta);
+ virtual ~FTDistribution2DVoigt() {}
+
+ virtual FTDistribution2DVoigt *clone() const;
+
virtual double evaluate(double qx, double qy) const;
- virtual void transformToStarBasis(double qX, double qY,
- double alpha, double a, double b, double& qa, double& qb) const;
protected:
virtual void init_parameters();
+ double m_eta;
};
#endif /* FTDISTRIBUTIONS_H_ */
diff --git a/Core/Algorithms/src/FTDistributions.cpp b/Core/Algorithms/src/FTDistributions.cpp
index 5f3daefe44780239705dd2a0e17c66417e30cbf1..b4789cec005635607289deb14a1ef154ac51495d 100644
--- a/Core/Algorithms/src/FTDistributions.cpp
+++ b/Core/Algorithms/src/FTDistributions.cpp
@@ -14,9 +14,27 @@
// ************************************************************************** //
#include "FTDistributions.h"
+#include "MathFunctions.h"
-FTDistribution2DCauchy::FTDistribution2DCauchy(double omega_x, double omega_y)
-: IFTDistribution2D(omega_x, omega_y)
+void IFTDistribution2D::transformToStarBasis(double qX, double qY,
+ double alpha, double a, double b, double& qa, double& qb) const
+{
+ double prefactor = 1.0/(2*M_PI); // divide by sin(m_delta)
+ // for unnormalized X*,Y* basis
+ qa = a*prefactor*( std::sin(m_gamma+m_delta)*qX - std::sin(m_gamma)*qY );
+ qb = b*prefactor*( -std::sin(alpha-m_gamma-m_delta)*qX + std::sin(alpha-m_gamma)*qY );
+}
+
+void IFTDistribution2D::init_parameters()
+{
+ clearParameterPool();
+ registerParameter("coherence_length_x", &m_coherence_length_x);
+ registerParameter("coherence_length_y", &m_coherence_length_y);
+}
+
+FTDistribution2DCauchy::FTDistribution2DCauchy(double coherence_length_x,
+ double coherence_length_y)
+: IFTDistribution2D(coherence_length_x, coherence_length_y)
{
setName("2DDistributionCauchy");
init_parameters();
@@ -24,30 +42,93 @@ FTDistribution2DCauchy::FTDistribution2DCauchy(double omega_x, double omega_y)
FTDistribution2DCauchy* FTDistribution2DCauchy::clone() const
{
- FTDistribution2DCauchy *p_clone = new FTDistribution2DCauchy(m_omega_x, m_omega_y);
+ FTDistribution2DCauchy *p_clone = new FTDistribution2DCauchy(
+ m_coherence_length_x, m_coherence_length_y);
p_clone->setGamma(m_gamma);
return p_clone;
}
double FTDistribution2DCauchy::evaluate(double qx, double qy) const
{
- double sum_sq = qx*qx*m_omega_x*m_omega_x + qy*qy*m_omega_y*m_omega_y;
+ double sum_sq = qx*qx*m_coherence_length_x*m_coherence_length_x
+ + qy*qy*m_coherence_length_y*m_coherence_length_y;
return std::pow(1.0 + sum_sq, -1.5);
}
-void FTDistribution2DCauchy::transformToStarBasis(double qX, double qY,
- double alpha, double a, double b, double& qa, double& qb) const
+FTDistribution2DGauss::FTDistribution2DGauss(double coherence_length_x,
+ double coherence_length_y)
+: IFTDistribution2D(coherence_length_x, coherence_length_y)
{
- double prefactor = 1.0/(2*M_PI); // divide by sin(m_delta) for unnormalized X*,Y* basis
- qa = a*prefactor*( std::sin(m_gamma+m_delta)*qX - std::sin(m_gamma)*qY );
- qb = b*prefactor*( -std::sin(alpha-m_gamma-m_delta)*qX + std::sin(alpha-m_gamma)*qY );
+ setName("2DDistributionGauss");
+ init_parameters();
}
-void FTDistribution2DCauchy::init_parameters()
+FTDistribution2DGauss* FTDistribution2DGauss::clone() const
{
- clearParameterPool();
- registerParameter("omega_x", &m_omega_x);
- registerParameter("omega_y", &m_omega_y);
+ FTDistribution2DGauss *p_clone = new FTDistribution2DGauss(
+ m_coherence_length_x, m_coherence_length_y);
+ p_clone->setGamma(m_gamma);
+ return p_clone;
+}
+
+double FTDistribution2DGauss::evaluate(double qx, double qy) const
+{
+ double sum_sq = qx*qx*m_coherence_length_x*m_coherence_length_x
+ + qy*qy*m_coherence_length_y*m_coherence_length_y;
+ return std::exp(-sum_sq/4.0)/2.0;
+}
+
+FTDistribution2DGate::FTDistribution2DGate(double coherence_length_x,
+ double coherence_length_y)
+: IFTDistribution2D(coherence_length_x, coherence_length_y)
+{
+ setName("2DDistributionGate");
+ init_parameters();
+}
+
+FTDistribution2DGate* FTDistribution2DGate::clone() const
+{
+ FTDistribution2DGate *p_clone = new FTDistribution2DGate(
+ m_coherence_length_x, m_coherence_length_y);
+ p_clone->setGamma(m_gamma);
+ return p_clone;
}
+double FTDistribution2DGate::evaluate(double qx, double qy) const
+{
+ double scaled_q = std::sqrt(qx*qx*m_coherence_length_x*m_coherence_length_x
+ + qy*qy*m_coherence_length_y*m_coherence_length_y);
+ return MathFunctions::Bessel_C1(scaled_q);
+}
+
+FTDistribution2DVoigt::FTDistribution2DVoigt(double coherence_length_x,
+ double coherence_length_y, double eta)
+: IFTDistribution2D(coherence_length_x, coherence_length_y)
+, m_eta(eta)
+{
+ setName("2DDistributionVoigt");
+ init_parameters();
+}
+
+FTDistribution2DVoigt* FTDistribution2DVoigt::clone() const
+{
+ FTDistribution2DVoigt *p_clone = new FTDistribution2DVoigt(
+ m_coherence_length_x, m_coherence_length_y, m_eta);
+ p_clone->setGamma(m_gamma);
+ return p_clone;
+}
+
+double FTDistribution2DVoigt::evaluate(double qx, double qy) const
+{
+ double sum_sq = qx*qx*m_coherence_length_x*m_coherence_length_x
+ + qy*qy*m_coherence_length_y*m_coherence_length_y;
+ return m_eta*std::exp(-sum_sq/4.0)/2.0
+ + (1.0 - m_eta)*std::pow(1.0 + sum_sq, -1.5);
+}
+
+void FTDistribution2DVoigt::init_parameters()
+{
+ IFTDistribution2D::init_parameters();
+ registerParameter("eta", &m_eta);
+}
diff --git a/Core/PythonAPI/inc/__call_policies.pypp.hpp b/Core/PythonAPI/inc/__call_policies.pypp.hpp
index e5f8bb6a1bf0725c4072ca511a85c0b091532890..b31e20b5413618a6720f6151c07ec0cfd0729a62 100644
--- a/Core/PythonAPI/inc/__call_policies.pypp.hpp
+++ b/Core/PythonAPI/inc/__call_policies.pypp.hpp
@@ -73,7 +73,7 @@ struct make_addressof_holder{
return bpl::detail::none();
}
else{
- boost::uint32_t addressof_p = reinterpret_cast< boost::uint32_t >( p );
+ size_t addressof_p = size_t( p );
bpl::object p_address( addressof_p );
return bpl::incref( p_address.ptr() );
}
@@ -152,6 +152,11 @@ struct as_tuple_impl{
MemoryManager::deallocate_array( arr );
return bpl::incref( bpl::tuple( list_ ).ptr() );
}
+
+ static PyTypeObject const *get_pytype(){
+ return &PyTuple_Type;
+ }
+
};
}
diff --git a/Core/PythonAPI/src/AxisBin.pypp.cpp b/Core/PythonAPI/src/AxisBin.pypp.cpp
index d7803664b4fcd249729648094d50df19b3e8ecb4..669c312a4c85bf07f086a7f26075a4cc0df870dc 100644
--- a/Core/PythonAPI/src/AxisBin.pypp.cpp
+++ b/Core/PythonAPI/src/AxisBin.pypp.cpp
@@ -30,7 +30,7 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
}
- AxisBin_wrapper(::std::string name, ::std::size_t nbr_bins, double start, double end )
+ AxisBin_wrapper(::std::string name, ::size_t nbr_bins, double start, double end )
: AxisBin( name, nbr_bins, start, end )
, bp::wrapper< AxisBin >(){
// constructor
@@ -40,11 +40,11 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
virtual ::AxisBin * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->AxisBin::clone( );
+ }
}
-
::AxisBin * default_clone( ) const {
return AxisBin::clone( );
}
@@ -52,47 +52,47 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
virtual ::AxisBin * createDoubleBinSize( ) const {
if( bp::override func_createDoubleBinSize = this->get_override( "createDoubleBinSize" ) )
return func_createDoubleBinSize( );
- else
+ else{
return this->AxisBin::createDoubleBinSize( );
+ }
}
-
::AxisBin * default_createDoubleBinSize( ) const {
return AxisBin::createDoubleBinSize( );
}
- virtual ::std::size_t findClosestIndex( double value ) const {
+ virtual ::size_t findClosestIndex( double value ) const {
if( bp::override func_findClosestIndex = this->get_override( "findClosestIndex" ) )
return func_findClosestIndex( value );
- else
+ else{
return this->AxisBin::findClosestIndex( value );
+ }
}
-
- ::std::size_t default_findClosestIndex( double value ) const {
+ ::size_t default_findClosestIndex( double value ) const {
return AxisBin::findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::std::size_t index ) const {
+ virtual ::Bin1D getBin( ::size_t index ) const {
if( bp::override func_getBin = this->get_override( "getBin" ) )
return func_getBin( index );
- else
+ else{
return this->AxisBin::getBin( index );
+ }
}
-
- ::Bin1D default_getBin( ::std::size_t index ) const {
+ ::Bin1D default_getBin( ::size_t index ) const {
return AxisBin::getBin( index );
}
virtual double getMax( ) const {
if( bp::override func_getMax = this->get_override( "getMax" ) )
return func_getMax( );
- else
+ else{
return this->AxisBin::getMax( );
+ }
}
-
double default_getMax( ) const {
return AxisBin::getMax( );
}
@@ -100,36 +100,36 @@ struct AxisBin_wrapper : AxisBin, bp::wrapper< AxisBin > {
virtual double getMin( ) const {
if( bp::override func_getMin = this->get_override( "getMin" ) )
return func_getMin( );
- else
+ else{
return this->AxisBin::getMin( );
+ }
}
-
double default_getMin( ) const {
return AxisBin::getMin( );
}
- virtual ::std::size_t getSize( ) const {
+ virtual ::size_t getSize( ) const {
if( bp::override func_getSize = this->get_override( "getSize" ) )
return func_getSize( );
- else
+ else{
return this->AxisBin::getSize( );
+ }
}
-
- ::std::size_t default_getSize( ) const {
+ ::size_t default_getSize( ) const {
return AxisBin::getSize( );
}
- virtual double operator[]( ::std::size_t index ) const {
+ virtual double operator[]( ::size_t index ) const {
if( bp::override func___getitem__ = this->get_override( "__getitem__" ) )
return func___getitem__( index );
- else
+ else{
return this->AxisBin::operator[]( index );
+ }
}
-
- double default___getitem__( ::std::size_t index ) const {
+ double default___getitem__( ::size_t index ) const {
return AxisBin::operator[]( index );
}
@@ -141,7 +141,7 @@ void register_AxisBin_class(){
typedef bp::class_< AxisBin_wrapper, bp::bases< IAxis > > AxisBin_exposer_t;
AxisBin_exposer_t AxisBin_exposer = AxisBin_exposer_t( "AxisBin", bp::init< std::string >(( bp::arg("name") )) );
bp::scope AxisBin_scope( AxisBin_exposer );
- AxisBin_exposer.def( bp::init< std::string, std::size_t, double, double >(( bp::arg("name"), bp::arg("nbr_bins"), bp::arg("start"), bp::arg("end") )) );
+ AxisBin_exposer.def( bp::init< std::string, size_t, double, double >(( bp::arg("name"), bp::arg("nbr_bins"), bp::arg("start"), bp::arg("end") )) );
{ //::AxisBin::clone
typedef ::AxisBin * ( ::AxisBin::*clone_function_type )( ) const;
@@ -168,8 +168,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::findClosestIndex
- typedef ::std::size_t ( ::AxisBin::*findClosestIndex_function_type )( double ) const;
- typedef ::std::size_t ( AxisBin_wrapper::*default_findClosestIndex_function_type )( double ) const;
+ typedef ::size_t ( ::AxisBin::*findClosestIndex_function_type )( double ) const;
+ typedef ::size_t ( AxisBin_wrapper::*default_findClosestIndex_function_type )( double ) const;
AxisBin_exposer.def(
"findClosestIndex"
@@ -180,8 +180,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::getBin
- typedef ::Bin1D ( ::AxisBin::*getBin_function_type )( ::std::size_t ) const;
- typedef ::Bin1D ( AxisBin_wrapper::*default_getBin_function_type )( ::std::size_t ) const;
+ typedef ::Bin1D ( ::AxisBin::*getBin_function_type )( ::size_t ) const;
+ typedef ::Bin1D ( AxisBin_wrapper::*default_getBin_function_type )( ::size_t ) const;
AxisBin_exposer.def(
"getBin"
@@ -214,8 +214,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::getSize
- typedef ::std::size_t ( ::AxisBin::*getSize_function_type )( ) const;
- typedef ::std::size_t ( AxisBin_wrapper::*default_getSize_function_type )( ) const;
+ typedef ::size_t ( ::AxisBin::*getSize_function_type )( ) const;
+ typedef ::size_t ( AxisBin_wrapper::*default_getSize_function_type )( ) const;
AxisBin_exposer.def(
"getSize"
@@ -234,7 +234,7 @@ void register_AxisBin_class(){
}
{ //::AxisBin::initBins
- typedef void ( ::AxisBin::*initBins_function_type )( ::std::size_t,double,double ) ;
+ typedef void ( ::AxisBin::*initBins_function_type )( ::size_t,double,double ) ;
AxisBin_exposer.def(
"initBins"
@@ -244,8 +244,8 @@ void register_AxisBin_class(){
}
{ //::AxisBin::operator[]
- typedef double ( ::AxisBin::*__getitem___function_type )( ::std::size_t ) const;
- typedef double ( AxisBin_wrapper::*default___getitem___function_type )( ::std::size_t ) const;
+ typedef double ( ::AxisBin::*__getitem___function_type )( ::size_t ) const;
+ typedef double ( AxisBin_wrapper::*default___getitem___function_type )( ::size_t ) const;
AxisBin_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/AxisDouble.pypp.cpp b/Core/PythonAPI/src/AxisDouble.pypp.cpp
index 300be999fae50e538a44392edbd3c49a5667437c..b8f339934ce794cec37fda805faa559fd1cde158 100644
--- a/Core/PythonAPI/src/AxisDouble.pypp.cpp
+++ b/Core/PythonAPI/src/AxisDouble.pypp.cpp
@@ -30,7 +30,7 @@ struct AxisDouble_wrapper : AxisDouble, bp::wrapper< AxisDouble > {
}
- AxisDouble_wrapper(::std::string name, ::std::size_t size, double start, double end )
+ AxisDouble_wrapper(::std::string name, ::size_t size, double start, double end )
: AxisDouble( name, size, start, end )
, bp::wrapper< AxisDouble >(){
// constructor
@@ -44,38 +44,38 @@ struct AxisDouble_wrapper : AxisDouble, bp::wrapper< AxisDouble > {
}
- virtual ::std::size_t findClosestIndex( double value ) const {
+ virtual ::size_t findClosestIndex( double value ) const {
if( bp::override func_findClosestIndex = this->get_override( "findClosestIndex" ) )
return func_findClosestIndex( value );
- else
+ else{
return this->AxisDouble::findClosestIndex( value );
+ }
}
-
- ::std::size_t default_findClosestIndex( double value ) const {
+ ::size_t default_findClosestIndex( double value ) const {
return AxisDouble::findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::std::size_t index ) const {
+ virtual ::Bin1D getBin( ::size_t index ) const {
if( bp::override func_getBin = this->get_override( "getBin" ) )
return func_getBin( index );
- else
+ else{
return this->AxisDouble::getBin( index );
+ }
}
-
- ::Bin1D default_getBin( ::std::size_t index ) const {
+ ::Bin1D default_getBin( ::size_t index ) const {
return AxisDouble::getBin( index );
}
virtual double getMax( ) const {
if( bp::override func_getMax = this->get_override( "getMax" ) )
return func_getMax( );
- else
+ else{
return this->AxisDouble::getMax( );
+ }
}
-
double default_getMax( ) const {
return AxisDouble::getMax( );
}
@@ -83,36 +83,36 @@ struct AxisDouble_wrapper : AxisDouble, bp::wrapper< AxisDouble > {
virtual double getMin( ) const {
if( bp::override func_getMin = this->get_override( "getMin" ) )
return func_getMin( );
- else
+ else{
return this->AxisDouble::getMin( );
+ }
}
-
double default_getMin( ) const {
return AxisDouble::getMin( );
}
- virtual ::std::size_t getSize( ) const {
+ virtual ::size_t getSize( ) const {
if( bp::override func_getSize = this->get_override( "getSize" ) )
return func_getSize( );
- else
+ else{
return this->AxisDouble::getSize( );
+ }
}
-
- ::std::size_t default_getSize( ) const {
+ ::size_t default_getSize( ) const {
return AxisDouble::getSize( );
}
- virtual double operator[]( ::std::size_t index ) const {
+ virtual double operator[]( ::size_t index ) const {
if( bp::override func___getitem__ = this->get_override( "__getitem__" ) )
return func___getitem__( index );
- else
+ else{
return this->AxisDouble::operator[]( index );
+ }
}
-
- double default___getitem__( ::std::size_t index ) const {
+ double default___getitem__( ::size_t index ) const {
return AxisDouble::operator[]( index );
}
@@ -124,12 +124,12 @@ void register_AxisDouble_class(){
typedef bp::class_< AxisDouble_wrapper, bp::bases< IAxis > > AxisDouble_exposer_t;
AxisDouble_exposer_t AxisDouble_exposer = AxisDouble_exposer_t( "AxisDouble", bp::init< std::string >(( bp::arg("name") )) );
bp::scope AxisDouble_scope( AxisDouble_exposer );
- AxisDouble_exposer.def( bp::init< std::string, std::size_t, double, double >(( bp::arg("name"), bp::arg("size"), bp::arg("start"), bp::arg("end") )) );
+ AxisDouble_exposer.def( bp::init< std::string, size_t, double, double >(( bp::arg("name"), bp::arg("size"), bp::arg("start"), bp::arg("end") )) );
AxisDouble_exposer.def( bp::init< AxisBin const & >(( bp::arg("source") )) );
{ //::AxisDouble::findClosestIndex
- typedef ::std::size_t ( ::AxisDouble::*findClosestIndex_function_type )( double ) const;
- typedef ::std::size_t ( AxisDouble_wrapper::*default_findClosestIndex_function_type )( double ) const;
+ typedef ::size_t ( ::AxisDouble::*findClosestIndex_function_type )( double ) const;
+ typedef ::size_t ( AxisDouble_wrapper::*default_findClosestIndex_function_type )( double ) const;
AxisDouble_exposer.def(
"findClosestIndex"
@@ -140,8 +140,8 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getBin
- typedef ::Bin1D ( ::AxisDouble::*getBin_function_type )( ::std::size_t ) const;
- typedef ::Bin1D ( AxisDouble_wrapper::*default_getBin_function_type )( ::std::size_t ) const;
+ typedef ::Bin1D ( ::AxisDouble::*getBin_function_type )( ::size_t ) const;
+ typedef ::Bin1D ( AxisDouble_wrapper::*default_getBin_function_type )( ::size_t ) const;
AxisDouble_exposer.def(
"getBin"
@@ -152,7 +152,7 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getLowerBoundIndex
- typedef ::std::size_t ( ::AxisDouble::*getLowerBoundIndex_function_type )( double ) const;
+ typedef ::size_t ( ::AxisDouble::*getLowerBoundIndex_function_type )( double ) const;
AxisDouble_exposer.def(
"getLowerBoundIndex"
@@ -184,8 +184,8 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getSize
- typedef ::std::size_t ( ::AxisDouble::*getSize_function_type )( ) const;
- typedef ::std::size_t ( AxisDouble_wrapper::*default_getSize_function_type )( ) const;
+ typedef ::size_t ( ::AxisDouble::*getSize_function_type )( ) const;
+ typedef ::size_t ( AxisDouble_wrapper::*default_getSize_function_type )( ) const;
AxisDouble_exposer.def(
"getSize"
@@ -195,7 +195,7 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::getUpperBoundIndex
- typedef ::std::size_t ( ::AxisDouble::*getUpperBoundIndex_function_type )( double ) const;
+ typedef ::size_t ( ::AxisDouble::*getUpperBoundIndex_function_type )( double ) const;
AxisDouble_exposer.def(
"getUpperBoundIndex"
@@ -214,7 +214,7 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::initElements
- typedef void ( ::AxisDouble::*initElements_function_type )( ::std::size_t,double,double ) ;
+ typedef void ( ::AxisDouble::*initElements_function_type )( ::size_t,double,double ) ;
AxisDouble_exposer.def(
"initElements"
@@ -224,8 +224,8 @@ void register_AxisDouble_class(){
}
{ //::AxisDouble::operator[]
- typedef double ( ::AxisDouble::*__getitem___function_type )( ::std::size_t ) const;
- typedef double ( AxisDouble_wrapper::*default___getitem___function_type )( ::std::size_t ) const;
+ typedef double ( ::AxisDouble::*__getitem___function_type )( ::size_t ) const;
+ typedef double ( AxisDouble_wrapper::*default___getitem___function_type )( ::size_t ) const;
AxisDouble_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/Beam.pypp.cpp b/Core/PythonAPI/src/Beam.pypp.cpp
index f346c78eb1d2179bf5d7226620082197b369c7eb..e2c8d55743ef22fa11641a03dbf69c5dc931fe7f 100644
--- a/Core/PythonAPI/src/Beam.pypp.cpp
+++ b/Core/PythonAPI/src/Beam.pypp.cpp
@@ -35,11 +35,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -114,11 +114,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -126,11 +126,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/Crystal.pypp.cpp b/Core/PythonAPI/src/Crystal.pypp.cpp
index e80cbe6dd7d73085c2acdb73033632d6a15f897a..fedc38fffc1e2960985d75851e1a20f413a39745 100644
--- a/Core/PythonAPI/src/Crystal.pypp.cpp
+++ b/Core/PythonAPI/src/Crystal.pypp.cpp
@@ -28,11 +28,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Crystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->Crystal::clone( );
+ }
}
-
::Crystal * default_clone( ) const {
return Crystal::clone( );
}
@@ -40,11 +40,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Crystal * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->Crystal::cloneInvertB( );
+ }
}
-
::Crystal * default_cloneInvertB( ) const {
return Crystal::cloneInvertB( );
}
@@ -52,11 +52,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Geometry::ITransform3D const * getTransform( ) const {
if( bp::override func_getTransform = this->get_override( "getTransform" ) )
return func_getTransform( );
- else
+ else{
return this->Crystal::getTransform( );
+ }
}
-
::Geometry::ITransform3D const * default_getTransform( ) const {
return Crystal::getTransform( );
}
@@ -64,11 +64,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void setTransform( ::Geometry::ITransform3D const & transform ) {
if( bp::override func_setTransform = this->get_override( "setTransform" ) )
func_setTransform( boost::ref(transform) );
- else
+ else{
this->Crystal::setTransform( boost::ref(transform) );
+ }
}
-
void default_setTransform( ::Geometry::ITransform3D const & transform ) {
Crystal::setTransform( boost::ref(transform) );
}
@@ -76,11 +76,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -88,11 +88,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -100,11 +100,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -148,11 +148,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -179,11 +179,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -191,11 +191,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,24 +203,24 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -446,8 +446,8 @@ void register_Crystal_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( Crystal_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( Crystal_wrapper::*default_size_function_type )( ) const;
Crystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Detector.pypp.cpp b/Core/PythonAPI/src/Detector.pypp.cpp
index b5d25887a535a0f25367bbff3e25514a002df70a..286cff5b79d2a8861c188f1b46e52c2cc7c0c262 100644
--- a/Core/PythonAPI/src/Detector.pypp.cpp
+++ b/Core/PythonAPI/src/Detector.pypp.cpp
@@ -35,11 +35,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -114,11 +114,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -126,11 +126,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -155,7 +155,7 @@ void register_Detector_class(){
}
{ //::Detector::getAxis
- typedef ::IAxis const & ( ::Detector::*getAxis_function_type )( ::std::size_t ) const;
+ typedef ::IAxis const & ( ::Detector::*getAxis_function_type )( ::size_t ) const;
Detector_exposer.def(
"getAxis"
@@ -176,7 +176,7 @@ void register_Detector_class(){
}
{ //::Detector::getDimension
- typedef ::std::size_t ( ::Detector::*getDimension_function_type )( ) const;
+ typedef ::size_t ( ::Detector::*getDimension_function_type )( ) const;
Detector_exposer.def(
"getDimension"
diff --git a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
index ce3e50e7291369b371ef5f67e3a95521ed50ebae..2f88ce4af0aa595614ad8afd5ca4667be5f2f26e 100644
--- a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
+++ b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
@@ -25,8 +25,8 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
}
- FTDistribution2DCauchy_wrapper(double omega_x, double omega_y )
- : FTDistribution2DCauchy( omega_x, omega_y )
+ FTDistribution2DCauchy_wrapper(double coherence_length_x, double coherence_length_y )
+ : FTDistribution2DCauchy( coherence_length_x, coherence_length_y )
, bp::wrapper< FTDistribution2DCauchy >(){
// constructor
@@ -35,11 +35,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual ::FTDistribution2DCauchy * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FTDistribution2DCauchy::clone( );
+ }
}
-
::FTDistribution2DCauchy * default_clone( ) const {
return FTDistribution2DCauchy::clone( );
}
@@ -47,35 +47,23 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual double evaluate( double qx, double qy ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( qx, qy );
- else
+ else{
return this->FTDistribution2DCauchy::evaluate( qx, qy );
+ }
}
-
double default_evaluate( double qx, double qy ) const {
return FTDistribution2DCauchy::evaluate( qx, qy );
}
- virtual void transformToStarBasis( double qX, double qY, double alpha, double a, double b, double & qa, double & qb ) const {
- if( bp::override func_transformToStarBasis = this->get_override( "transformToStarBasis" ) )
- func_transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
- else
- this->FTDistribution2DCauchy::transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
- }
-
-
- void default_transformToStarBasis( double qX, double qY, double alpha, double a, double b, double & qa, double & qb ) const {
- FTDistribution2DCauchy::transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -83,11 +71,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -95,11 +83,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -107,11 +95,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -138,11 +126,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -150,11 +138,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -162,11 +150,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -177,7 +165,7 @@ void register_FTDistribution2DCauchy_class(){
{ //::FTDistribution2DCauchy
typedef bp::class_< FTDistribution2DCauchy_wrapper, bp::bases< IFTDistribution2D > > FTDistribution2DCauchy_exposer_t;
- FTDistribution2DCauchy_exposer_t FTDistribution2DCauchy_exposer = FTDistribution2DCauchy_exposer_t( "FTDistribution2DCauchy", bp::init< double, double >(( bp::arg("omega_x"), bp::arg("omega_y") )) );
+ FTDistribution2DCauchy_exposer_t FTDistribution2DCauchy_exposer = FTDistribution2DCauchy_exposer_t( "FTDistribution2DCauchy", bp::init< double, double >(( bp::arg("coherence_length_x"), bp::arg("coherence_length_y") )) );
bp::scope FTDistribution2DCauchy_scope( FTDistribution2DCauchy_exposer );
{ //::FTDistribution2DCauchy::clone
@@ -202,18 +190,6 @@ void register_FTDistribution2DCauchy_class(){
, default_evaluate_function_type(&FTDistribution2DCauchy_wrapper::default_evaluate)
, ( bp::arg("qx"), bp::arg("qy") ) );
- }
- { //::FTDistribution2DCauchy::transformToStarBasis
-
- typedef void ( ::FTDistribution2DCauchy::*transformToStarBasis_function_type )( double,double,double,double,double,double &,double & ) const;
- typedef void ( FTDistribution2DCauchy_wrapper::*default_transformToStarBasis_function_type )( double,double,double,double,double,double &,double & ) const;
-
- FTDistribution2DCauchy_exposer.def(
- "transformToStarBasis"
- , transformToStarBasis_function_type(&::FTDistribution2DCauchy::transformToStarBasis)
- , default_transformToStarBasis_function_type(&FTDistribution2DCauchy_wrapper::default_transformToStarBasis)
- , ( bp::arg("qX"), bp::arg("qY"), bp::arg("alpha"), bp::arg("a"), bp::arg("b"), bp::arg("qa"), bp::arg("qb") ) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index 545a8c77d41cd272ae432ad6234956d3055751d3..12d73f5c09ceeada8cc2dff21c9e620f585212c2 100644
--- a/Core/PythonAPI/src/FormFactorBox.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::FormFactorBox * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorBox::clone( );
+ }
}
-
::FormFactorBox * default_clone( ) const {
return FormFactorBox::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorBox::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorBox::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorBox::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorBox::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorBox::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorBox::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorBox::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorBox::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,11 +100,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -112,35 +112,35 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -160,11 +160,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -184,11 +184,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -196,11 +196,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -208,11 +208,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -239,11 +239,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -251,11 +251,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -382,8 +382,8 @@ void register_FormFactorBox_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorBox_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorBox_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorBox_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCone.pypp.cpp b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
index caa337a5de9b0d7de50faf7f205f38aab20c27bc..d31a4a434b8258e1f862755a58c83c091d8b2967 100644
--- a/Core/PythonAPI/src/FormFactorCone.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::FormFactorCone * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorCone::clone( );
+ }
}
-
::FormFactorCone * default_clone( ) const {
return FormFactorCone::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorCone::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCone::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else
+ else{
return this->FormFactorCone::getAlpha( );
+ }
}
-
double default_getAlpha( ) const {
return FormFactorCone::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorCone::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorCone::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorCone::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCone::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorCone::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorCone::getRadius( );
}
@@ -100,11 +100,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else
+ else{
this->FormFactorCone::setAlpha( alpha );
+ }
}
-
void default_setAlpha( double alpha ) {
FormFactorCone::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorCone::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorCone::setHeight( height );
}
@@ -124,11 +124,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else
+ else{
this->FormFactorCone::setRadius( radius );
+ }
}
-
void default_setRadius( double radius ) {
FormFactorCone::setRadius( radius );
}
@@ -136,11 +136,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -148,11 +148,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -160,35 +160,35 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -196,11 +196,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -208,11 +208,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -220,11 +220,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -232,11 +232,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -244,11 +244,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -256,11 +256,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -287,11 +287,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -299,11 +299,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -311,11 +311,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -468,8 +468,8 @@ void register_FormFactorCone_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorCone_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorCone_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorCone_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index f4956ed3ec4668b672c803a3d108e96e57c0f286..3faf86f8d95de072bf15ad0c899d3ab743c756e1 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -21,11 +21,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::FormFactorCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorCrystal::clone( );
+ }
}
-
::FormFactorCrystal * default_clone( ) const {
return FormFactorCrystal::clone( );
}
@@ -33,11 +33,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -45,11 +45,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorCrystal::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCrystal::evaluate_for_q( boost::ref(q) );
}
@@ -57,11 +57,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->FormFactorCrystal::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return FormFactorCrystal::getVolume( );
}
@@ -69,11 +69,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -81,11 +81,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -93,35 +93,35 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -129,11 +129,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -141,11 +141,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->IFormFactor::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -153,11 +153,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->IFormFactor::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -165,11 +165,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -177,11 +177,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -189,11 +189,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -201,11 +201,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -232,11 +232,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -244,11 +244,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -256,11 +256,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -356,8 +356,8 @@ void register_FormFactorCrystal_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorCrystal_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorCrystal_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorCrystal_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index 8e6f648fb3f65bf5bb8502c554c44d4b8ece3c08..db9d699759587891d02f407418235624d2616bd6 100644
--- a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::FormFactorCylinder * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorCylinder::clone( );
+ }
}
-
::FormFactorCylinder * default_clone( ) const {
return FormFactorCylinder::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorCylinder::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCylinder::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorCylinder::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorCylinder::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorCylinder::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCylinder::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorCylinder::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorCylinder::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorCylinder::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorCylinder::setHeight( height );
}
@@ -100,11 +100,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else
+ else{
this->FormFactorCylinder::setRadius( radius );
+ }
}
-
void default_setRadius( double radius ) {
FormFactorCylinder::setRadius( radius );
}
@@ -112,11 +112,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,35 +136,35 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -172,11 +172,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -184,11 +184,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -208,11 +208,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -220,11 +220,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -232,11 +232,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -263,11 +263,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -275,11 +275,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -287,11 +287,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -421,8 +421,8 @@ void register_FormFactorCylinder_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorCylinder_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index b7d22d1b008955fff615cc70a634b8d99ff38c9b..9c9ae4b68d9506f011b80574738757283ac85a4e 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::FormFactorDecoratorDebyeWaller * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorDecoratorDebyeWaller::clone( );
+ }
}
-
::FormFactorDecoratorDebyeWaller * default_clone( ) const {
return FormFactorDecoratorDebyeWaller::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -52,11 +52,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,35 +88,35 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -124,11 +124,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->IFormFactorDecorator::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return IFormFactorDecorator::getHeight( );
}
@@ -148,11 +148,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactorDecorator::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactorDecorator::getRadius( );
}
@@ -160,11 +160,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorDecorator::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorDecorator::getVolume( );
}
@@ -172,11 +172,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -184,11 +184,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -196,11 +196,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -227,11 +227,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -239,11 +239,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -251,11 +251,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -339,8 +339,8 @@ void register_FormFactorDecoratorDebyeWaller_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorDecoratorDebyeWaller_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorDecoratorDebyeWaller_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorDecoratorDebyeWaller_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp b/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
index f5b8c13ec58113eb0ae4ec114a3479397b9bf0c7..8920cf3e6854c886a8f3f509f2489da27d9b47c3 100644
--- a/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::FormFactorEllipsoid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorEllipsoid::clone( );
+ }
}
-
::FormFactorEllipsoid * default_clone( ) const {
return FormFactorEllipsoid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorEllipsoid::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorEllipsoid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorEllipsoid::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorEllipsoid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorEllipsoid::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorEllipsoid::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorEllipsoid::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorEllipsoid::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,11 +100,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -112,35 +112,35 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -160,11 +160,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -184,11 +184,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -196,11 +196,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -208,11 +208,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -239,11 +239,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -251,11 +251,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -382,8 +382,8 @@ void register_FormFactorEllipsoid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorEllipsoid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorEllipsoid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorEllipsoid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index 3849c05432af743970fbe2db9a8a797dac9f13e1..82ece89ac2e832a9c644570c32f60b155017d14f 100644
--- a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::FormFactorFullSphere * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorFullSphere::clone( );
+ }
}
-
::FormFactorFullSphere * default_clone( ) const {
return FormFactorFullSphere::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorFullSphere::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorFullSphere::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorFullSphere::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorFullSphere::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorFullSphere::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorFullSphere::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorFullSphere::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorFullSphere::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else
+ else{
this->FormFactorFullSphere::setRadius( radius );
+ }
}
-
void default_setRadius( double radius ) {
FormFactorFullSphere::setRadius( radius );
}
@@ -100,11 +100,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,35 +124,35 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -172,11 +172,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -196,11 +196,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -208,11 +208,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -220,11 +220,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -251,11 +251,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -263,11 +263,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -275,11 +275,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -397,8 +397,8 @@ void register_FormFactorFullSphere_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorFullSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorFullSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorFullSphere_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
index 02848d2d2afeea7cac6d890cd9231fcfc265866b..cb9c15a1ba43929d013c0e440f3d7c3d9d6c84bf 100644
--- a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::FormFactorFullSpheroid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorFullSpheroid::clone( );
+ }
}
-
::FormFactorFullSpheroid * default_clone( ) const {
return FormFactorFullSpheroid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorFullSpheroid::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorFullSpheroid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorFullSpheroid::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorFullSpheroid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorFullSpheroid::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorFullSpheroid::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorFullSpheroid::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorFullSpheroid::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,11 +100,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -112,35 +112,35 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -160,11 +160,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -184,11 +184,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -196,11 +196,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -208,11 +208,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -239,11 +239,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -251,11 +251,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -373,8 +373,8 @@ void register_FormFactorFullSpheroid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorFullSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorFullSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorFullSpheroid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index c0431a98d53f87d0b56028b8e4a0d28bebd45f1f..abf315d60f01011121fa90e0e1de8f3cf1918c62 100644
--- a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
@@ -35,11 +35,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::FormFactorGauss * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorGauss::clone( );
+ }
}
-
::FormFactorGauss * default_clone( ) const {
return FormFactorGauss::clone( );
}
@@ -47,11 +47,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorGauss::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorGauss::evaluate_for_q( boost::ref(q) );
}
@@ -59,11 +59,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorGauss::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorGauss::getHeight( );
}
@@ -71,11 +71,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorGauss::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorGauss::getNumberOfStochasticParameters( );
}
@@ -83,11 +83,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorGauss::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorGauss::getRadius( );
}
@@ -95,11 +95,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->FormFactorGauss::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return FormFactorGauss::getVolume( );
}
@@ -107,11 +107,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -119,11 +119,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -131,35 +131,35 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -167,11 +167,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -179,11 +179,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -191,11 +191,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -203,11 +203,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -215,11 +215,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -246,11 +246,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -258,11 +258,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -270,11 +270,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -392,8 +392,8 @@ void register_FormFactorGauss_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorGauss_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorGauss_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorGauss_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
index 1a300af87c57d5d832a1b2b723e8548daf4099ba..98d83fa669b419400d55323bfdceeee139ac1126 100644
--- a/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual ::FormFactorHemiSpheroid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorHemiSpheroid::clone( );
+ }
}
-
::FormFactorHemiSpheroid * default_clone( ) const {
return FormFactorHemiSpheroid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorHemiSpheroid::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorHemiSpheroid::getHeight( );
}
@@ -52,11 +52,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorHemiSpheroid::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorHemiSpheroid::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,35 +88,35 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -124,11 +124,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -136,11 +136,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -160,11 +160,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -172,11 +172,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -184,11 +184,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -196,11 +196,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -227,11 +227,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -239,11 +239,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -251,11 +251,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -338,8 +338,8 @@ void register_FormFactorHemiSpheroid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorHemiSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorHemiSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorHemiSpheroid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index 4b41e00edca20e7caa2fb92cc6d95296a2b494c7..aa20e83afaa9352db370cd4a93d0b44012fadbc0 100644
--- a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
@@ -35,11 +35,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::FormFactorLorentz * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorLorentz::clone( );
+ }
}
-
::FormFactorLorentz * default_clone( ) const {
return FormFactorLorentz::clone( );
}
@@ -47,11 +47,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorLorentz::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorLorentz::evaluate_for_q( boost::ref(q) );
}
@@ -59,11 +59,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorLorentz::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorLorentz::getNumberOfStochasticParameters( );
}
@@ -71,11 +71,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -83,11 +83,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -95,35 +95,35 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -131,11 +131,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -143,11 +143,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -155,11 +155,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->IFormFactor::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -167,11 +167,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -179,11 +179,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -191,11 +191,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -203,11 +203,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -215,11 +215,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -246,11 +246,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -258,11 +258,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -270,11 +270,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -359,8 +359,8 @@ void register_FormFactorLorentz_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorLorentz_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorLorentz_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorLorentz_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
index 20268561acd1ab05bc4e0573555c27aac0b8b4b0..9dd07799961c004bd570139edf3426fb31157f1c 100644
--- a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::FormFactorParallelepiped * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorParallelepiped::clone( );
+ }
}
-
::FormFactorParallelepiped * default_clone( ) const {
return FormFactorParallelepiped::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorParallelepiped::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorParallelepiped::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorParallelepiped::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorParallelepiped::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorParallelepiped::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorParallelepiped::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorParallelepiped::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorParallelepiped::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,11 +100,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -112,35 +112,35 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -160,11 +160,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -184,11 +184,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -196,11 +196,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -208,11 +208,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -239,11 +239,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -251,11 +251,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -373,8 +373,8 @@ void register_FormFactorParallelepiped_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorParallelepiped_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorParallelepiped_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorParallelepiped_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index 7344a006a550e713af3795888c6ef0ab692df703..11d345099711c63babb0c3577f1e6006e843f03a 100644
--- a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::FormFactorPrism3 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorPrism3::clone( );
+ }
}
-
::FormFactorPrism3 * default_clone( ) const {
return FormFactorPrism3::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorPrism3::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPrism3::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getHalfSide( ) const {
if( bp::override func_getHalfSide = this->get_override( "getHalfSide" ) )
return func_getHalfSide( );
- else
+ else{
return this->FormFactorPrism3::getHalfSide( );
+ }
}
-
double default_getHalfSide( ) const {
return FormFactorPrism3::getHalfSide( );
}
@@ -64,11 +64,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorPrism3::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorPrism3::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorPrism3::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPrism3::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setHalfSide( double half_side ) {
if( bp::override func_setHalfSide = this->get_override( "setHalfSide" ) )
func_setHalfSide( half_side );
- else
+ else{
this->FormFactorPrism3::setHalfSide( half_side );
+ }
}
-
void default_setHalfSide( double half_side ) {
FormFactorPrism3::setHalfSide( half_side );
}
@@ -100,11 +100,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorPrism3::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorPrism3::setHeight( height );
}
@@ -112,11 +112,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,35 +136,35 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -172,11 +172,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -184,11 +184,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -208,11 +208,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -220,11 +220,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -232,11 +232,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -244,11 +244,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -275,11 +275,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -287,11 +287,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -299,11 +299,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -433,8 +433,8 @@ void register_FormFactorPrism3_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorPrism3_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorPrism3_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorPrism3_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
index 23fa49d6c4467d4e8e3a72283745f74f39258308..56beb9799b362a14cb268272582e64a9c3c8b186 100644
--- a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::FormFactorPrism6 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorPrism6::clone( );
+ }
}
-
::FormFactorPrism6 * default_clone( ) const {
return FormFactorPrism6::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorPrism6::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPrism6::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorPrism6::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorPrism6::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorPrism6::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPrism6::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorPrism6::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorPrism6::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorPrism6::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorPrism6::setHeight( height );
}
@@ -100,11 +100,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else
+ else{
this->FormFactorPrism6::setRadius( radius );
+ }
}
-
void default_setRadius( double radius ) {
FormFactorPrism6::setRadius( radius );
}
@@ -112,11 +112,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,35 +136,35 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -172,11 +172,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -184,11 +184,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -208,11 +208,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -220,11 +220,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -232,11 +232,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -263,11 +263,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -275,11 +275,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -287,11 +287,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -421,8 +421,8 @@ void register_FormFactorPrism6_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorPrism6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorPrism6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorPrism6_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index db82e8d663c2afc6e668ce94f5ea67552ae52b1c..d7f7e69a726b9d63527038fb9bd345be95140246 100644
--- a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::FormFactorPyramid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorPyramid::clone( );
+ }
}
-
::FormFactorPyramid * default_clone( ) const {
return FormFactorPyramid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorPyramid::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPyramid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else
+ else{
return this->FormFactorPyramid::getAlpha( );
+ }
}
-
double default_getAlpha( ) const {
return FormFactorPyramid::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getHalfSide( ) const {
if( bp::override func_getHalfSide = this->get_override( "getHalfSide" ) )
return func_getHalfSide( );
- else
+ else{
return this->FormFactorPyramid::getHalfSide( );
+ }
}
-
double default_getHalfSide( ) const {
return FormFactorPyramid::getHalfSide( );
}
@@ -76,11 +76,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorPyramid::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorPyramid::getHeight( );
}
@@ -88,11 +88,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorPyramid::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPyramid::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else
+ else{
this->FormFactorPyramid::setAlpha( alpha );
+ }
}
-
void default_setAlpha( double alpha ) {
FormFactorPyramid::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setHalfSide( double half_side ) {
if( bp::override func_setHalfSide = this->get_override( "setHalfSide" ) )
func_setHalfSide( half_side );
- else
+ else{
this->FormFactorPyramid::setHalfSide( half_side );
+ }
}
-
void default_setHalfSide( double half_side ) {
FormFactorPyramid::setHalfSide( half_side );
}
@@ -124,11 +124,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorPyramid::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorPyramid::setHeight( height );
}
@@ -136,11 +136,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -148,11 +148,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -160,35 +160,35 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -196,11 +196,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -208,11 +208,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -220,11 +220,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -232,11 +232,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -244,11 +244,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -256,11 +256,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -268,11 +268,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -299,11 +299,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -311,11 +311,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -323,11 +323,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -480,8 +480,8 @@ void register_FormFactorPyramid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorPyramid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
index b2b8893a00b96f316859555fff3a056a7c9f4b65..5034f2e682dfd92250ffed4546ad046c52d3a03b 100644
--- a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::FormFactorSphere * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorSphere::clone( );
+ }
}
-
::FormFactorSphere * default_clone( ) const {
return FormFactorSphere::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorSphere::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorSphere::getHeight( );
}
@@ -52,11 +52,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorSphere::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphere::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,35 +88,35 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -124,11 +124,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -136,11 +136,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -160,11 +160,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -172,11 +172,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -184,11 +184,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -196,11 +196,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -227,11 +227,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -239,11 +239,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -251,11 +251,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -338,8 +338,8 @@ void register_FormFactorSphere_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorSphere_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index e3edc65106a17f047434b6f87edb19879a8398c7..71fab8c6f659420af5d876b26de34267b35d9111 100644
--- a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
@@ -28,35 +28,35 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::FormFactorSphereGaussianRadius * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorSphereGaussianRadius::clone( );
+ }
}
-
::FormFactorSphereGaussianRadius * default_clone( ) const {
return FormFactorSphereGaussianRadius::clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->FormFactorSphereGaussianRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
FormFactorSphereGaussianRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else
+ else{
return this->FormFactorSphereGaussianRadius::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSphereGaussianRadius::evaluate_for_q( boost::ref(q) );
}
@@ -64,11 +64,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorSphereGaussianRadius::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorSphereGaussianRadius::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->FormFactorSphereGaussianRadius::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return FormFactorSphereGaussianRadius::isDistributedFormFactor( );
}
@@ -100,11 +100,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -136,11 +136,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -160,11 +160,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -184,11 +184,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -196,11 +196,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -208,11 +208,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -239,11 +239,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -251,11 +251,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -294,8 +294,8 @@ void register_FormFactorSphereGaussianRadius_class(){
}
{ //::FormFactorSphereGaussianRadius::createDistributedFormFactors
- typedef void ( ::FormFactorSphereGaussianRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorSphereGaussianRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::FormFactorSphereGaussianRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorSphereGaussianRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorSphereGaussianRadius_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
index cb298c17261071e1fc6ba80361e9d491935e34b6..54f03ec9383a707ab1c91d44dee1d4cf8fb73d45 100644
--- a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
@@ -40,11 +40,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual ::HomogeneousMaterial * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->HomogeneousMaterial::clone( );
+ }
}
-
::HomogeneousMaterial * default_clone( ) const {
return HomogeneousMaterial::clone( );
}
@@ -52,11 +52,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual ::IMaterial const * createTransformedMaterial( ::Geometry::ITransform3D const & transform ) const {
if( bp::override func_createTransformedMaterial = this->get_override( "createTransformedMaterial" ) )
return func_createTransformedMaterial( boost::ref(transform) );
- else
+ else{
return this->HomogeneousMaterial::createTransformedMaterial( boost::ref(transform) );
+ }
}
-
::IMaterial const * default_createTransformedMaterial( ::Geometry::ITransform3D const & transform ) const {
return HomogeneousMaterial::createTransformedMaterial( boost::ref(transform) );
}
@@ -64,11 +64,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else
+ else{
return this->HomogeneousMaterial::getRefractiveIndex( );
+ }
}
-
::complex_t default_getRefractiveIndex( ) const {
return HomogeneousMaterial::getRefractiveIndex( );
}
@@ -76,11 +76,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual bool isScalarMaterial( ) const {
if( bp::override func_isScalarMaterial = this->get_override( "isScalarMaterial" ) )
return func_isScalarMaterial( );
- else
+ else{
return this->IMaterial::isScalarMaterial( );
+ }
}
-
bool default_isScalarMaterial( ) const {
return IMaterial::isScalarMaterial( );
}
diff --git a/Core/PythonAPI/src/IAxis.pypp.cpp b/Core/PythonAPI/src/IAxis.pypp.cpp
index 9c689bebe60a4d93f9e856aaab898a9a45e5c2d3..a6c9c35dcd98aa69f39a992fe63304b54e7adf7c 100644
--- a/Core/PythonAPI/src/IAxis.pypp.cpp
+++ b/Core/PythonAPI/src/IAxis.pypp.cpp
@@ -33,12 +33,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return func_createDoubleBinSize( );
}
- virtual ::std::size_t findClosestIndex( double value ) const {
+ virtual ::size_t findClosestIndex( double value ) const {
bp::override func_findClosestIndex = this->get_override( "findClosestIndex" );
return func_findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::std::size_t index ) const {
+ virtual ::Bin1D getBin( ::size_t index ) const {
bp::override func_getBin = this->get_override( "getBin" );
return func_getBin( index );
}
@@ -53,12 +53,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return func_getMin( );
}
- virtual ::std::size_t getSize( ) const {
+ virtual ::size_t getSize( ) const {
bp::override func_getSize = this->get_override( "getSize" );
return func_getSize( );
}
- virtual double operator[]( ::std::size_t index ) const {
+ virtual double operator[]( ::size_t index ) const {
bp::override func___getitem__ = this->get_override( "__getitem__" );
return func___getitem__( index );
}
@@ -93,7 +93,7 @@ void register_IAxis_class(){
}
{ //::IAxis::findClosestIndex
- typedef ::std::size_t ( ::IAxis::*findClosestIndex_function_type )( double ) const;
+ typedef ::size_t ( ::IAxis::*findClosestIndex_function_type )( double ) const;
IAxis_exposer.def(
"findClosestIndex"
@@ -103,7 +103,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getBin
- typedef ::Bin1D ( ::IAxis::*getBin_function_type )( ::std::size_t ) const;
+ typedef ::Bin1D ( ::IAxis::*getBin_function_type )( ::size_t ) const;
IAxis_exposer.def(
"getBin"
@@ -140,7 +140,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getSize
- typedef ::std::size_t ( ::IAxis::*getSize_function_type )( ) const;
+ typedef ::size_t ( ::IAxis::*getSize_function_type )( ) const;
IAxis_exposer.def(
"getSize"
@@ -149,7 +149,7 @@ void register_IAxis_class(){
}
{ //::IAxis::operator[]
- typedef double ( ::IAxis::*__getitem___function_type )( ::std::size_t ) const;
+ typedef double ( ::IAxis::*__getitem___function_type )( ::size_t ) const;
IAxis_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
index dbd80633145ffbf03b3ed3ab1ee3940d641779d8..b6e7f8453f9f59fd8fee7511ce6f1573fe598920 100644
--- a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
+++ b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
@@ -28,11 +28,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::IClusteredParticles * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->IClusteredParticles::clone( );
+ }
}
-
::IClusteredParticles * default_clone( ) const {
return IClusteredParticles::clone( );
}
@@ -40,11 +40,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::IClusteredParticles * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->IClusteredParticles::cloneInvertB( );
+ }
}
-
::IClusteredParticles * default_cloneInvertB( ) const {
return IClusteredParticles::cloneInvertB( );
}
@@ -52,11 +52,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::Geometry::ITransform3D const * getTransform( ) const {
if( bp::override func_getTransform = this->get_override( "getTransform" ) )
return func_getTransform( );
- else
+ else{
return this->IClusteredParticles::getTransform( );
+ }
}
-
::Geometry::ITransform3D const * default_getTransform( ) const {
return IClusteredParticles::getTransform( );
}
@@ -69,11 +69,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void setTransform( ::Geometry::ITransform3D const & transform ) {
if( bp::override func_setTransform = this->get_override( "setTransform" ) )
func_setTransform( boost::ref(transform) );
- else
+ else{
this->IClusteredParticles::setTransform( boost::ref(transform) );
+ }
}
-
void default_setTransform( ::Geometry::ITransform3D const & transform ) {
IClusteredParticles::setTransform( boost::ref(transform) );
}
@@ -86,11 +86,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -98,11 +98,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -110,11 +110,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -122,11 +122,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -134,11 +134,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -146,11 +146,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -158,11 +158,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -189,11 +189,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -201,11 +201,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -213,24 +213,24 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -437,8 +437,8 @@ void register_IClusteredParticles_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( IClusteredParticles_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( IClusteredParticles_wrapper::*default_size_function_type )( ) const;
IClusteredParticles_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ICompositeSample.pypp.cpp b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
index 10f89768880888ddbc755621b4b9b3d0d9aafbc7..70d43404e707e156023ce59f176f3ada11884b81 100644
--- a/Core/PythonAPI/src/ICompositeSample.pypp.cpp
+++ b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
@@ -33,11 +33,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -45,24 +45,24 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -74,11 +74,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -86,11 +86,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -98,11 +98,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -110,11 +110,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -122,11 +122,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -134,11 +134,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -165,11 +165,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -177,11 +177,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -189,11 +189,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -278,8 +278,8 @@ void register_ICompositeSample_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( ICompositeSample_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( ICompositeSample_wrapper::*default_size_function_type )( ) const;
ICompositeSample_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IDecoration.pypp.cpp b/Core/PythonAPI/src/IDecoration.pypp.cpp
index 4cbc743d39b703660f81b897c0f55d561a2bce23..daa1dbac686a3e9852d83277b33b5c97ce4074c3 100644
--- a/Core/PythonAPI/src/IDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/IDecoration.pypp.cpp
@@ -35,7 +35,7 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
return func_cloneInvertB( );
}
- virtual double getAbundanceFractionOfParticle( ::std::size_t index ) const {
+ virtual double getAbundanceFractionOfParticle( ::size_t index ) const {
bp::override func_getAbundanceFractionOfParticle = this->get_override( "getAbundanceFractionOfParticle" );
return func_getAbundanceFractionOfParticle( index );
}
@@ -45,24 +45,24 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
return func_getInterferenceFunctions( );
}
- virtual ::std::size_t getNumberOfInterferenceFunctions( ) const {
+ virtual ::size_t getNumberOfInterferenceFunctions( ) const {
if( bp::override func_getNumberOfInterferenceFunctions = this->get_override( "getNumberOfInterferenceFunctions" ) )
return func_getNumberOfInterferenceFunctions( );
- else
+ else{
return this->IDecoration::getNumberOfInterferenceFunctions( );
+ }
}
-
- ::std::size_t default_getNumberOfInterferenceFunctions( ) const {
+ ::size_t default_getNumberOfInterferenceFunctions( ) const {
return IDecoration::getNumberOfInterferenceFunctions( );
}
- virtual ::std::size_t getNumberOfParticles( ) const {
+ virtual ::size_t getNumberOfParticles( ) const {
bp::override func_getNumberOfParticles = this->get_override( "getNumberOfParticles" );
return func_getNumberOfParticles( );
}
- virtual ::ParticleInfo const * getParticleInfo( ::std::size_t index ) const {
+ virtual ::ParticleInfo const * getParticleInfo( ::size_t index ) const {
bp::override func_getParticleInfo = this->get_override( "getParticleInfo" );
return func_getParticleInfo( index );
}
@@ -75,11 +75,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -87,11 +87,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -99,11 +99,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -111,11 +111,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -123,11 +123,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -135,11 +135,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -147,11 +147,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -178,11 +178,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -190,11 +190,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -202,24 +202,24 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -253,7 +253,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getAbundanceFractionOfParticle
- typedef double ( ::IDecoration::*getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
+ typedef double ( ::IDecoration::*getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
IDecoration_exposer.def(
"getAbundanceFractionOfParticle"
@@ -272,8 +272,8 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getNumberOfInterferenceFunctions
- typedef ::std::size_t ( ::IDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
- typedef ::std::size_t ( IDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::size_t ( ::IDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::size_t ( IDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
IDecoration_exposer.def(
"getNumberOfInterferenceFunctions"
@@ -283,7 +283,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getNumberOfParticles
- typedef ::std::size_t ( ::IDecoration::*getNumberOfParticles_function_type )( ) const;
+ typedef ::size_t ( ::IDecoration::*getNumberOfParticles_function_type )( ) const;
IDecoration_exposer.def(
"getNumberOfParticles"
@@ -292,7 +292,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getParticleInfo
- typedef ::ParticleInfo const * ( ::IDecoration::*getParticleInfo_function_type )( ::std::size_t ) const;
+ typedef ::ParticleInfo const * ( ::IDecoration::*getParticleInfo_function_type )( ::size_t ) const;
IDecoration_exposer.def(
"getParticleInfo"
@@ -457,8 +457,8 @@ void register_IDecoration_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( IDecoration_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( IDecoration_wrapper::*default_size_function_type )( ) const;
IDecoration_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
index 3cf199b2353950e447bcd111c2f8a5b262ad5971..2ac71b82b8d091acd0a28ae5f861d1682740b439 100644
--- a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
+++ b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
@@ -38,11 +38,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -50,11 +50,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -62,11 +62,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -74,11 +74,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -105,11 +105,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -117,11 +117,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -129,11 +129,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
index 7fcb99d2deaa83f5bb03cea68f4e6cc1d667a25a..c68a3fc4d6580807b7773a6ccf7386f21dd671b5 100644
--- a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
+++ b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
@@ -18,8 +18,8 @@ namespace bp = boost::python;
struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistribution2D > {
- IFTDistribution2D_wrapper(double omega_x, double omega_y )
- : IFTDistribution2D( omega_x, omega_y )
+ IFTDistribution2D_wrapper(double coherence_length_x, double coherence_length_y )
+ : IFTDistribution2D( coherence_length_x, coherence_length_y )
, bp::wrapper< IFTDistribution2D >(){
// constructor
@@ -35,19 +35,14 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
return func_evaluate( qx, qy );
}
- virtual void transformToStarBasis( double qX, double qY, double alpha, double a, double b, double & qa, double & qb ) const {
- bp::override func_transformToStarBasis = this->get_override( "transformToStarBasis" );
- func_transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
- }
-
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -55,11 +50,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -67,11 +62,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -79,11 +74,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -110,11 +105,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -122,11 +117,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -134,11 +129,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -149,7 +144,7 @@ void register_IFTDistribution2D_class(){
{ //::IFTDistribution2D
typedef bp::class_< IFTDistribution2D_wrapper, bp::bases< IParameterized >, boost::noncopyable > IFTDistribution2D_exposer_t;
- IFTDistribution2D_exposer_t IFTDistribution2D_exposer = IFTDistribution2D_exposer_t( "IFTDistribution2D", bp::init< double, double >(( bp::arg("omega_x"), bp::arg("omega_y") )) );
+ IFTDistribution2D_exposer_t IFTDistribution2D_exposer = IFTDistribution2D_exposer_t( "IFTDistribution2D", bp::init< double, double >(( bp::arg("coherence_length_x"), bp::arg("coherence_length_y") )) );
bp::scope IFTDistribution2D_scope( IFTDistribution2D_exposer );
{ //::IFTDistribution2D::clone
@@ -205,7 +200,7 @@ void register_IFTDistribution2D_class(){
IFTDistribution2D_exposer.def(
"transformToStarBasis"
- , bp::pure_virtual( transformToStarBasis_function_type(&::IFTDistribution2D::transformToStarBasis) )
+ , transformToStarBasis_function_type( &::IFTDistribution2D::transformToStarBasis )
, ( bp::arg("qX"), bp::arg("qY"), bp::arg("alpha"), bp::arg("a"), bp::arg("b"), bp::arg("qa"), bp::arg("qb") ) );
}
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index 47eb2f5e9677080390dd7461980ae652c7b67550..582ff582f9083260d7ac7dc6e323f97677c3a768 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -30,15 +30,15 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
return func_clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
@@ -50,11 +50,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->IFormFactor::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -62,11 +62,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->IFormFactor::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -74,11 +74,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -86,11 +86,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactor::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactor::getVolume( );
}
@@ -98,11 +98,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -110,11 +110,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -122,11 +122,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -134,11 +134,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -146,11 +146,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -158,11 +158,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -170,11 +170,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -182,11 +182,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -213,11 +213,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -225,11 +225,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -237,11 +237,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -266,8 +266,8 @@ void register_IFormFactor_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( IFormFactor_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( IFormFactor_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
IFormFactor_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index fc3c5fce9ad3ab1c3717436434395be8c33822d4..401068a3c4b4d1dd6457856b751a1f802021fc44 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -33,11 +33,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
- else
+ else{
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ }
}
-
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
}
@@ -50,11 +50,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorBorn::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -62,11 +62,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -74,11 +74,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -86,35 +86,35 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -122,11 +122,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -134,11 +134,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->IFormFactor::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -146,11 +146,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->IFormFactor::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -158,11 +158,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -170,11 +170,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -182,11 +182,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -194,11 +194,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -225,11 +225,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -237,11 +237,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -249,11 +249,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -345,8 +345,8 @@ void register_IFormFactorBorn_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( IFormFactorBorn_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( IFormFactorBorn_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
IFormFactorBorn_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
index 29b0fd2305d7847208f4118f3b7a86a6f4bad961..8285eadec4f19d3791ca2e84f5b1cceaa2a65d4b 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -26,11 +26,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->IFormFactorDecorator::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return IFormFactorDecorator::getHeight( );
}
@@ -38,11 +38,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->IFormFactorDecorator::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactorDecorator::getRadius( );
}
@@ -50,11 +50,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else
+ else{
return this->IFormFactorDecorator::getVolume( );
+ }
}
-
double default_getVolume( ) const {
return IFormFactorDecorator::getVolume( );
}
@@ -62,11 +62,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -74,11 +74,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -86,35 +86,35 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else
+ else{
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
+ }
}
-
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -127,11 +127,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -139,11 +139,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->IFormFactor::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -151,11 +151,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->IFormFactor::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -163,11 +163,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -175,11 +175,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -206,11 +206,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -218,11 +218,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -230,11 +230,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -326,8 +326,8 @@ void register_IFormFactorDecorator_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( IFormFactorDecorator_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( IFormFactorDecorator_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
IFormFactorDecorator_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
index 629e437f138d8cbf5aa6dfe3161a65006c2ba55d..0d33b05e0da1d736c2423cb0c8482e3dcf8c9bbe 100644
--- a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
+++ b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
@@ -38,11 +38,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else
+ else{
return this->IInterferenceFunction::getKappa( );
+ }
}
-
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -50,11 +50,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -62,11 +62,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -74,11 +74,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -86,11 +86,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -98,11 +98,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -110,11 +110,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -122,11 +122,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -153,11 +153,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -165,11 +165,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -177,11 +177,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IMaterial.pypp.cpp b/Core/PythonAPI/src/IMaterial.pypp.cpp
index 3585f441333c7a69c5e0b8582480abb706347554..06ef528bf18110412ed581e97ba85e52d2a18d50 100644
--- a/Core/PythonAPI/src/IMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/IMaterial.pypp.cpp
@@ -33,11 +33,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual ::IMaterial * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->IMaterial::clone( );
+ }
}
-
::IMaterial * default_clone( ) const {
return IMaterial::clone( );
}
@@ -45,11 +45,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual ::IMaterial const * createTransformedMaterial( ::Geometry::ITransform3D const & transform ) const {
if( bp::override func_createTransformedMaterial = this->get_override( "createTransformedMaterial" ) )
return func_createTransformedMaterial( boost::ref(transform) );
- else
+ else{
return this->IMaterial::createTransformedMaterial( boost::ref(transform) );
+ }
}
-
::IMaterial const * default_createTransformedMaterial( ::Geometry::ITransform3D const & transform ) const {
return IMaterial::createTransformedMaterial( boost::ref(transform) );
}
@@ -57,11 +57,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else
+ else{
return this->IMaterial::getRefractiveIndex( );
+ }
}
-
::complex_t default_getRefractiveIndex( ) const {
return IMaterial::getRefractiveIndex( );
}
@@ -69,11 +69,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual bool isScalarMaterial( ) const {
if( bp::override func_isScalarMaterial = this->get_override( "isScalarMaterial" ) )
return func_isScalarMaterial( );
- else
+ else{
return this->IMaterial::isScalarMaterial( );
+ }
}
-
bool default_isScalarMaterial( ) const {
return IMaterial::isScalarMaterial( );
}
diff --git a/Core/PythonAPI/src/IObservable.pypp.cpp b/Core/PythonAPI/src/IObservable.pypp.cpp
index c73a23d0bf6708f67b04bfc30d66b984ecb5fd0c..6e3f06ed514410bbb627cc7662aae9e981e84ec4 100644
--- a/Core/PythonAPI/src/IObservable.pypp.cpp
+++ b/Core/PythonAPI/src/IObservable.pypp.cpp
@@ -33,11 +33,11 @@ struct IObservable_wrapper : IObservable, bp::wrapper< IObservable > {
virtual void attachObserver( ::boost::shared_ptr< IObserver > obj ) {
if( bp::override func_attachObserver = this->get_override( "attachObserver" ) )
func_attachObserver( obj );
- else
+ else{
this->IObservable::attachObserver( obj );
+ }
}
-
void default_attachObserver( ::boost::shared_ptr< IObserver > obj ) {
IObservable::attachObserver( obj );
}
@@ -45,11 +45,11 @@ struct IObservable_wrapper : IObservable, bp::wrapper< IObservable > {
virtual void notifyObservers( ) {
if( bp::override func_notifyObservers = this->get_override( "notifyObservers" ) )
func_notifyObservers( );
- else
+ else{
this->IObservable::notifyObservers( );
+ }
}
-
void default_notifyObservers( ) {
IObservable::notifyObservers( );
}
diff --git a/Core/PythonAPI/src/IObserver.pypp.cpp b/Core/PythonAPI/src/IObserver.pypp.cpp
index 9d93fda86f32c812006aa5454c63b36241843e57..04ac2919e58459d79daaa149dec2b099ee23ac18 100644
--- a/Core/PythonAPI/src/IObserver.pypp.cpp
+++ b/Core/PythonAPI/src/IObserver.pypp.cpp
@@ -33,11 +33,11 @@ struct IObserver_wrapper : IObserver, bp::wrapper< IObserver > {
virtual void update( ::IObservable * arg0 ) {
if( bp::override func_update = this->get_override( "update" ) )
func_update( boost::python::ptr(arg0) );
- else
+ else{
this->IObserver::update( boost::python::ptr(arg0) );
+ }
}
-
void default_update( ::IObservable * arg0 ) {
IObserver::update( boost::python::ptr(arg0) );
}
diff --git a/Core/PythonAPI/src/IParameterized.pypp.cpp b/Core/PythonAPI/src/IParameterized.pypp.cpp
index 337d9ae2451e0446157a1d34a2c3b8f4fec8302a..a877d62ddc8a79a787310eb88b336f103cd0fc39 100644
--- a/Core/PythonAPI/src/IParameterized.pypp.cpp
+++ b/Core/PythonAPI/src/IParameterized.pypp.cpp
@@ -42,11 +42,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -54,11 +54,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -66,11 +66,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -78,11 +78,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -109,11 +109,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -121,11 +121,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -133,11 +133,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
index a3291d70e3e0b7ae6ce3e98de25f854a43894833..6fb03f15fa94c212e0cb39ff67a23b9a1f2df6d3 100644
--- a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
+++ b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
@@ -38,11 +38,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -50,11 +50,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -62,11 +62,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -74,11 +74,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -105,11 +105,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -117,11 +117,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -129,11 +129,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ISample.pypp.cpp b/Core/PythonAPI/src/ISample.pypp.cpp
index d6893b23933d57512a1db7d2b9583656b33c7007..49e71dd8e14a86538511b365019ca7185e4883c1 100644
--- a/Core/PythonAPI/src/ISample.pypp.cpp
+++ b/Core/PythonAPI/src/ISample.pypp.cpp
@@ -33,11 +33,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ISample * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->ISample::clone( );
+ }
}
-
::ISample * default_clone( ) const {
return ISample::clone( );
}
@@ -45,11 +45,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -57,11 +57,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -69,11 +69,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -81,11 +81,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -93,11 +93,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -105,11 +105,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -117,11 +117,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -148,11 +148,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -160,11 +160,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -172,11 +172,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
index e6773ad2d71b848c73ad1d341ca69beae4c8edd3..324cda2a65e75b670f60703f702560a5b3588d02 100644
--- a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
+++ b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
@@ -35,11 +35,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual ::ISample * buildSample( ) const {
if( bp::override func_buildSample = this->get_override( "buildSample" ) )
return func_buildSample( );
- else
+ else{
return this->ISampleBuilder::buildSample( );
+ }
}
-
::ISample * default_buildSample( ) const {
return ISampleBuilder::buildSample( );
}
@@ -47,11 +47,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -83,11 +83,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -114,11 +114,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -126,11 +126,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -138,11 +138,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ITransform3D.pypp.cpp b/Core/PythonAPI/src/ITransform3D.pypp.cpp
index facf344322d8c1d3cecdc6458b54e4785564c39a..f500e0d020698ebca3098edb5465eb690e8cd7ef 100644
--- a/Core/PythonAPI/src/ITransform3D.pypp.cpp
+++ b/Core/PythonAPI/src/ITransform3D.pypp.cpp
@@ -33,11 +33,11 @@ struct ITransform3D_wrapper : Geometry::ITransform3D, bp::wrapper< Geometry::ITr
virtual ::Geometry::ITransform3D * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->Geometry::ITransform3D::clone( );
+ }
}
-
::Geometry::ITransform3D * default_clone( ) const {
return Geometry::ITransform3D::clone( );
}
@@ -45,11 +45,11 @@ struct ITransform3D_wrapper : Geometry::ITransform3D, bp::wrapper< Geometry::ITr
virtual void print( ::std::ostream & ostr ) const {
if( bp::override func_print = this->get_override( "print" ) )
func_print( boost::ref(ostr) );
- else
+ else{
this->Geometry::ITransform3D::print( boost::ref(ostr) );
+ }
}
-
void default_print( ::std::ostream & ostr ) const {
Geometry::ITransform3D::print( boost::ref(ostr) );
}
diff --git a/Core/PythonAPI/src/Instrument.pypp.cpp b/Core/PythonAPI/src/Instrument.pypp.cpp
index 8fb80ac1b2d5bf6f3328c8b3a4a8a1e453aebdac..f39802358545385a9cf76252d24b10400a573c0d 100644
--- a/Core/PythonAPI/src/Instrument.pypp.cpp
+++ b/Core/PythonAPI/src/Instrument.pypp.cpp
@@ -35,11 +35,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -114,11 +114,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -126,11 +126,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -164,7 +164,7 @@ void register_Instrument_class(){
}
{ //::Instrument::getDetectorAxis
- typedef ::IAxis const & ( ::Instrument::*getDetectorAxis_function_type )( ::std::size_t ) const;
+ typedef ::IAxis const & ( ::Instrument::*getDetectorAxis_function_type )( ::size_t ) const;
Instrument_exposer.def(
"getDetectorAxis"
@@ -175,7 +175,7 @@ void register_Instrument_class(){
}
{ //::Instrument::getDetectorDimension
- typedef ::std::size_t ( ::Instrument::*getDetectorDimension_function_type )( ) const;
+ typedef ::size_t ( ::Instrument::*getDetectorDimension_function_type )( ) const;
Instrument_exposer.def(
"getDetectorDimension"
@@ -233,7 +233,7 @@ void register_Instrument_class(){
}
{ //::Instrument::setDetectorParameters
- typedef void ( ::Instrument::*setDetectorParameters_function_type )( ::std::size_t,double,double,::std::size_t,double,double,bool ) ;
+ typedef void ( ::Instrument::*setDetectorParameters_function_type )( ::size_t,double,double,::size_t,double,double,bool ) ;
Instrument_exposer.def(
"setDetectorParameters"
diff --git a/Core/PythonAPI/src/IntensityData.pypp.cpp b/Core/PythonAPI/src/IntensityData.pypp.cpp
index 55ba4ac878ef958f57f97341661d4e9ac8ef5717..a4764e19baa7e85e942818834665a55839a3b2bd 100644
--- a/Core/PythonAPI/src/IntensityData.pypp.cpp
+++ b/Core/PythonAPI/src/IntensityData.pypp.cpp
@@ -34,7 +34,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::addAxis
typedef OutputData< double > exported_class_t;
- typedef void ( exported_class_t::*addAxis_function_type )( ::std::string const &,::std::size_t,double,double ) ;
+ typedef void ( exported_class_t::*addAxis_function_type )( ::std::string const &,::size_t,double,double ) ;
IntensityData_exposer.def(
"addAxis"
@@ -87,7 +87,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getAllocatedSize
typedef OutputData< double > exported_class_t;
- typedef ::std::size_t ( exported_class_t::*getAllocatedSize_function_type )( ) const;
+ typedef ::size_t ( exported_class_t::*getAllocatedSize_function_type )( ) const;
IntensityData_exposer.def(
"getAllocatedSize"
@@ -107,7 +107,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getAxis
typedef OutputData< double > exported_class_t;
- typedef ::IAxis const * ( exported_class_t::*getAxis_function_type )( ::std::size_t ) const;
+ typedef ::IAxis const * ( exported_class_t::*getAxis_function_type )( ::size_t ) const;
IntensityData_exposer.def(
"getAxis"
@@ -131,7 +131,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getAxisIndex
typedef OutputData< double > exported_class_t;
- typedef ::std::size_t ( exported_class_t::*getAxisIndex_function_type )( ::std::string const & ) const;
+ typedef ::size_t ( exported_class_t::*getAxisIndex_function_type )( ::std::string const & ) const;
IntensityData_exposer.def(
"getAxisIndex"
@@ -142,7 +142,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getIndexOfAxis
typedef OutputData< double > exported_class_t;
- typedef ::std::size_t ( exported_class_t::*getIndexOfAxis_function_type )( ::std::string const &,::std::size_t ) const;
+ typedef ::size_t ( exported_class_t::*getIndexOfAxis_function_type )( ::std::string const &,::size_t ) const;
IntensityData_exposer.def(
"getIndexOfAxis"
@@ -153,7 +153,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getRank
typedef OutputData< double > exported_class_t;
- typedef ::std::size_t ( exported_class_t::*getRank_function_type )( ) const;
+ typedef ::size_t ( exported_class_t::*getRank_function_type )( ) const;
IntensityData_exposer.def(
"getRank"
@@ -173,7 +173,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::getValueOfAxis
typedef OutputData< double > exported_class_t;
- typedef double ( exported_class_t::*getValueOfAxis_function_type )( ::std::string const &,::std::size_t ) const;
+ typedef double ( exported_class_t::*getValueOfAxis_function_type )( ::std::string const &,::size_t ) const;
IntensityData_exposer.def(
"getValueOfAxis"
@@ -210,7 +210,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::operator[]
typedef OutputData< double > exported_class_t;
- typedef double & ( exported_class_t::*__getitem___function_type )( ::std::size_t ) ;
+ typedef double & ( exported_class_t::*__getitem___function_type )( ::size_t ) ;
IntensityData_exposer.def(
"__getitem__"
@@ -222,7 +222,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::operator[]
typedef OutputData< double > exported_class_t;
- typedef double const & ( exported_class_t::*__getitem___function_type )( ::std::size_t ) const;
+ typedef double const & ( exported_class_t::*__getitem___function_type )( ::size_t ) const;
IntensityData_exposer.def(
"__getitem__"
@@ -277,7 +277,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::toCoordinate
typedef OutputData< double > exported_class_t;
- typedef int ( exported_class_t::*toCoordinate_function_type )( ::std::size_t,::std::size_t ) const;
+ typedef int ( exported_class_t::*toCoordinate_function_type )( ::size_t,::size_t ) const;
IntensityData_exposer.def(
"toCoordinate"
@@ -288,7 +288,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::toCoordinates
typedef OutputData< double > exported_class_t;
- typedef ::std::vector< int > ( exported_class_t::*toCoordinates_function_type )( ::std::size_t ) const;
+ typedef ::std::vector< int > ( exported_class_t::*toCoordinates_function_type )( ::size_t ) const;
IntensityData_exposer.def(
"toCoordinates"
@@ -299,7 +299,7 @@ void register_IntensityData_class(){
{ //::OutputData< double >::toIndex
typedef OutputData< double > exported_class_t;
- typedef ::std::size_t ( exported_class_t::*toIndex_function_type )( ::std::vector< int > ) const;
+ typedef ::size_t ( exported_class_t::*toIndex_function_type )( ::std::vector< int > ) const;
IntensityData_exposer.def(
"toIndex"
diff --git a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
index 6db34fb10b29bbb053547674be4b8188bc59f68b..5353eeed314f623ab4b4bc98da03094630222540 100644
--- a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::InterferenceFunction1DParaCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->InterferenceFunction1DParaCrystal::clone( );
+ }
}
-
::InterferenceFunction1DParaCrystal * default_clone( ) const {
return InterferenceFunction1DParaCrystal::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else
+ else{
return this->InterferenceFunction1DParaCrystal::evaluate( boost::ref(q) );
+ }
}
-
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction1DParaCrystal::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else
+ else{
return this->InterferenceFunction1DParaCrystal::getKappa( );
+ }
}
-
double default_getKappa( ) const {
return InterferenceFunction1DParaCrystal::getKappa( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -179,11 +179,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -191,11 +191,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
index bb22c253926c675f269f7f8320d4ddc4cf095c40..343d5b225e3d99e346dbb1556232655aa82f648b 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::InterferenceFunction2DLattice * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->InterferenceFunction2DLattice::clone( );
+ }
}
-
::InterferenceFunction2DLattice * default_clone( ) const {
return InterferenceFunction2DLattice::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else
+ else{
return this->InterferenceFunction2DLattice::evaluate( boost::ref(q) );
+ }
}
-
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DLattice::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else
+ else{
return this->IInterferenceFunction::getKappa( );
+ }
}
-
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -179,11 +179,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -191,11 +191,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
index 00e15bd8f140e84b2444589480eeb16a37908e66..15f0c4497fba2cdce37b28dac1e307a34cd4d00e 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::InterferenceFunction2DParaCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->InterferenceFunction2DParaCrystal::clone( );
+ }
}
-
::InterferenceFunction2DParaCrystal * default_clone( ) const {
return InterferenceFunction2DParaCrystal::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else
+ else{
return this->InterferenceFunction2DParaCrystal::evaluate( boost::ref(q) );
+ }
}
-
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DParaCrystal::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else
+ else{
return this->IInterferenceFunction::getKappa( );
+ }
}
-
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -179,11 +179,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -191,11 +191,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
index eca6fc43a2ffc4c6635a1e1673c2fc9d31925da6..81d2515145fabc0e977f7085b89778ef714b6643 100644
--- a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::InterferenceFunctionNone * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->InterferenceFunctionNone::clone( );
+ }
}
-
::InterferenceFunctionNone * default_clone( ) const {
return InterferenceFunctionNone::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else
+ else{
return this->InterferenceFunctionNone::evaluate( boost::ref(q) );
+ }
}
-
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunctionNone::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else
+ else{
return this->IInterferenceFunction::getKappa( );
+ }
}
-
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -179,11 +179,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -191,11 +191,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/LatticeBasis.pypp.cpp b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
index cd465f513cd41b6d1e5b7c046cc21c767c13f756..64d479802fb22d424a716e64bdb739aa15850dc9 100644
--- a/Core/PythonAPI/src/LatticeBasis.pypp.cpp
+++ b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
@@ -28,11 +28,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -40,11 +40,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -52,11 +52,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -64,11 +64,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -76,11 +76,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -88,11 +88,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else
+ else{
return this->Particle::getMaterial( );
+ }
}
-
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -100,11 +100,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else
+ else{
return this->Particle::getRefractiveIndex( );
+ }
}
-
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -112,11 +112,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::IFormFactor const * getSimpleFormFactor( ) const {
if( bp::override func_getSimpleFormFactor = this->get_override( "getSimpleFormFactor" ) )
return func_getSimpleFormFactor( );
- else
+ else{
return this->Particle::getSimpleFormFactor( );
+ }
}
-
::IFormFactor const * default_getSimpleFormFactor( ) const {
return Particle::getSimpleFormFactor( );
}
@@ -124,11 +124,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else
+ else{
return this->Particle::hasDistributedFormFactor( );
+ }
}
-
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -136,11 +136,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -148,11 +148,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -179,11 +179,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -191,11 +191,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,24 +203,24 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -415,8 +415,8 @@ void register_LatticeBasis_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( LatticeBasis_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( LatticeBasis_wrapper::*default_size_function_type )( ) const;
LatticeBasis_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Layer.pypp.cpp b/Core/PythonAPI/src/Layer.pypp.cpp
index f7cdcb34595f6b50c8d65843c3e9e30a94548151..6225471bb4d8c851ef11c87042780d6eb4655c8c 100644
--- a/Core/PythonAPI/src/Layer.pypp.cpp
+++ b/Core/PythonAPI/src/Layer.pypp.cpp
@@ -49,11 +49,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::Layer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->Layer::clone( );
+ }
}
-
::Layer * default_clone( ) const {
return Layer::clone( );
}
@@ -61,11 +61,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::Layer * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->Layer::cloneInvertB( );
+ }
}
-
::Layer * default_cloneInvertB( ) const {
return Layer::cloneInvertB( );
}
@@ -73,11 +73,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::IDecoration const * getDecoration( ) const {
if( bp::override func_getDecoration = this->get_override( "getDecoration" ) )
return func_getDecoration( );
- else
+ else{
return this->Layer::getDecoration( );
+ }
}
-
::IDecoration const * default_getDecoration( ) const {
return Layer::getDecoration( );
}
@@ -85,11 +85,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else
+ else{
return this->Layer::getMaterial( );
+ }
}
-
::IMaterial const * default_getMaterial( ) const {
return Layer::getMaterial( );
}
@@ -97,11 +97,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else
+ else{
return this->Layer::getRefractiveIndex( );
+ }
}
-
::complex_t default_getRefractiveIndex( ) const {
return Layer::getRefractiveIndex( );
}
@@ -109,11 +109,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual double getThickness( ) const {
if( bp::override func_getThickness = this->get_override( "getThickness" ) )
return func_getThickness( );
- else
+ else{
return this->Layer::getThickness( );
+ }
}
-
double default_getThickness( ) const {
return Layer::getThickness( );
}
@@ -121,11 +121,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual double getTotalParticleSurfaceDensity( ) const {
if( bp::override func_getTotalParticleSurfaceDensity = this->get_override( "getTotalParticleSurfaceDensity" ) )
return func_getTotalParticleSurfaceDensity( );
- else
+ else{
return this->Layer::getTotalParticleSurfaceDensity( );
+ }
}
-
double default_getTotalParticleSurfaceDensity( ) const {
return Layer::getTotalParticleSurfaceDensity( );
}
@@ -133,11 +133,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setDecoration( ::IDecoration const & decoration ) {
if( bp::override func_setDecoration = this->get_override( "setDecoration" ) )
func_setDecoration( boost::ref(decoration) );
- else
+ else{
this->Layer::setDecoration( boost::ref(decoration) );
+ }
}
-
void default_setDecoration( ::IDecoration const & decoration ) {
Layer::setDecoration( boost::ref(decoration) );
}
@@ -145,11 +145,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setMaterial( ::IMaterial const * material ) {
if( bp::override func_setMaterial = this->get_override( "setMaterial" ) )
func_setMaterial( boost::python::ptr(material) );
- else
+ else{
this->Layer::setMaterial( boost::python::ptr(material) );
+ }
}
-
void default_setMaterial( ::IMaterial const * material ) {
Layer::setMaterial( boost::python::ptr(material) );
}
@@ -157,11 +157,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setMaterial( ::IMaterial const * material, double thickness ) {
if( bp::override func_setMaterial = this->get_override( "setMaterial" ) )
func_setMaterial( boost::python::ptr(material), thickness );
- else
+ else{
this->Layer::setMaterial( boost::python::ptr(material), thickness );
+ }
}
-
void default_setMaterial( ::IMaterial const * material, double thickness ) {
Layer::setMaterial( boost::python::ptr(material), thickness );
}
@@ -169,11 +169,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setThickness( double thickness ) {
if( bp::override func_setThickness = this->get_override( "setThickness" ) )
func_setThickness( thickness );
- else
+ else{
this->Layer::setThickness( thickness );
+ }
}
-
void default_setThickness( double thickness ) {
Layer::setThickness( thickness );
}
@@ -181,11 +181,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -193,11 +193,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -205,11 +205,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -217,11 +217,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -229,11 +229,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -241,11 +241,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -253,11 +253,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -284,11 +284,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -296,11 +296,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -308,24 +308,24 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -596,8 +596,8 @@ void register_Layer_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( Layer_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( Layer_wrapper::*default_size_function_type )( ) const;
Layer_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/LayerInterface.pypp.cpp b/Core/PythonAPI/src/LayerInterface.pypp.cpp
index e05592483090e4fa246b6647cdc028fa6cf3aa5f..934bce0b5f5ff1b533555fd8be0230547940af31 100644
--- a/Core/PythonAPI/src/LayerInterface.pypp.cpp
+++ b/Core/PythonAPI/src/LayerInterface.pypp.cpp
@@ -21,11 +21,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::LayerInterface * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->LayerInterface::clone( );
+ }
}
-
::LayerInterface * default_clone( ) const {
return LayerInterface::clone( );
}
@@ -33,11 +33,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -45,11 +45,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -57,11 +57,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -69,11 +69,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -81,11 +81,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -93,11 +93,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -105,11 +105,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -117,11 +117,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -148,11 +148,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -160,11 +160,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -172,24 +172,24 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -392,8 +392,8 @@ void register_LayerInterface_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( LayerInterface_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( LayerInterface_wrapper::*default_size_function_type )( ) const;
LayerInterface_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/LayerRoughness.pypp.cpp b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
index b0d3ae5398c45f503a7782267ad8e4aa215a1efe..6b753fac19daf26a8b09766e4d8d0ce9b660ef3e 100644
--- a/Core/PythonAPI/src/LayerRoughness.pypp.cpp
+++ b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
@@ -35,11 +35,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::LayerRoughness * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->LayerRoughness::clone( );
+ }
}
-
::LayerRoughness * default_clone( ) const {
return LayerRoughness::clone( );
}
@@ -47,11 +47,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ISample * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ISample::cloneInvertB( );
+ }
}
-
::ISample * default_cloneInvertB( ) const {
return ISample::cloneInvertB( );
}
@@ -83,11 +83,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -95,11 +95,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -107,11 +107,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -119,11 +119,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -150,11 +150,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -162,11 +162,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -174,11 +174,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/MesoCrystal.pypp.cpp b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
index 35a1d1b1252c5bb1f9a154c163ab0419104f3256..04f1b96e8458ff33a55790d5e84b8934c8c0b8d8 100644
--- a/Core/PythonAPI/src/MesoCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -40,11 +40,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -52,11 +52,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -64,11 +64,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -76,11 +76,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -88,11 +88,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else
+ else{
return this->Particle::getMaterial( );
+ }
}
-
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -100,11 +100,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else
+ else{
return this->Particle::getRefractiveIndex( );
+ }
}
-
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -112,11 +112,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else
+ else{
return this->Particle::hasDistributedFormFactor( );
+ }
}
-
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -124,11 +124,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -179,11 +179,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -191,24 +191,24 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -381,8 +381,8 @@ void register_MesoCrystal_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( MesoCrystal_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( MesoCrystal_wrapper::*default_size_function_type )( ) const;
MesoCrystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/MultiLayer.pypp.cpp b/Core/PythonAPI/src/MultiLayer.pypp.cpp
index a3a979ae2ac4f68521f60af85c0e4cd3f49cc6d7..7d82856cdcfb79b1bf6719c5d53fc3e49cd71b62 100644
--- a/Core/PythonAPI/src/MultiLayer.pypp.cpp
+++ b/Core/PythonAPI/src/MultiLayer.pypp.cpp
@@ -28,11 +28,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::MultiLayer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->MultiLayer::clone( );
+ }
}
-
::MultiLayer * default_clone( ) const {
return MultiLayer::clone( );
}
@@ -40,11 +40,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::MultiLayer * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->MultiLayer::cloneInvertB( );
+ }
}
-
::MultiLayer * default_cloneInvertB( ) const {
return MultiLayer::cloneInvertB( );
}
@@ -52,11 +52,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -100,11 +100,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -124,11 +124,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -155,11 +155,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -167,11 +167,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -179,24 +179,24 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -272,7 +272,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getCrossCorrSpectralFun
- typedef double ( ::MultiLayer::*getCrossCorrSpectralFun_function_type )( ::kvector_t const &,::std::size_t,::std::size_t ) const;
+ typedef double ( ::MultiLayer::*getCrossCorrSpectralFun_function_type )( ::kvector_t const &,::size_t,::size_t ) const;
MultiLayer_exposer.def(
"getCrossCorrSpectralFun"
@@ -282,7 +282,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayer
- typedef ::Layer const * ( ::MultiLayer::*getLayer_function_type )( ::std::size_t ) const;
+ typedef ::Layer const * ( ::MultiLayer::*getLayer_function_type )( ::size_t ) const;
MultiLayer_exposer.def(
"getLayer"
@@ -293,7 +293,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerBottomInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerBottomInterface_function_type )( ::std::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerBottomInterface_function_type )( ::size_t ) const;
MultiLayer_exposer.def(
"getLayerBottomInterface"
@@ -304,7 +304,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerBottomZ
- typedef double ( ::MultiLayer::*getLayerBottomZ_function_type )( ::std::size_t ) const;
+ typedef double ( ::MultiLayer::*getLayerBottomZ_function_type )( ::size_t ) const;
MultiLayer_exposer.def(
"getLayerBottomZ"
@@ -314,7 +314,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerInterface_function_type )( ::std::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerInterface_function_type )( ::size_t ) const;
MultiLayer_exposer.def(
"getLayerInterface"
@@ -325,7 +325,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerThickness
- typedef double ( ::MultiLayer::*getLayerThickness_function_type )( ::std::size_t ) const;
+ typedef double ( ::MultiLayer::*getLayerThickness_function_type )( ::size_t ) const;
MultiLayer_exposer.def(
"getLayerThickness"
@@ -335,7 +335,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerTopInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerTopInterface_function_type )( ::std::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerTopInterface_function_type )( ::size_t ) const;
MultiLayer_exposer.def(
"getLayerTopInterface"
@@ -346,7 +346,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getNumberOfInterfaces
- typedef ::std::size_t ( ::MultiLayer::*getNumberOfInterfaces_function_type )( ) const;
+ typedef ::size_t ( ::MultiLayer::*getNumberOfInterfaces_function_type )( ) const;
MultiLayer_exposer.def(
"getNumberOfInterfaces"
@@ -355,7 +355,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getNumberOfLayers
- typedef ::std::size_t ( ::MultiLayer::*getNumberOfLayers_function_type )( ) const;
+ typedef ::size_t ( ::MultiLayer::*getNumberOfLayers_function_type )( ) const;
MultiLayer_exposer.def(
"getNumberOfLayers"
@@ -374,7 +374,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::setLayerThickness
- typedef void ( ::MultiLayer::*setLayerThickness_function_type )( ::std::size_t,double ) ;
+ typedef void ( ::MultiLayer::*setLayerThickness_function_type )( ::size_t,double ) ;
MultiLayer_exposer.def(
"setLayerThickness"
@@ -509,8 +509,8 @@ void register_MultiLayer_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( MultiLayer_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( MultiLayer_wrapper::*default_size_function_type )( ) const;
MultiLayer_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParameterPool.pypp.cpp b/Core/PythonAPI/src/ParameterPool.pypp.cpp
index 88a890adef42f8d7457b59117ee8e8606bba2a3c..914cffcceb87c743ab97a780af190e5900711dce 100644
--- a/Core/PythonAPI/src/ParameterPool.pypp.cpp
+++ b/Core/PythonAPI/src/ParameterPool.pypp.cpp
@@ -26,11 +26,11 @@ struct ParameterPool_wrapper : ParameterPool, bp::wrapper< ParameterPool > {
virtual ::ParameterPool * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->ParameterPool::clone( );
+ }
}
-
::ParameterPool * default_clone( ) const {
return ParameterPool::clone( );
}
@@ -127,7 +127,7 @@ void register_ParameterPool_class(){
}
{ //::ParameterPool::size
- typedef ::std::size_t ( ::ParameterPool::*size_function_type )( ) const;
+ typedef ::size_t ( ::ParameterPool::*size_function_type )( ) const;
ParameterPool_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Particle.pypp.cpp b/Core/PythonAPI/src/Particle.pypp.cpp
index d488ceb636a0e770c8d270222de4b9b0e0370516..f05b745c78995a3f7ca3521cc786ef048a18aa8d 100644
--- a/Core/PythonAPI/src/Particle.pypp.cpp
+++ b/Core/PythonAPI/src/Particle.pypp.cpp
@@ -42,11 +42,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::Particle * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->Particle::clone( );
+ }
}
-
::Particle * default_clone( ) const {
return Particle::clone( );
}
@@ -54,11 +54,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::Particle * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->Particle::cloneInvertB( );
+ }
}
-
::Particle * default_cloneInvertB( ) const {
return Particle::cloneInvertB( );
}
@@ -66,11 +66,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IFormFactor * createFormFactor( ::complex_t wavevector_scattering_factor ) const {
if( bp::override func_createFormFactor = this->get_override( "createFormFactor" ) )
return func_createFormFactor( wavevector_scattering_factor );
- else
+ else{
return this->Particle::createFormFactor( wavevector_scattering_factor );
+ }
}
-
::IFormFactor * default_createFormFactor( ::complex_t wavevector_scattering_factor ) const {
return Particle::createFormFactor( wavevector_scattering_factor );
}
@@ -78,11 +78,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else
+ else{
return this->Particle::getMaterial( );
+ }
}
-
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -90,11 +90,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else
+ else{
return this->Particle::getRefractiveIndex( );
+ }
}
-
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -102,11 +102,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IFormFactor const * getSimpleFormFactor( ) const {
if( bp::override func_getSimpleFormFactor = this->get_override( "getSimpleFormFactor" ) )
return func_getSimpleFormFactor( );
- else
+ else{
return this->Particle::getSimpleFormFactor( );
+ }
}
-
::IFormFactor const * default_getSimpleFormFactor( ) const {
return Particle::getSimpleFormFactor( );
}
@@ -114,11 +114,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else
+ else{
return this->Particle::hasDistributedFormFactor( );
+ }
}
-
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -126,11 +126,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void setTransform( ::Geometry::ITransform3D const & transform ) {
if( bp::override func_setTransform = this->get_override( "setTransform" ) )
func_setTransform( boost::ref(transform) );
- else
+ else{
this->Particle::setTransform( boost::ref(transform) );
+ }
}
-
void default_setTransform( ::Geometry::ITransform3D const & transform ) {
Particle::setTransform( boost::ref(transform) );
}
@@ -138,11 +138,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -150,11 +150,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -162,11 +162,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -174,11 +174,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -186,11 +186,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -198,11 +198,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -210,11 +210,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -241,11 +241,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -253,11 +253,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -265,24 +265,24 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -528,8 +528,8 @@ void register_Particle_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( Particle_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( Particle_wrapper::*default_size_function_type )( ) const;
Particle_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
index 8519934d1814c9953183b4db9ac3d04a66106a1f..7bd494ade7c60cfa316c2f34773ce52708f92163 100644
--- a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
@@ -28,11 +28,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -40,11 +40,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -52,11 +52,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -64,11 +64,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -76,11 +76,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -88,11 +88,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else
+ else{
return this->Particle::getMaterial( );
+ }
}
-
::IMaterial const * default_getMaterial( ) const {
return Particle::getMaterial( );
}
@@ -100,11 +100,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else
+ else{
return this->Particle::getRefractiveIndex( );
+ }
}
-
::complex_t default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -112,11 +112,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else
+ else{
return this->Particle::hasDistributedFormFactor( );
+ }
}
-
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -124,11 +124,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -136,11 +136,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -167,11 +167,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -179,11 +179,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -191,11 +191,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -203,24 +203,24 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void setTransform( ::Geometry::ITransform3D const & transform ) {
if( bp::override func_setTransform = this->get_override( "setTransform" ) )
func_setTransform( boost::ref(transform) );
- else
+ else{
this->Particle::setTransform( boost::ref(transform) );
+ }
}
-
void default_setTransform( ::Geometry::ITransform3D const & transform ) {
Particle::setTransform( boost::ref(transform) );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -405,8 +405,8 @@ void register_ParticleCoreShell_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( ParticleCoreShell_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( ParticleCoreShell_wrapper::*default_size_function_type )( ) const;
ParticleCoreShell_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
index 3ab807ebada32b27ee0ff31d4557c930a38d7fc2..e56aa80e7a50ef0480af6c4dd1312d8a59e97bb1 100644
--- a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
@@ -28,11 +28,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParticleDecoration * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->ParticleDecoration::clone( );
+ }
}
-
::ParticleDecoration * default_clone( ) const {
return ParticleDecoration::clone( );
}
@@ -40,83 +40,83 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParticleDecoration * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ParticleDecoration::cloneInvertB( );
+ }
}
-
::ParticleDecoration * default_cloneInvertB( ) const {
return ParticleDecoration::cloneInvertB( );
}
- virtual double getAbundanceFractionOfParticle( ::std::size_t index ) const {
+ virtual double getAbundanceFractionOfParticle( ::size_t index ) const {
if( bp::override func_getAbundanceFractionOfParticle = this->get_override( "getAbundanceFractionOfParticle" ) )
return func_getAbundanceFractionOfParticle( index );
- else
+ else{
return this->ParticleDecoration::getAbundanceFractionOfParticle( index );
+ }
}
-
- double default_getAbundanceFractionOfParticle( ::std::size_t index ) const {
+ double default_getAbundanceFractionOfParticle( ::size_t index ) const {
return ParticleDecoration::getAbundanceFractionOfParticle( index );
}
virtual ::SafePointerVector< IInterferenceFunction > getInterferenceFunctions( ) const {
if( bp::override func_getInterferenceFunctions = this->get_override( "getInterferenceFunctions" ) )
return func_getInterferenceFunctions( );
- else
+ else{
return this->ParticleDecoration::getInterferenceFunctions( );
+ }
}
-
::SafePointerVector< IInterferenceFunction > default_getInterferenceFunctions( ) const {
return ParticleDecoration::getInterferenceFunctions( );
}
- virtual ::std::size_t getNumberOfInterferenceFunctions( ) const {
+ virtual ::size_t getNumberOfInterferenceFunctions( ) const {
if( bp::override func_getNumberOfInterferenceFunctions = this->get_override( "getNumberOfInterferenceFunctions" ) )
return func_getNumberOfInterferenceFunctions( );
- else
+ else{
return this->ParticleDecoration::getNumberOfInterferenceFunctions( );
+ }
}
-
- ::std::size_t default_getNumberOfInterferenceFunctions( ) const {
+ ::size_t default_getNumberOfInterferenceFunctions( ) const {
return ParticleDecoration::getNumberOfInterferenceFunctions( );
}
- virtual ::std::size_t getNumberOfParticles( ) const {
+ virtual ::size_t getNumberOfParticles( ) const {
if( bp::override func_getNumberOfParticles = this->get_override( "getNumberOfParticles" ) )
return func_getNumberOfParticles( );
- else
+ else{
return this->ParticleDecoration::getNumberOfParticles( );
+ }
}
-
- ::std::size_t default_getNumberOfParticles( ) const {
+ ::size_t default_getNumberOfParticles( ) const {
return ParticleDecoration::getNumberOfParticles( );
}
- virtual ::ParticleInfo const * getParticleInfo( ::std::size_t index ) const {
+ virtual ::ParticleInfo const * getParticleInfo( ::size_t index ) const {
if( bp::override func_getParticleInfo = this->get_override( "getParticleInfo" ) )
return func_getParticleInfo( index );
- else
+ else{
return this->ParticleDecoration::getParticleInfo( index );
+ }
}
-
- ::ParticleInfo const * default_getParticleInfo( ::std::size_t index ) const {
+ ::ParticleInfo const * default_getParticleInfo( ::size_t index ) const {
return ParticleDecoration::getParticleInfo( index );
}
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,11 +124,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -136,11 +136,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -160,11 +160,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -184,11 +184,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -215,11 +215,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -227,11 +227,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -239,24 +239,24 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -334,8 +334,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getAbundanceFractionOfParticle
- typedef double ( ::ParticleDecoration::*getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
- typedef double ( ParticleDecoration_wrapper::*default_getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
+ typedef double ( ::ParticleDecoration::*getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
+ typedef double ( ParticleDecoration_wrapper::*default_getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
ParticleDecoration_exposer.def(
"getAbundanceFractionOfParticle"
@@ -346,7 +346,7 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getInterferenceFunction
- typedef ::IInterferenceFunction const * ( ::ParticleDecoration::*getInterferenceFunction_function_type )( ::std::size_t ) const;
+ typedef ::IInterferenceFunction const * ( ::ParticleDecoration::*getInterferenceFunction_function_type )( ::size_t ) const;
ParticleDecoration_exposer.def(
"getInterferenceFunction"
@@ -368,8 +368,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getNumberOfInterferenceFunctions
- typedef ::std::size_t ( ::ParticleDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
- typedef ::std::size_t ( ParticleDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::size_t ( ::ParticleDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::size_t ( ParticleDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
ParticleDecoration_exposer.def(
"getNumberOfInterferenceFunctions"
@@ -379,8 +379,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getNumberOfParticles
- typedef ::std::size_t ( ::ParticleDecoration::*getNumberOfParticles_function_type )( ) const;
- typedef ::std::size_t ( ParticleDecoration_wrapper::*default_getNumberOfParticles_function_type )( ) const;
+ typedef ::size_t ( ::ParticleDecoration::*getNumberOfParticles_function_type )( ) const;
+ typedef ::size_t ( ParticleDecoration_wrapper::*default_getNumberOfParticles_function_type )( ) const;
ParticleDecoration_exposer.def(
"getNumberOfParticles"
@@ -390,8 +390,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getParticleInfo
- typedef ::ParticleInfo const * ( ::ParticleDecoration::*getParticleInfo_function_type )( ::std::size_t ) const;
- typedef ::ParticleInfo const * ( ParticleDecoration_wrapper::*default_getParticleInfo_function_type )( ::std::size_t ) const;
+ typedef ::ParticleInfo const * ( ::ParticleDecoration::*getParticleInfo_function_type )( ::size_t ) const;
+ typedef ::ParticleInfo const * ( ParticleDecoration_wrapper::*default_getParticleInfo_function_type )( ::size_t ) const;
ParticleDecoration_exposer.def(
"getParticleInfo"
@@ -528,8 +528,8 @@ void register_ParticleDecoration_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( ParticleDecoration_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( ParticleDecoration_wrapper::*default_size_function_type )( ) const;
ParticleDecoration_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleInfo.pypp.cpp b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
index 283ee6d731fb22b2b801c2693eb6cde93375d965..0f715b22caba0ab6cc0e66424f921d35b3db6f6a 100644
--- a/Core/PythonAPI/src/ParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
@@ -28,11 +28,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParticleInfo * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->ParticleInfo::clone( );
+ }
}
-
::ParticleInfo * default_clone( ) const {
return ParticleInfo::clone( );
}
@@ -40,11 +40,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParticleInfo * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ParticleInfo::cloneInvertB( );
+ }
}
-
::ParticleInfo * default_cloneInvertB( ) const {
return ParticleInfo::cloneInvertB( );
}
@@ -52,11 +52,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -100,11 +100,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -124,11 +124,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -155,11 +155,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -167,11 +167,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -179,24 +179,24 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -407,8 +407,8 @@ void register_ParticleInfo_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( ParticleInfo_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( ParticleInfo_wrapper::*default_size_function_type )( ) const;
ParticleInfo_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
index 229e73a8d8400d91e41819ac414d04e462c260ce..7330e9d4fcc9153ffa86623d0084bba347fe2b8c 100644
--- a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
@@ -28,11 +28,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::PositionParticleInfo * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->PositionParticleInfo::clone( );
+ }
}
-
::PositionParticleInfo * default_clone( ) const {
return PositionParticleInfo::clone( );
}
@@ -40,11 +40,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ParticleInfo * cloneInvertB( ) const {
if( bp::override func_cloneInvertB = this->get_override( "cloneInvertB" ) )
return func_cloneInvertB( );
- else
+ else{
return this->ParticleInfo::cloneInvertB( );
+ }
}
-
::ParticleInfo * default_cloneInvertB( ) const {
return ParticleInfo::cloneInvertB( );
}
@@ -76,11 +76,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -100,11 +100,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ICompositeSample::getCompositeSample( );
+ }
}
-
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -124,11 +124,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -155,11 +155,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -167,11 +167,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -179,24 +179,24 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::std::size_t size( ) const {
+ virtual ::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else
+ else{
return this->ICompositeSample::size( );
+ }
}
-
- ::std::size_t default_size( ) const {
+ ::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -388,8 +388,8 @@ void register_PositionParticleInfo_class(){
}
{ //::ICompositeSample::size
- typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::std::size_t ( PositionParticleInfo_wrapper::*default_size_function_type )( ) const;
+ typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::size_t ( PositionParticleInfo_wrapper::*default_size_function_type )( ) const;
PositionParticleInfo_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index 08a156af7a1a338f156211529150fdf6c3a967c8..a398f4bb3f6acf338851e974ca1bb214fc3a3c05 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -4,95 +4,95 @@
#include "numpy/arrayobject.h"
// the order of 3 guys above is important
-#include "RotateZ_3D.pypp.h"
-#include "IFTDistribution2D.pypp.h"
-#include "Detector.pypp.h"
-#include "LatticeBasis.pypp.h"
-#include "ParticleCoreShell.pypp.h"
+#include "AxisBin.pypp.h"
+#include "AxisDouble.pypp.h"
#include "Beam.pypp.h"
-#include "Lattice.pypp.h"
+#include "Bin1D.pypp.h"
+#include "Bin1DCVector.pypp.h"
+#include "Crystal.pypp.h"
+#include "Detector.pypp.h"
+#include "FTDistribution2DCauchy.pypp.h"
+#include "FormFactorBox.pypp.h"
+#include "FormFactorCone.pypp.h"
+#include "FormFactorCrystal.pypp.h"
#include "FormFactorCylinder.pypp.h"
-#include "ICloneable.pypp.h"
-#include "StochasticSampledParameter.pypp.h"
+#include "FormFactorDecoratorDebyeWaller.pypp.h"
+#include "FormFactorEllipsoid.pypp.h"
+#include "FormFactorFullSphere.pypp.h"
+#include "FormFactorFullSpheroid.pypp.h"
+#include "FormFactorGauss.pypp.h"
+#include "FormFactorHemiSpheroid.pypp.h"
+#include "FormFactorLorentz.pypp.h"
+#include "FormFactorParallelepiped.pypp.h"
+#include "FormFactorPrism3.pypp.h"
+#include "FormFactorPrism6.pypp.h"
+#include "FormFactorPyramid.pypp.h"
+#include "FormFactorSphere.pypp.h"
+#include "FormFactorSphereGaussianRadius.pypp.h"
#include "HomogeneousMaterial.pypp.h"
-#include "vector_integer_t.pypp.h"
-#include "AxisDouble.pypp.h"
#include "IAxis.pypp.h"
-#include "Layer.pypp.h"
+#include "ICloneable.pypp.h"
+#include "IClusteredParticles.pypp.h"
+#include "ICompositeSample.pypp.h"
+#include "IDecoration.pypp.h"
+#include "IDetectorResolution.pypp.h"
+#include "IFTDistribution2D.pypp.h"
#include "IFormFactor.pypp.h"
+#include "IFormFactorBorn.pypp.h"
+#include "IFormFactorDecorator.pypp.h"
+#include "IInterferenceFunction.pypp.h"
+#include "IMaterial.pypp.h"
#include "IObservable.pypp.h"
-#include "FormFactorParallelepiped.pypp.h"
-#include "RealParameterWrapper.pypp.h"
-#include "MaterialManager.pypp.h"
-#include "ResolutionFunction2DSimple.pypp.h"
-#include "SimulationParameters.pypp.h"
-#include "AxisBin.pypp.h"
-#include "FormFactorGauss.pypp.h"
-#include "FormFactorFullSpheroid.pypp.h"
-#include "PythonInterface_global_variables.pypp.h"
+#include "IObserver.pypp.h"
+#include "IParameterized.pypp.h"
+#include "IResolutionFunction2D.pypp.h"
+#include "ISample.pypp.h"
#include "ISampleBuilder.pypp.h"
-#include "StochasticParameter_t.pypp.h"
-#include "StochasticDoubleGaussian.pypp.h"
-#include "FormFactorPrism6.pypp.h"
+#include "ISelectionRule.pypp.h"
+#include "ITransform3D.pypp.h"
+#include "Instrument.pypp.h"
+#include "IntensityData.pypp.h"
+#include "InterferenceFunction1DParaCrystal.pypp.h"
#include "InterferenceFunction2DLattice.pypp.h"
-#include "FormFactorPyramid.pypp.h"
-#include "FormFactorBox.pypp.h"
-#include "IResolutionFunction2D.pypp.h"
-#include "IFormFactorBorn.pypp.h"
+#include "InterferenceFunction2DParaCrystal.pypp.h"
+#include "InterferenceFunctionNone.pypp.h"
+#include "Lattice.pypp.h"
+#include "Lattice2DIFParameters.pypp.h"
+#include "LatticeBasis.pypp.h"
+#include "Layer.pypp.h"
+#include "LayerInterface.pypp.h"
+#include "LayerRoughness.pypp.h"
+#include "MaterialManager.pypp.h"
+#include "MesoCrystal.pypp.h"
#include "MultiLayer.pypp.h"
-#include "ITransform3D.pypp.h"
-#include "ParticleDecoration.pypp.h"
-#include "IDecoration.pypp.h"
-#include "FTDistribution2DCauchy.pypp.h"
-#include "ICompositeSample.pypp.h"
-#include "cvector_t.pypp.h"
+#include "OutputDataIOFactory.pypp.h"
#include "ParameterPool.pypp.h"
#include "Particle.pypp.h"
-#include "FormFactorCone.pypp.h"
-#include "FormFactorPrism3.pypp.h"
-#include "InterferenceFunction2DParaCrystal.pypp.h"
-#include "vdouble1d_t.pypp.h"
-#include "MesoCrystal.pypp.h"
-#include "RotateY_3D.pypp.h"
-#include "FormFactorDecoratorDebyeWaller.pypp.h"
-#include "vector_IFormFactorPtr_t.pypp.h"
-#include "IMaterial.pypp.h"
-#include "IFormFactorDecorator.pypp.h"
-#include "Instrument.pypp.h"
-#include "IDetectorResolution.pypp.h"
-#include "ISelectionRule.pypp.h"
-#include "Bin1D.pypp.h"
+#include "ParticleBuilder.pypp.h"
+#include "ParticleCoreShell.pypp.h"
+#include "ParticleDecoration.pypp.h"
#include "ParticleInfo.pypp.h"
-#include "vector_longinteger_t.pypp.h"
-#include "FormFactorHemiSpheroid.pypp.h"
-#include "LayerInterface.pypp.h"
-#include "FormFactorFullSphere.pypp.h"
#include "PositionParticleInfo.pypp.h"
-#include "LayerRoughness.pypp.h"
-#include "FormFactorCrystal.pypp.h"
-#include "IntensityData.pypp.h"
-#include "IParameterized.pypp.h"
-#include "Bin1DCVector.pypp.h"
-#include "StochasticDoubleGate.pypp.h"
-#include "IClusteredParticles.pypp.h"
-#include "IInterferenceFunction.pypp.h"
-#include "SimpleSelectionRule.pypp.h"
-#include "FormFactorLorentz.pypp.h"
-#include "OutputDataIOFactory.pypp.h"
-#include "vector_kvector_t.pypp.h"
-#include "InterferenceFunction1DParaCrystal.pypp.h"
-#include "InterferenceFunctionNone.pypp.h"
-#include "Crystal.pypp.h"
#include "PythonInterface_free_functions.pypp.h"
-#include "kvector_t.pypp.h"
-#include "FormFactorEllipsoid.pypp.h"
+#include "PythonInterface_global_variables.pypp.h"
+#include "RealParameterWrapper.pypp.h"
+#include "ResolutionFunction2DSimple.pypp.h"
+#include "RotateY_3D.pypp.h"
+#include "RotateZ_3D.pypp.h"
+#include "SimpleSelectionRule.pypp.h"
#include "Simulation.pypp.h"
-#include "ISample.pypp.h"
-#include "IObserver.pypp.h"
-#include "ParticleBuilder.pypp.h"
-#include "FormFactorSphereGaussianRadius.pypp.h"
-#include "Lattice2DIFParameters.pypp.h"
-#include "FormFactorSphere.pypp.h"
+#include "SimulationParameters.pypp.h"
+#include "StochasticDoubleGate.pypp.h"
+#include "StochasticDoubleGaussian.pypp.h"
+#include "StochasticParameter_t.pypp.h"
+#include "StochasticSampledParameter.pypp.h"
+#include "cvector_t.pypp.h"
+#include "kvector_t.pypp.h"
+#include "vdouble1d_t.pypp.h"
+#include "vector_IFormFactorPtr_t.pypp.h"
+#include "vector_integer_t.pypp.h"
+#include "vector_kvector_t.pypp.h"
+#include "vector_longinteger_t.pypp.h"
#include "__call_policies.pypp.hpp"
#include "__convenience.pypp.hpp"
diff --git a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
index e28260c83791ca0b473ed83b168ed4f94a6acc64..2b60275edbe18de579def50a3085769c8da7b354 100644
--- a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
+++ b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
@@ -28,11 +28,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual ::ResolutionFunction2DSimple * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->ResolutionFunction2DSimple::clone( );
+ }
}
-
::ResolutionFunction2DSimple * default_clone( ) const {
return ResolutionFunction2DSimple::clone( );
}
@@ -40,11 +40,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual double evaluateCDF( double x, double y ) const {
if( bp::override func_evaluateCDF = this->get_override( "evaluateCDF" ) )
return func_evaluateCDF( x, y );
- else
+ else{
return this->ResolutionFunction2DSimple::evaluateCDF( x, y );
+ }
}
-
double default_evaluateCDF( double x, double y ) const {
return ResolutionFunction2DSimple::evaluateCDF( x, y );
}
@@ -52,11 +52,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -119,11 +119,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -131,11 +131,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -143,11 +143,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/RotateY_3D.pypp.cpp b/Core/PythonAPI/src/RotateY_3D.pypp.cpp
index 97710288431fce6ba71b8760dfdb48c005e68652..aa59091d230fad26d5946f570fbe1e9c967a4585 100644
--- a/Core/PythonAPI/src/RotateY_3D.pypp.cpp
+++ b/Core/PythonAPI/src/RotateY_3D.pypp.cpp
@@ -33,11 +33,11 @@ struct RotateY_3D_wrapper : Geometry::RotateY_3D, bp::wrapper< Geometry::RotateY
virtual ::Geometry::RotateY_3D * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->Geometry::RotateY_3D::clone( );
+ }
}
-
::Geometry::RotateY_3D * default_clone( ) const {
return Geometry::RotateY_3D::clone( );
}
@@ -45,11 +45,11 @@ struct RotateY_3D_wrapper : Geometry::RotateY_3D, bp::wrapper< Geometry::RotateY
virtual void print( ::std::ostream & ostr ) const {
if( bp::override func_print = this->get_override( "print" ) )
func_print( boost::ref(ostr) );
- else
+ else{
this->Geometry::RotateY_3D::print( boost::ref(ostr) );
+ }
}
-
void default_print( ::std::ostream & ostr ) const {
Geometry::RotateY_3D::print( boost::ref(ostr) );
}
diff --git a/Core/PythonAPI/src/RotateZ_3D.pypp.cpp b/Core/PythonAPI/src/RotateZ_3D.pypp.cpp
index e2cbeda26e50a2dfe449fd6a76a10beecd83cbdc..6fa2018db5c7ea988de5acc358e3bf8e7e4e786a 100644
--- a/Core/PythonAPI/src/RotateZ_3D.pypp.cpp
+++ b/Core/PythonAPI/src/RotateZ_3D.pypp.cpp
@@ -33,11 +33,11 @@ struct RotateZ_3D_wrapper : Geometry::RotateZ_3D, bp::wrapper< Geometry::RotateZ
virtual ::Geometry::RotateZ_3D * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->Geometry::RotateZ_3D::clone( );
+ }
}
-
::Geometry::RotateZ_3D * default_clone( ) const {
return Geometry::RotateZ_3D::clone( );
}
@@ -45,11 +45,11 @@ struct RotateZ_3D_wrapper : Geometry::RotateZ_3D, bp::wrapper< Geometry::RotateZ
virtual void print( ::std::ostream & ostr ) const {
if( bp::override func_print = this->get_override( "print" ) )
func_print( boost::ref(ostr) );
- else
+ else{
this->Geometry::RotateZ_3D::print( boost::ref(ostr) );
+ }
}
-
void default_print( ::std::ostream & ostr ) const {
Geometry::RotateZ_3D::print( boost::ref(ostr) );
}
diff --git a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
index b66737013bbb60b02e5b57ca8a9ffcc1cd795f14..cb07c7da7f228d0ed0627c2ad86dc6ba479e1229 100644
--- a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
+++ b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
@@ -33,11 +33,11 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
virtual ::SimpleSelectionRule * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SimpleSelectionRule::clone( );
+ }
}
-
::SimpleSelectionRule * default_clone( ) const {
return SimpleSelectionRule::clone( );
}
@@ -45,11 +45,11 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
virtual bool coordinateSelected( ::IndexVector3D const & coordinate ) const {
if( bp::override func_coordinateSelected = this->get_override( "coordinateSelected" ) )
return func_coordinateSelected( boost::ref(coordinate) );
- else
+ else{
return this->SimpleSelectionRule::coordinateSelected( boost::ref(coordinate) );
+ }
}
-
bool default_coordinateSelected( ::IndexVector3D const & coordinate ) const {
return SimpleSelectionRule::coordinateSelected( boost::ref(coordinate) );
}
diff --git a/Core/PythonAPI/src/Simulation.pypp.cpp b/Core/PythonAPI/src/Simulation.pypp.cpp
index 0adb050006923e79c5e90ac99d7c5026e86f923d..841a35e2ca8b5e80662bd2a4a282a2777c4db282 100644
--- a/Core/PythonAPI/src/Simulation.pypp.cpp
+++ b/Core/PythonAPI/src/Simulation.pypp.cpp
@@ -28,11 +28,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual ::Simulation * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->Simulation::clone( );
+ }
}
-
::Simulation * default_clone( ) const {
return Simulation::clone( );
}
@@ -40,11 +40,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else
+ else{
return this->IParameterized::areParametersChanged( );
+ }
}
-
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else
+ else{
return this->IParameterized::createParameterTree( );
+ }
}
-
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -76,11 +76,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else
+ else{
this->IParameterized::printParameters( );
+ }
}
-
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -107,11 +107,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
return func_setMatchedParametersValue( wildcards, value );
- else
+ else{
return this->IParameterized::setMatchedParametersValue( wildcards, value );
+ }
}
-
int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
return IParameterized::setMatchedParametersValue( wildcards, value );
}
@@ -119,11 +119,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else
+ else{
return this->IParameterized::setParameterValue( name, value );
+ }
}
-
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -131,11 +131,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -249,7 +249,7 @@ void register_Simulation_class(){
}
{ //::Simulation::runSimulationElement
- typedef void ( ::Simulation::*runSimulationElement_function_type )( ::std::size_t ) ;
+ typedef void ( ::Simulation::*runSimulationElement_function_type )( ::size_t ) ;
Simulation_exposer.def(
"runSimulationElement"
@@ -289,7 +289,7 @@ void register_Simulation_class(){
}
{ //::Simulation::setDetectorParameters
- typedef void ( ::Simulation::*setDetectorParameters_function_type )( ::std::size_t,double,double,::std::size_t,double,double,bool ) ;
+ typedef void ( ::Simulation::*setDetectorParameters_function_type )( ::size_t,double,double,::size_t,double,double,bool ) ;
Simulation_exposer.def(
"setDetectorParameters"
diff --git a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
index a2c2e6ca95bf639e8c92a7e2947e72283af1c1eb..ea0d2bcc00b58e26f953ab1f8c5b8d497e51565b 100644
--- a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
@@ -26,11 +26,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual ::StochasticDoubleGate * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->StochasticDoubleGate::clone( );
+ }
}
-
::StochasticDoubleGate * default_clone( ) const {
return StochasticDoubleGate::clone( );
}
@@ -38,11 +38,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else
+ else{
return this->StochasticDoubleGate::getFWHM( );
+ }
}
-
double default_getFWHM( ) const {
return StochasticDoubleGate::getFWHM( );
}
@@ -50,11 +50,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else
+ else{
return this->StochasticDoubleGate::probabilityDensity( value );
+ }
}
-
double default_probabilityDensity( double value ) const {
return StochasticDoubleGate::probabilityDensity( value );
}
@@ -62,11 +62,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else
+ else{
this->StochasticDoubleGate::setToRandom( );
+ }
}
-
void default_setToRandom( ) {
StochasticDoubleGate::setToRandom( );
}
@@ -74,11 +74,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else
+ else{
return this->StochasticParameter< double >::getRandom( );
+ }
}
-
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -86,11 +86,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else
+ else{
this->StochasticParameter< double >::setToAverage( );
+ }
}
-
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
index ec0bb290500ff2041944e8335e9be278491390af..820e29c3e451eda7af03306e5dd63852ca7c9913 100644
--- a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
@@ -26,11 +26,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual ::StochasticDoubleGaussian * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->StochasticDoubleGaussian::clone( );
+ }
}
-
::StochasticDoubleGaussian * default_clone( ) const {
return StochasticDoubleGaussian::clone( );
}
@@ -38,11 +38,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else
+ else{
return this->StochasticDoubleGaussian::getFWHM( );
+ }
}
-
double default_getFWHM( ) const {
return StochasticDoubleGaussian::getFWHM( );
}
@@ -50,11 +50,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else
+ else{
return this->StochasticDoubleGaussian::probabilityDensity( value );
+ }
}
-
double default_probabilityDensity( double value ) const {
return StochasticDoubleGaussian::probabilityDensity( value );
}
@@ -62,11 +62,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else
+ else{
this->StochasticDoubleGaussian::setToRandom( );
+ }
}
-
void default_setToRandom( ) {
StochasticDoubleGaussian::setToRandom( );
}
@@ -74,11 +74,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else
+ else{
return this->StochasticParameter< double >::getRandom( );
+ }
}
-
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -86,11 +86,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else
+ else{
this->StochasticParameter< double >::setToAverage( );
+ }
}
-
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
index e6cd435ac44605b2a56bb0a5ef8f60d430c7f15d..1c7f4060708c9de5ed217052a0046dc0d45ae2ba 100644
--- a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
@@ -31,11 +31,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else
+ else{
return this->StochasticParameter< double >::getFWHM( );
+ }
}
-
double default_getFWHM( ) const {
return StochasticParameter< double >::getFWHM( );
}
@@ -43,11 +43,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else
+ else{
return this->StochasticParameter< double >::getRandom( );
+ }
}
-
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -60,11 +60,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else
+ else{
this->StochasticParameter< double >::setToAverage( );
+ }
}
-
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
index 6868e315885f63e6e03aec579237a42e2dde5cfc..26fc062960c37ebca48c2c814e930d4a27534734 100644
--- a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
@@ -16,14 +16,14 @@ namespace bp = boost::python;
struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrapper< StochasticSampledParameter > {
- StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::std::size_t nbins, double xmin, double xmax )
+ StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::size_t nbins, double xmin, double xmax )
: StochasticSampledParameter( boost::ref(par), nbins, xmin, xmax )
, bp::wrapper< StochasticSampledParameter >(){
// constructor
}
- StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::std::size_t nbins, int nfwhm=3 )
+ StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::size_t nbins, int nfwhm=3 )
: StochasticSampledParameter( boost::ref(par), nbins, nfwhm )
, bp::wrapper< StochasticSampledParameter >(){
// constructor
@@ -33,11 +33,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual ::StochasticSampledParameter * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->StochasticSampledParameter::clone( );
+ }
}
-
::StochasticSampledParameter * default_clone( ) const {
return StochasticSampledParameter::clone( );
}
@@ -45,11 +45,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else
+ else{
return this->StochasticSampledParameter::probabilityDensity( value );
+ }
}
-
double default_probabilityDensity( double value ) const {
return StochasticSampledParameter::probabilityDensity( value );
}
@@ -57,11 +57,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else
+ else{
this->StochasticSampledParameter::setToRandom( );
+ }
}
-
void default_setToRandom( ) {
StochasticSampledParameter::setToRandom( );
}
@@ -69,11 +69,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else
+ else{
return this->StochasticParameter< double >::getFWHM( );
+ }
}
-
double default_getFWHM( ) const {
return StochasticParameter< double >::getFWHM( );
}
@@ -81,11 +81,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else
+ else{
return this->StochasticParameter< double >::getRandom( );
+ }
}
-
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -93,11 +93,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else
+ else{
this->StochasticParameter< double >::setToAverage( );
+ }
}
-
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
@@ -108,9 +108,9 @@ void register_StochasticSampledParameter_class(){
{ //::StochasticSampledParameter
typedef bp::class_< StochasticSampledParameter_wrapper, bp::bases< StochasticParameter< double > >, boost::noncopyable > StochasticSampledParameter_exposer_t;
- StochasticSampledParameter_exposer_t StochasticSampledParameter_exposer = StochasticSampledParameter_exposer_t( "StochasticSampledParameter", bp::init< StochasticParameter< double > const &, std::size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) );
+ StochasticSampledParameter_exposer_t StochasticSampledParameter_exposer = StochasticSampledParameter_exposer_t( "StochasticSampledParameter", bp::init< StochasticParameter< double > const &, size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) );
bp::scope StochasticSampledParameter_scope( StochasticSampledParameter_exposer );
- StochasticSampledParameter_exposer.def( bp::init< StochasticParameter< double > const &, std::size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) );
+ StochasticSampledParameter_exposer.def( bp::init< StochasticParameter< double > const &, size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) );
{ //::StochasticSampledParameter::clone
typedef ::StochasticSampledParameter * ( ::StochasticSampledParameter::*clone_function_type )( ) const;
@@ -125,7 +125,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getBinValue
- typedef double ( ::StochasticSampledParameter::*getBinValue_function_type )( ::std::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*getBinValue_function_type )( ::size_t ) const;
StochasticSampledParameter_exposer.def(
"getBinValue"
@@ -135,7 +135,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getNbins
- typedef ::std::size_t ( ::StochasticSampledParameter::*getNbins_function_type )( ) const;
+ typedef ::size_t ( ::StochasticSampledParameter::*getNbins_function_type )( ) const;
StochasticSampledParameter_exposer.def(
"getNbins"
@@ -144,7 +144,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getNormalizedProbability
- typedef double ( ::StochasticSampledParameter::*getNormalizedProbability_function_type )( ::std::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*getNormalizedProbability_function_type )( ::size_t ) const;
StochasticSampledParameter_exposer.def(
"getNormalizedProbability"
@@ -154,7 +154,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::probabilityBinDensity
- typedef double ( ::StochasticSampledParameter::*probabilityBinDensity_function_type )( ::std::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*probabilityBinDensity_function_type )( ::size_t ) const;
StochasticSampledParameter_exposer.def(
"probabilityBinDensity"
diff --git a/Core/Samples/src/InterferenceFunction2DLattice.cpp b/Core/Samples/src/InterferenceFunction2DLattice.cpp
index bd498d55399a2668eba45f158712a27ec637d558..ce01f75a3a2903ac1c31b01793df9d5643fd8441 100644
--- a/Core/Samples/src/InterferenceFunction2DLattice.cpp
+++ b/Core/Samples/src/InterferenceFunction2DLattice.cpp
@@ -117,7 +117,9 @@ void InterferenceFunction2DLattice::init_parameters()
void InterferenceFunction2DLattice::initialize_rec_vectors()
{
if(m_lattice_params.m_length_1==0 || m_lattice_params.m_length_2 == 0) {
- throw DivisionByZeroException("InterferenceFunction2DLattice::initialize_rec_vectors() -> Error! Zero parameters m_lattice_params.m_length1 or m_lattice_params.m_length_2");
+ throw DivisionByZeroException("InterferenceFunction2DLattice::"
+ "initialize_rec_vectors() -> Error! Zero parameters"
+ " m_lattice_params.m_length1 or m_lattice_params.m_length_2");
}
double sinalpha = std::sin(m_lattice_params.m_angle);
double ainv = 2*M_PI/m_lattice_params.m_length_1/sinalpha;
@@ -134,16 +136,15 @@ void InterferenceFunction2DLattice::initialize_calc_factors()
{
// constant prefactor
//TODO: for non cauchy distributions: check if this still applies
- m_prefactor = 2*M_PI*m_lattice_params.m_corr_length_1*m_lattice_params.m_corr_length_2;
- double denominator = m_lattice_params.m_length_1*m_lattice_params.m_length_2*std::sin(m_lattice_params.m_angle);
- assert(denominator);
- m_prefactor /= denominator;
+ m_prefactor = 2.0*M_PI*m_lattice_params.m_corr_length_1
+ *m_lattice_params.m_corr_length_2;
// number of reciprocal lattice points to use
double qa_max, qb_max;
mp_pdf->transformToStarBasis(nmax/m_lattice_params.m_corr_length_1,
nmax/m_lattice_params.m_corr_length_2, m_lattice_params.m_angle,
- m_lattice_params.m_length_1, m_lattice_params.m_length_2, qa_max, qb_max);
+ m_lattice_params.m_length_1, m_lattice_params.m_length_2,
+ qa_max, qb_max);
m_na = (int)(std::abs(qa_max)+0.5);
m_nb = (int)(std::abs(qb_max)+0.5);
}
diff --git a/Core/python_module.pri b/Core/python_module.pri
index ad5fb6536af69ef782ab7839ea80369e6fcf1c80..6546e3ba35a630a6614ba116c853f8c73b4f51fe 100644
--- a/Core/python_module.pri
+++ b/Core/python_module.pri
@@ -4,95 +4,95 @@ HEADERS += \
PythonAPI/inc/PythonOutputData.h \
PythonAPI/inc/PythonCoreExposer.h \
PythonAPI/inc/PythonCoreList.h \
- PythonAPI/inc/RotateZ_3D.pypp.h \
- PythonAPI/inc/IFTDistribution2D.pypp.h \
- PythonAPI/inc/Detector.pypp.h \
- PythonAPI/inc/LatticeBasis.pypp.h \
- PythonAPI/inc/ParticleCoreShell.pypp.h \
+ PythonAPI/inc/AxisBin.pypp.h \
+ PythonAPI/inc/AxisDouble.pypp.h \
PythonAPI/inc/Beam.pypp.h \
- PythonAPI/inc/Lattice.pypp.h \
+ PythonAPI/inc/Bin1D.pypp.h \
+ PythonAPI/inc/Bin1DCVector.pypp.h \
+ PythonAPI/inc/Crystal.pypp.h \
+ PythonAPI/inc/Detector.pypp.h \
+ PythonAPI/inc/FTDistribution2DCauchy.pypp.h \
+ PythonAPI/inc/FormFactorBox.pypp.h \
+ PythonAPI/inc/FormFactorCone.pypp.h \
+ PythonAPI/inc/FormFactorCrystal.pypp.h \
PythonAPI/inc/FormFactorCylinder.pypp.h \
- PythonAPI/inc/ICloneable.pypp.h \
- PythonAPI/inc/StochasticSampledParameter.pypp.h \
+ PythonAPI/inc/FormFactorDecoratorDebyeWaller.pypp.h \
+ PythonAPI/inc/FormFactorEllipsoid.pypp.h \
+ PythonAPI/inc/FormFactorFullSphere.pypp.h \
+ PythonAPI/inc/FormFactorFullSpheroid.pypp.h \
+ PythonAPI/inc/FormFactorGauss.pypp.h \
+ PythonAPI/inc/FormFactorHemiSpheroid.pypp.h \
+ PythonAPI/inc/FormFactorLorentz.pypp.h \
+ PythonAPI/inc/FormFactorParallelepiped.pypp.h \
+ PythonAPI/inc/FormFactorPrism3.pypp.h \
+ PythonAPI/inc/FormFactorPrism6.pypp.h \
+ PythonAPI/inc/FormFactorPyramid.pypp.h \
+ PythonAPI/inc/FormFactorSphere.pypp.h \
+ PythonAPI/inc/FormFactorSphereGaussianRadius.pypp.h \
PythonAPI/inc/HomogeneousMaterial.pypp.h \
- PythonAPI/inc/vector_integer_t.pypp.h \
- PythonAPI/inc/AxisDouble.pypp.h \
PythonAPI/inc/IAxis.pypp.h \
- PythonAPI/inc/Layer.pypp.h \
+ PythonAPI/inc/ICloneable.pypp.h \
+ PythonAPI/inc/IClusteredParticles.pypp.h \
+ PythonAPI/inc/ICompositeSample.pypp.h \
+ PythonAPI/inc/IDecoration.pypp.h \
+ PythonAPI/inc/IDetectorResolution.pypp.h \
+ PythonAPI/inc/IFTDistribution2D.pypp.h \
PythonAPI/inc/IFormFactor.pypp.h \
+ PythonAPI/inc/IFormFactorBorn.pypp.h \
+ PythonAPI/inc/IFormFactorDecorator.pypp.h \
+ PythonAPI/inc/IInterferenceFunction.pypp.h \
+ PythonAPI/inc/IMaterial.pypp.h \
PythonAPI/inc/IObservable.pypp.h \
- PythonAPI/inc/FormFactorParallelepiped.pypp.h \
- PythonAPI/inc/RealParameterWrapper.pypp.h \
- PythonAPI/inc/MaterialManager.pypp.h \
- PythonAPI/inc/ResolutionFunction2DSimple.pypp.h \
- PythonAPI/inc/SimulationParameters.pypp.h \
- PythonAPI/inc/AxisBin.pypp.h \
- PythonAPI/inc/FormFactorGauss.pypp.h \
- PythonAPI/inc/FormFactorFullSpheroid.pypp.h \
- PythonAPI/inc/PythonInterface_global_variables.pypp.h \
+ PythonAPI/inc/IObserver.pypp.h \
+ PythonAPI/inc/IParameterized.pypp.h \
+ PythonAPI/inc/IResolutionFunction2D.pypp.h \
+ PythonAPI/inc/ISample.pypp.h \
PythonAPI/inc/ISampleBuilder.pypp.h \
- PythonAPI/inc/StochasticParameter_t.pypp.h \
- PythonAPI/inc/StochasticDoubleGaussian.pypp.h \
- PythonAPI/inc/FormFactorPrism6.pypp.h \
+ PythonAPI/inc/ISelectionRule.pypp.h \
+ PythonAPI/inc/ITransform3D.pypp.h \
+ PythonAPI/inc/Instrument.pypp.h \
+ PythonAPI/inc/IntensityData.pypp.h \
+ PythonAPI/inc/InterferenceFunction1DParaCrystal.pypp.h \
PythonAPI/inc/InterferenceFunction2DLattice.pypp.h \
- PythonAPI/inc/FormFactorPyramid.pypp.h \
- PythonAPI/inc/FormFactorBox.pypp.h \
- PythonAPI/inc/IResolutionFunction2D.pypp.h \
- PythonAPI/inc/IFormFactorBorn.pypp.h \
+ PythonAPI/inc/InterferenceFunction2DParaCrystal.pypp.h \
+ PythonAPI/inc/InterferenceFunctionNone.pypp.h \
+ PythonAPI/inc/Lattice.pypp.h \
+ PythonAPI/inc/Lattice2DIFParameters.pypp.h \
+ PythonAPI/inc/LatticeBasis.pypp.h \
+ PythonAPI/inc/Layer.pypp.h \
+ PythonAPI/inc/LayerInterface.pypp.h \
+ PythonAPI/inc/LayerRoughness.pypp.h \
+ PythonAPI/inc/MaterialManager.pypp.h \
+ PythonAPI/inc/MesoCrystal.pypp.h \
PythonAPI/inc/MultiLayer.pypp.h \
- PythonAPI/inc/ITransform3D.pypp.h \
- PythonAPI/inc/ParticleDecoration.pypp.h \
- PythonAPI/inc/IDecoration.pypp.h \
- PythonAPI/inc/FTDistribution2DCauchy.pypp.h \
- PythonAPI/inc/ICompositeSample.pypp.h \
- PythonAPI/inc/cvector_t.pypp.h \
+ PythonAPI/inc/OutputDataIOFactory.pypp.h \
PythonAPI/inc/ParameterPool.pypp.h \
PythonAPI/inc/Particle.pypp.h \
- PythonAPI/inc/FormFactorCone.pypp.h \
- PythonAPI/inc/FormFactorPrism3.pypp.h \
- PythonAPI/inc/InterferenceFunction2DParaCrystal.pypp.h \
- PythonAPI/inc/vdouble1d_t.pypp.h \
- PythonAPI/inc/MesoCrystal.pypp.h \
- PythonAPI/inc/RotateY_3D.pypp.h \
- PythonAPI/inc/FormFactorDecoratorDebyeWaller.pypp.h \
- PythonAPI/inc/vector_IFormFactorPtr_t.pypp.h \
- PythonAPI/inc/IMaterial.pypp.h \
- PythonAPI/inc/IFormFactorDecorator.pypp.h \
- PythonAPI/inc/Instrument.pypp.h \
- PythonAPI/inc/IDetectorResolution.pypp.h \
- PythonAPI/inc/ISelectionRule.pypp.h \
- PythonAPI/inc/Bin1D.pypp.h \
+ PythonAPI/inc/ParticleBuilder.pypp.h \
+ PythonAPI/inc/ParticleCoreShell.pypp.h \
+ PythonAPI/inc/ParticleDecoration.pypp.h \
PythonAPI/inc/ParticleInfo.pypp.h \
- PythonAPI/inc/vector_longinteger_t.pypp.h \
- PythonAPI/inc/FormFactorHemiSpheroid.pypp.h \
- PythonAPI/inc/LayerInterface.pypp.h \
- PythonAPI/inc/FormFactorFullSphere.pypp.h \
PythonAPI/inc/PositionParticleInfo.pypp.h \
- PythonAPI/inc/LayerRoughness.pypp.h \
- PythonAPI/inc/FormFactorCrystal.pypp.h \
- PythonAPI/inc/IntensityData.pypp.h \
- PythonAPI/inc/IParameterized.pypp.h \
- PythonAPI/inc/Bin1DCVector.pypp.h \
- PythonAPI/inc/StochasticDoubleGate.pypp.h \
- PythonAPI/inc/IClusteredParticles.pypp.h \
- PythonAPI/inc/IInterferenceFunction.pypp.h \
- PythonAPI/inc/SimpleSelectionRule.pypp.h \
- PythonAPI/inc/FormFactorLorentz.pypp.h \
- PythonAPI/inc/OutputDataIOFactory.pypp.h \
- PythonAPI/inc/vector_kvector_t.pypp.h \
- PythonAPI/inc/InterferenceFunction1DParaCrystal.pypp.h \
- PythonAPI/inc/InterferenceFunctionNone.pypp.h \
- PythonAPI/inc/Crystal.pypp.h \
PythonAPI/inc/PythonInterface_free_functions.pypp.h \
- PythonAPI/inc/kvector_t.pypp.h \
- PythonAPI/inc/FormFactorEllipsoid.pypp.h \
+ PythonAPI/inc/PythonInterface_global_variables.pypp.h \
+ PythonAPI/inc/RealParameterWrapper.pypp.h \
+ PythonAPI/inc/ResolutionFunction2DSimple.pypp.h \
+ PythonAPI/inc/RotateY_3D.pypp.h \
+ PythonAPI/inc/RotateZ_3D.pypp.h \
+ PythonAPI/inc/SimpleSelectionRule.pypp.h \
PythonAPI/inc/Simulation.pypp.h \
- PythonAPI/inc/ISample.pypp.h \
- PythonAPI/inc/IObserver.pypp.h \
- PythonAPI/inc/ParticleBuilder.pypp.h \
- PythonAPI/inc/FormFactorSphereGaussianRadius.pypp.h \
- PythonAPI/inc/Lattice2DIFParameters.pypp.h \
- PythonAPI/inc/FormFactorSphere.pypp.h \
+ PythonAPI/inc/SimulationParameters.pypp.h \
+ PythonAPI/inc/StochasticDoubleGate.pypp.h \
+ PythonAPI/inc/StochasticDoubleGaussian.pypp.h \
+ PythonAPI/inc/StochasticParameter_t.pypp.h \
+ PythonAPI/inc/StochasticSampledParameter.pypp.h \
+ PythonAPI/inc/cvector_t.pypp.h \
+ PythonAPI/inc/kvector_t.pypp.h \
+ PythonAPI/inc/vdouble1d_t.pypp.h \
+ PythonAPI/inc/vector_IFormFactorPtr_t.pypp.h \
+ PythonAPI/inc/vector_integer_t.pypp.h \
+ PythonAPI/inc/vector_kvector_t.pypp.h \
+ PythonAPI/inc/vector_longinteger_t.pypp.h \
PythonAPI/inc/__call_policies.pypp.hpp \
PythonAPI/inc/__convenience.pypp.hpp
@@ -100,95 +100,95 @@ SOURCES += \
PythonAPI/src/PythonModule.cpp \
PythonAPI/src/PythonListConverter.cpp \
PythonAPI/src/PythonOutputData.cpp \
- PythonAPI/src/ParticleCoreShell.pypp.cpp \
- PythonAPI/src/kvector_t.pypp.cpp \
- PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp \
- PythonAPI/src/FormFactorSphere.pypp.cpp \
- PythonAPI/src/FormFactorLorentz.pypp.cpp \
+ PythonAPI/src/AxisBin.pypp.cpp \
+ PythonAPI/src/AxisDouble.pypp.cpp \
+ PythonAPI/src/Beam.pypp.cpp \
+ PythonAPI/src/Bin1D.pypp.cpp \
+ PythonAPI/src/Bin1DCVector.pypp.cpp \
+ PythonAPI/src/Crystal.pypp.cpp \
+ PythonAPI/src/Detector.pypp.cpp \
+ PythonAPI/src/FTDistribution2DCauchy.pypp.cpp \
+ PythonAPI/src/FormFactorBox.pypp.cpp \
+ PythonAPI/src/FormFactorCone.pypp.cpp \
+ PythonAPI/src/FormFactorCrystal.pypp.cpp \
PythonAPI/src/FormFactorCylinder.pypp.cpp \
- PythonAPI/src/ISelectionRule.pypp.cpp \
- PythonAPI/src/InterferenceFunctionNone.pypp.cpp \
- PythonAPI/src/IResolutionFunction2D.pypp.cpp \
- PythonAPI/src/ITransform3D.pypp.cpp \
- PythonAPI/src/Layer.pypp.cpp \
- PythonAPI/src/Lattice2DIFParameters.pypp.cpp \
+ PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp \
+ PythonAPI/src/FormFactorEllipsoid.pypp.cpp \
+ PythonAPI/src/FormFactorFullSphere.pypp.cpp \
+ PythonAPI/src/FormFactorFullSpheroid.pypp.cpp \
+ PythonAPI/src/FormFactorGauss.pypp.cpp \
+ PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp \
+ PythonAPI/src/FormFactorLorentz.pypp.cpp \
PythonAPI/src/FormFactorParallelepiped.pypp.cpp \
- PythonAPI/src/ISample.pypp.cpp \
- PythonAPI/src/MultiLayer.pypp.cpp \
+ PythonAPI/src/FormFactorPrism3.pypp.cpp \
PythonAPI/src/FormFactorPrism6.pypp.cpp \
PythonAPI/src/FormFactorPyramid.pypp.cpp \
+ PythonAPI/src/FormFactorSphere.pypp.cpp \
+ PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp \
+ PythonAPI/src/HomogeneousMaterial.pypp.cpp \
PythonAPI/src/IAxis.pypp.cpp \
- PythonAPI/src/vdouble1d_t.pypp.cpp \
- PythonAPI/src/IFormFactorDecorator.pypp.cpp \
- PythonAPI/src/Bin1D.pypp.cpp \
- PythonAPI/src/IParameterized.pypp.cpp \
- PythonAPI/src/PythonInterface_global_variables.pypp.cpp \
- PythonAPI/src/IInterferenceFunction.pypp.cpp \
- PythonAPI/src/RealParameterWrapper.pypp.cpp \
- PythonAPI/src/PythonInterface_free_functions.pypp.cpp \
- PythonAPI/src/MesoCrystal.pypp.cpp \
- PythonAPI/src/FormFactorCrystal.pypp.cpp \
- PythonAPI/src/ISampleBuilder.pypp.cpp \
- PythonAPI/src/StochasticSampledParameter.pypp.cpp \
- PythonAPI/src/FormFactorFullSphere.pypp.cpp \
- PythonAPI/src/StochasticParameter_t.pypp.cpp \
- PythonAPI/src/AxisBin.pypp.cpp \
- PythonAPI/src/SimpleSelectionRule.pypp.cpp \
- PythonAPI/src/IDecoration.pypp.cpp \
- PythonAPI/src/FTDistribution2DCauchy.pypp.cpp \
- PythonAPI/src/IFTDistribution2D.pypp.cpp \
PythonAPI/src/ICloneable.pypp.cpp \
- PythonAPI/src/ParticleInfo.pypp.cpp \
- PythonAPI/src/ParticleDecoration.pypp.cpp \
- PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp \
PythonAPI/src/IClusteredParticles.pypp.cpp \
- PythonAPI/src/Particle.pypp.cpp \
- PythonAPI/src/IObserver.pypp.cpp \
- PythonAPI/src/Lattice.pypp.cpp \
- PythonAPI/src/vector_longinteger_t.pypp.cpp \
+ PythonAPI/src/ICompositeSample.pypp.cpp \
+ PythonAPI/src/IDecoration.pypp.cpp \
+ PythonAPI/src/IDetectorResolution.pypp.cpp \
+ PythonAPI/src/IFTDistribution2D.pypp.cpp \
+ PythonAPI/src/IFormFactor.pypp.cpp \
+ PythonAPI/src/IFormFactorBorn.pypp.cpp \
+ PythonAPI/src/IFormFactorDecorator.pypp.cpp \
+ PythonAPI/src/IInterferenceFunction.pypp.cpp \
PythonAPI/src/IMaterial.pypp.cpp \
+ PythonAPI/src/IObservable.pypp.cpp \
+ PythonAPI/src/IObserver.pypp.cpp \
+ PythonAPI/src/IParameterized.pypp.cpp \
+ PythonAPI/src/IResolutionFunction2D.pypp.cpp \
+ PythonAPI/src/ISample.pypp.cpp \
+ PythonAPI/src/ISampleBuilder.pypp.cpp \
+ PythonAPI/src/ISelectionRule.pypp.cpp \
+ PythonAPI/src/ITransform3D.pypp.cpp \
+ PythonAPI/src/Instrument.pypp.cpp \
+ PythonAPI/src/IntensityData.pypp.cpp \
+ PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp \
PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp \
- PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp \
- PythonAPI/src/Detector.pypp.cpp \
- PythonAPI/src/Bin1DCVector.pypp.cpp \
- PythonAPI/src/HomogeneousMaterial.pypp.cpp \
- PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp \
- PythonAPI/src/vector_integer_t.pypp.cpp \
- PythonAPI/src/OutputDataIOFactory.pypp.cpp \
- PythonAPI/src/ParameterPool.pypp.cpp \
PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp \
- PythonAPI/src/FormFactorCone.pypp.cpp \
- PythonAPI/src/Simulation.pypp.cpp \
- PythonAPI/src/IntensityData.pypp.cpp \
- PythonAPI/src/AxisDouble.pypp.cpp \
- PythonAPI/src/FormFactorFullSpheroid.pypp.cpp \
+ PythonAPI/src/InterferenceFunctionNone.pypp.cpp \
+ PythonAPI/src/Lattice.pypp.cpp \
+ PythonAPI/src/Lattice2DIFParameters.pypp.cpp \
+ PythonAPI/src/LatticeBasis.pypp.cpp \
+ PythonAPI/src/Layer.pypp.cpp \
+ PythonAPI/src/LayerInterface.pypp.cpp \
+ PythonAPI/src/LayerRoughness.pypp.cpp \
PythonAPI/src/MaterialManager.pypp.cpp \
- PythonAPI/src/IObservable.pypp.cpp \
+ PythonAPI/src/MesoCrystal.pypp.cpp \
+ PythonAPI/src/MultiLayer.pypp.cpp \
+ PythonAPI/src/OutputDataIOFactory.pypp.cpp \
+ PythonAPI/src/ParameterPool.pypp.cpp \
+ PythonAPI/src/Particle.pypp.cpp \
PythonAPI/src/ParticleBuilder.pypp.cpp \
- PythonAPI/src/Instrument.pypp.cpp \
- PythonAPI/src/FormFactorGauss.pypp.cpp \
- PythonAPI/src/FormFactorPrism3.pypp.cpp \
+ PythonAPI/src/ParticleCoreShell.pypp.cpp \
+ PythonAPI/src/ParticleDecoration.pypp.cpp \
+ PythonAPI/src/ParticleInfo.pypp.cpp \
PythonAPI/src/PositionParticleInfo.pypp.cpp \
- PythonAPI/src/ICompositeSample.pypp.cpp \
- PythonAPI/src/Beam.pypp.cpp \
- PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp \
- PythonAPI/src/IFormFactor.pypp.cpp \
- PythonAPI/src/FormFactorBox.pypp.cpp \
- PythonAPI/src/IDetectorResolution.pypp.cpp \
- PythonAPI/src/RotateZ_3D.pypp.cpp \
- PythonAPI/src/LayerInterface.pypp.cpp \
- PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp \
+ PythonAPI/src/PythonInterface_free_functions.pypp.cpp \
+ PythonAPI/src/PythonInterface_global_variables.pypp.cpp \
+ PythonAPI/src/RealParameterWrapper.pypp.cpp \
+ PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp \
PythonAPI/src/RotateY_3D.pypp.cpp \
+ PythonAPI/src/RotateZ_3D.pypp.cpp \
+ PythonAPI/src/SimpleSelectionRule.pypp.cpp \
+ PythonAPI/src/Simulation.pypp.cpp \
+ PythonAPI/src/SimulationParameters.pypp.cpp \
PythonAPI/src/StochasticDoubleGate.pypp.cpp \
+ PythonAPI/src/StochasticDoubleGaussian.pypp.cpp \
+ PythonAPI/src/StochasticParameter_t.pypp.cpp \
+ PythonAPI/src/StochasticSampledParameter.pypp.cpp \
PythonAPI/src/cvector_t.pypp.cpp \
- PythonAPI/src/SimulationParameters.pypp.cpp \
- PythonAPI/src/IFormFactorBorn.pypp.cpp \
+ PythonAPI/src/kvector_t.pypp.cpp \
+ PythonAPI/src/vdouble1d_t.pypp.cpp \
+ PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp \
+ PythonAPI/src/vector_integer_t.pypp.cpp \
PythonAPI/src/vector_kvector_t.pypp.cpp \
- PythonAPI/src/FormFactorEllipsoid.pypp.cpp \
- PythonAPI/src/LayerRoughness.pypp.cpp \
- PythonAPI/src/LatticeBasis.pypp.cpp \
- PythonAPI/src/StochasticDoubleGaussian.pypp.cpp \
- PythonAPI/src/Crystal.pypp.cpp
+ PythonAPI/src/vector_longinteger_t.pypp.cpp
INCLUDEPATH += ./PythonAPI/inc
DEPENDPATH += ./PythonAPI/inc
diff --git a/Fit/PythonAPI/src/AttLimits.pypp.cpp b/Fit/PythonAPI/src/AttLimits.pypp.cpp
index 9faa92236e7264e872e5aa990419aca05dc8b399..e9ebeee424eb2c646fdbec7c49aea06ddc19540b 100644
--- a/Fit/PythonAPI/src/AttLimits.pypp.cpp
+++ b/Fit/PythonAPI/src/AttLimits.pypp.cpp
@@ -33,11 +33,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual double getLowerLimit( ) const {
if( bp::override func_getLowerLimit = this->get_override( "getLowerLimit" ) )
return func_getLowerLimit( );
- else
+ else{
return this->AttLimits::getLowerLimit( );
+ }
}
-
double default_getLowerLimit( ) const {
return AttLimits::getLowerLimit( );
}
@@ -45,11 +45,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual double getUpperLimit( ) const {
if( bp::override func_getUpperLimit = this->get_override( "getUpperLimit" ) )
return func_getUpperLimit( );
- else
+ else{
return this->AttLimits::getUpperLimit( );
+ }
}
-
double default_getUpperLimit( ) const {
return AttLimits::getUpperLimit( );
}
@@ -57,11 +57,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasLowerAndUpperLimits( ) const {
if( bp::override func_hasLowerAndUpperLimits = this->get_override( "hasLowerAndUpperLimits" ) )
return func_hasLowerAndUpperLimits( );
- else
+ else{
return this->AttLimits::hasLowerAndUpperLimits( );
+ }
}
-
bool default_hasLowerAndUpperLimits( ) const {
return AttLimits::hasLowerAndUpperLimits( );
}
@@ -69,11 +69,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasLowerLimit( ) const {
if( bp::override func_hasLowerLimit = this->get_override( "hasLowerLimit" ) )
return func_hasLowerLimit( );
- else
+ else{
return this->AttLimits::hasLowerLimit( );
+ }
}
-
bool default_hasLowerLimit( ) const {
return AttLimits::hasLowerLimit( );
}
@@ -81,11 +81,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasUpperLimit( ) const {
if( bp::override func_hasUpperLimit = this->get_override( "hasUpperLimit" ) )
return func_hasUpperLimit( );
- else
+ else{
return this->AttLimits::hasUpperLimit( );
+ }
}
-
bool default_hasUpperLimit( ) const {
return AttLimits::hasUpperLimit( );
}
@@ -93,11 +93,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool isFixed( ) const {
if( bp::override func_isFixed = this->get_override( "isFixed" ) )
return func_isFixed( );
- else
+ else{
return this->AttLimits::isFixed( );
+ }
}
-
bool default_isFixed( ) const {
return AttLimits::isFixed( );
}
@@ -105,11 +105,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeLimits( ) {
if( bp::override func_removeLimits = this->get_override( "removeLimits" ) )
func_removeLimits( );
- else
+ else{
this->AttLimits::removeLimits( );
+ }
}
-
void default_removeLimits( ) {
AttLimits::removeLimits( );
}
@@ -117,11 +117,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeLowerLimit( ) {
if( bp::override func_removeLowerLimit = this->get_override( "removeLowerLimit" ) )
func_removeLowerLimit( );
- else
+ else{
this->AttLimits::removeLowerLimit( );
+ }
}
-
void default_removeLowerLimit( ) {
AttLimits::removeLowerLimit( );
}
@@ -129,11 +129,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeUpperLimit( ) {
if( bp::override func_removeUpperLimit = this->get_override( "removeUpperLimit" ) )
func_removeUpperLimit( );
- else
+ else{
this->AttLimits::removeUpperLimit( );
+ }
}
-
void default_removeUpperLimit( ) {
AttLimits::removeUpperLimit( );
}
@@ -141,11 +141,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setFixed( bool is_fixed ) {
if( bp::override func_setFixed = this->get_override( "setFixed" ) )
func_setFixed( is_fixed );
- else
+ else{
this->AttLimits::setFixed( is_fixed );
+ }
}
-
void default_setFixed( bool is_fixed ) {
AttLimits::setFixed( is_fixed );
}
@@ -153,11 +153,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setLimits( double xmin, double xmax ) {
if( bp::override func_setLimits = this->get_override( "setLimits" ) )
func_setLimits( xmin, xmax );
- else
+ else{
this->AttLimits::setLimits( xmin, xmax );
+ }
}
-
void default_setLimits( double xmin, double xmax ) {
AttLimits::setLimits( xmin, xmax );
}
@@ -165,11 +165,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setLowerLimit( double value ) {
if( bp::override func_setLowerLimit = this->get_override( "setLowerLimit" ) )
func_setLowerLimit( value );
- else
+ else{
this->AttLimits::setLowerLimit( value );
+ }
}
-
void default_setLowerLimit( double value ) {
AttLimits::setLowerLimit( value );
}
@@ -177,11 +177,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setUpperLimit( double value ) {
if( bp::override func_setUpperLimit = this->get_override( "setUpperLimit" ) )
func_setUpperLimit( value );
- else
+ else{
this->AttLimits::setUpperLimit( value );
+ }
}
-
void default_setUpperLimit( double value ) {
AttLimits::setUpperLimit( value );
}
diff --git a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
index b2e416fca359015f2890a5d361248bb319b20c11..85ec4492f73bcc75250442d5e346b3def2042761 100644
--- a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
@@ -33,11 +33,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual double calculateChiSquared( ) {
if( bp::override func_calculateChiSquared = this->get_override( "calculateChiSquared" ) )
return func_calculateChiSquared( );
- else
+ else{
return this->ChiSquaredModule::calculateChiSquared( );
+ }
}
-
double default_calculateChiSquared( ) {
return ChiSquaredModule::calculateChiSquared( );
}
@@ -45,11 +45,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::ChiSquaredModule * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->ChiSquaredModule::clone( );
+ }
}
-
::ChiSquaredModule * default_clone( ) const {
return ChiSquaredModule::clone( );
}
@@ -57,35 +57,35 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::OutputData< double > * createChi2DifferenceMap( ) const {
if( bp::override func_createChi2DifferenceMap = this->get_override( "createChi2DifferenceMap" ) )
return func_createChi2DifferenceMap( );
- else
+ else{
return this->ChiSquaredModule::createChi2DifferenceMap( );
+ }
}
-
::OutputData< double > * default_createChi2DifferenceMap( ) const {
return ChiSquaredModule::createChi2DifferenceMap( );
}
- virtual double getResidualValue( ::std::size_t index ) const {
+ virtual double getResidualValue( ::size_t index ) const {
if( bp::override func_getResidualValue = this->get_override( "getResidualValue" ) )
return func_getResidualValue( index );
- else
+ else{
return this->ChiSquaredModule::getResidualValue( index );
+ }
}
-
- double default_getResidualValue( ::std::size_t index ) const {
+ double default_getResidualValue( ::size_t index ) const {
return ChiSquaredModule::getResidualValue( index );
}
virtual ::IFittingDataSelector const * getFittingDataSelector( ) const {
if( bp::override func_getFittingDataSelector = this->get_override( "getFittingDataSelector" ) )
return func_getFittingDataSelector( );
- else
+ else{
return this->IChiSquaredModule::getFittingDataSelector( );
+ }
}
-
::IFittingDataSelector const * default_getFittingDataSelector( ) const {
return IChiSquaredModule::getFittingDataSelector( );
}
@@ -93,11 +93,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IIntensityFunction const * getIntensityFunction( ) const {
if( bp::override func_getIntensityFunction = this->get_override( "getIntensityFunction" ) )
return func_getIntensityFunction( );
- else
+ else{
return this->IChiSquaredModule::getIntensityFunction( );
+ }
}
-
::IIntensityFunction const * default_getIntensityFunction( ) const {
return IChiSquaredModule::getIntensityFunction( );
}
@@ -105,11 +105,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IOutputDataNormalizer const * getOutputDataNormalizer( ) const {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else
+ else{
return this->IChiSquaredModule::getOutputDataNormalizer( );
+ }
}
-
::IOutputDataNormalizer const * default_getOutputDataNormalizer( ) const {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -117,11 +117,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IOutputDataNormalizer * getOutputDataNormalizer( ) {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else
+ else{
return this->IChiSquaredModule::getOutputDataNormalizer( );
+ }
}
-
::IOutputDataNormalizer * default_getOutputDataNormalizer( ) {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -129,11 +129,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
- else
+ else{
this->IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
+ }
}
-
void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
@@ -141,11 +141,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
- else
+ else{
this->IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
+ }
}
-
void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
@@ -153,11 +153,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
- else
+ else{
this->IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
+ }
}
-
void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -208,8 +208,8 @@ void register_ChiSquaredModule_class(){
}
{ //::ChiSquaredModule::getResidualValue
- typedef double ( ::ChiSquaredModule::*getResidualValue_function_type )( ::std::size_t ) const;
- typedef double ( ChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::std::size_t ) const;
+ typedef double ( ::ChiSquaredModule::*getResidualValue_function_type )( ::size_t ) const;
+ typedef double ( ChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::size_t ) const;
ChiSquaredModule_exposer.def(
"getResidualValue"
diff --git a/Fit/PythonAPI/src/FitObject.pypp.cpp b/Fit/PythonAPI/src/FitObject.pypp.cpp
index 44aaab36a69611d610f24ad1a4406eaad38762a8..c07985a9a329cf89787a1e30ff2de6343296d99a 100644
--- a/Fit/PythonAPI/src/FitObject.pypp.cpp
+++ b/Fit/PythonAPI/src/FitObject.pypp.cpp
@@ -91,7 +91,7 @@ void register_FitObject_class(){
}
{ //::FitObject::getSizeOfData
- typedef ::std::size_t ( ::FitObject::*getSizeOfData_function_type )( ) const;
+ typedef ::size_t ( ::FitObject::*getSizeOfData_function_type )( ) const;
FitObject_exposer.def(
"getSizeOfData"
diff --git a/Fit/PythonAPI/src/FitParameter.pypp.cpp b/Fit/PythonAPI/src/FitParameter.pypp.cpp
index 36fb7bcb1518619f7be884fc4c0291eed66dd9dd..719bdf807ebbde7074da6fe83fae832c507d7bac 100644
--- a/Fit/PythonAPI/src/FitParameter.pypp.cpp
+++ b/Fit/PythonAPI/src/FitParameter.pypp.cpp
@@ -40,11 +40,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getError( ) const {
if( bp::override func_getError = this->get_override( "getError" ) )
return func_getError( );
- else
+ else{
return this->FitParameter::getError( );
+ }
}
-
double default_getError( ) const {
return FitParameter::getError( );
}
@@ -52,11 +52,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getStep( ) const {
if( bp::override func_getStep = this->get_override( "getStep" ) )
return func_getStep( );
- else
+ else{
return this->FitParameter::getStep( );
+ }
}
-
double default_getStep( ) const {
return FitParameter::getStep( );
}
@@ -64,11 +64,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getValue( ) const {
if( bp::override func_getValue = this->get_override( "getValue" ) )
return func_getValue( );
- else
+ else{
return this->FitParameter::getValue( );
+ }
}
-
double default_getValue( ) const {
return FitParameter::getValue( );
}
@@ -76,11 +76,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setError( double value ) {
if( bp::override func_setError = this->get_override( "setError" ) )
func_setError( value );
- else
+ else{
this->FitParameter::setError( value );
+ }
}
-
void default_setError( double value ) {
FitParameter::setError( value );
}
@@ -88,11 +88,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setStep( double value ) {
if( bp::override func_setStep = this->get_override( "setStep" ) )
func_setStep( value );
- else
+ else{
this->FitParameter::setStep( value );
+ }
}
-
void default_setStep( double value ) {
FitParameter::setStep( value );
}
@@ -100,11 +100,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setValue( double value ) {
if( bp::override func_setValue = this->get_override( "setValue" ) )
func_setValue( value );
- else
+ else{
this->FitParameter::setValue( value );
+ }
}
-
void default_setValue( double value ) {
FitParameter::setValue( value );
}
@@ -112,11 +112,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getLowerLimit( ) const {
if( bp::override func_getLowerLimit = this->get_override( "getLowerLimit" ) )
return func_getLowerLimit( );
- else
+ else{
return this->AttLimits::getLowerLimit( );
+ }
}
-
double default_getLowerLimit( ) const {
return AttLimits::getLowerLimit( );
}
@@ -124,11 +124,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual double getUpperLimit( ) const {
if( bp::override func_getUpperLimit = this->get_override( "getUpperLimit" ) )
return func_getUpperLimit( );
- else
+ else{
return this->AttLimits::getUpperLimit( );
+ }
}
-
double default_getUpperLimit( ) const {
return AttLimits::getUpperLimit( );
}
@@ -136,11 +136,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool hasLowerAndUpperLimits( ) const {
if( bp::override func_hasLowerAndUpperLimits = this->get_override( "hasLowerAndUpperLimits" ) )
return func_hasLowerAndUpperLimits( );
- else
+ else{
return this->AttLimits::hasLowerAndUpperLimits( );
+ }
}
-
bool default_hasLowerAndUpperLimits( ) const {
return AttLimits::hasLowerAndUpperLimits( );
}
@@ -148,11 +148,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool hasLowerLimit( ) const {
if( bp::override func_hasLowerLimit = this->get_override( "hasLowerLimit" ) )
return func_hasLowerLimit( );
- else
+ else{
return this->AttLimits::hasLowerLimit( );
+ }
}
-
bool default_hasLowerLimit( ) const {
return AttLimits::hasLowerLimit( );
}
@@ -160,11 +160,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool hasUpperLimit( ) const {
if( bp::override func_hasUpperLimit = this->get_override( "hasUpperLimit" ) )
return func_hasUpperLimit( );
- else
+ else{
return this->AttLimits::hasUpperLimit( );
+ }
}
-
bool default_hasUpperLimit( ) const {
return AttLimits::hasUpperLimit( );
}
@@ -172,11 +172,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual bool isFixed( ) const {
if( bp::override func_isFixed = this->get_override( "isFixed" ) )
return func_isFixed( );
- else
+ else{
return this->AttLimits::isFixed( );
+ }
}
-
bool default_isFixed( ) const {
return AttLimits::isFixed( );
}
@@ -184,11 +184,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void removeLimits( ) {
if( bp::override func_removeLimits = this->get_override( "removeLimits" ) )
func_removeLimits( );
- else
+ else{
this->AttLimits::removeLimits( );
+ }
}
-
void default_removeLimits( ) {
AttLimits::removeLimits( );
}
@@ -196,11 +196,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void removeLowerLimit( ) {
if( bp::override func_removeLowerLimit = this->get_override( "removeLowerLimit" ) )
func_removeLowerLimit( );
- else
+ else{
this->AttLimits::removeLowerLimit( );
+ }
}
-
void default_removeLowerLimit( ) {
AttLimits::removeLowerLimit( );
}
@@ -208,11 +208,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void removeUpperLimit( ) {
if( bp::override func_removeUpperLimit = this->get_override( "removeUpperLimit" ) )
func_removeUpperLimit( );
- else
+ else{
this->AttLimits::removeUpperLimit( );
+ }
}
-
void default_removeUpperLimit( ) {
AttLimits::removeUpperLimit( );
}
@@ -220,11 +220,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setFixed( bool is_fixed ) {
if( bp::override func_setFixed = this->get_override( "setFixed" ) )
func_setFixed( is_fixed );
- else
+ else{
this->AttLimits::setFixed( is_fixed );
+ }
}
-
void default_setFixed( bool is_fixed ) {
AttLimits::setFixed( is_fixed );
}
@@ -232,11 +232,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setLimits( double xmin, double xmax ) {
if( bp::override func_setLimits = this->get_override( "setLimits" ) )
func_setLimits( xmin, xmax );
- else
+ else{
this->AttLimits::setLimits( xmin, xmax );
+ }
}
-
void default_setLimits( double xmin, double xmax ) {
AttLimits::setLimits( xmin, xmax );
}
@@ -244,11 +244,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setLowerLimit( double value ) {
if( bp::override func_setLowerLimit = this->get_override( "setLowerLimit" ) )
func_setLowerLimit( value );
- else
+ else{
this->AttLimits::setLowerLimit( value );
+ }
}
-
void default_setLowerLimit( double value ) {
AttLimits::setLowerLimit( value );
}
@@ -256,11 +256,11 @@ struct FitParameter_wrapper : FitParameter, bp::wrapper< FitParameter > {
virtual void setUpperLimit( double value ) {
if( bp::override func_setUpperLimit = this->get_override( "setUpperLimit" ) )
func_setUpperLimit( value );
- else
+ else{
this->AttLimits::setUpperLimit( value );
+ }
}
-
void default_setUpperLimit( double value ) {
AttLimits::setUpperLimit( value );
}
diff --git a/Fit/PythonAPI/src/FitSuite.pypp.cpp b/Fit/PythonAPI/src/FitSuite.pypp.cpp
index 05de160f1144a90e3ceb854a4fc948bcc87b87dd..4d8276308c13a0f01f1689b630c2fcd21e7246e9 100644
--- a/Fit/PythonAPI/src/FitSuite.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuite.pypp.cpp
@@ -26,11 +26,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void link_fit_parameters( ) {
if( bp::override func_link_fit_parameters = this->get_override( "link_fit_parameters" ) )
func_link_fit_parameters( );
- else
+ else{
this->FitSuite::link_fit_parameters( );
+ }
}
-
void default_link_fit_parameters( ) {
FitSuite::link_fit_parameters( );
}
@@ -38,11 +38,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void minimize( ) {
if( bp::override func_minimize = this->get_override( "minimize" ) )
func_minimize( );
- else
+ else{
this->FitSuite::minimize( );
+ }
}
-
void default_minimize( ) {
FitSuite::minimize( );
}
@@ -50,11 +50,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void runFit( ) {
if( bp::override func_runFit = this->get_override( "runFit" ) )
func_runFit( );
- else
+ else{
this->FitSuite::runFit( );
+ }
}
-
void default_runFit( ) {
FitSuite::runFit( );
}
@@ -62,11 +62,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void attachObserver( ::boost::shared_ptr< IObserver > obj ) {
if( bp::override func_attachObserver = this->get_override( "attachObserver" ) )
func_attachObserver( obj );
- else
+ else{
this->IObservable::attachObserver( obj );
+ }
}
-
void default_attachObserver( ::boost::shared_ptr< IObserver > obj ) {
IObservable::attachObserver( obj );
}
@@ -74,11 +74,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void notifyObservers( ) {
if( bp::override func_notifyObservers = this->get_override( "notifyObservers" ) )
func_notifyObservers( );
- else
+ else{
this->IObservable::notifyObservers( );
+ }
}
-
void default_notifyObservers( ) {
IObservable::notifyObservers( );
}
@@ -183,7 +183,7 @@ void register_FitSuite_class(){
}
{ //::FitSuite::getNCalls
- typedef ::std::size_t ( ::FitSuite::*getNCalls_function_type )( ) const;
+ typedef ::size_t ( ::FitSuite::*getNCalls_function_type )( ) const;
FitSuite_exposer.def(
"getNCalls"
@@ -192,7 +192,7 @@ void register_FitSuite_class(){
}
{ //::FitSuite::getNStrategy
- typedef ::std::size_t ( ::FitSuite::*getNStrategy_function_type )( ) const;
+ typedef ::size_t ( ::FitSuite::*getNStrategy_function_type )( ) const;
FitSuite_exposer.def(
"getNStrategy"
diff --git a/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp b/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp
index 50e77c75aaa3c4167ad5fe1095baaef54d02855e..0aea9b4d8f46edf249fe6c90c6820b04969ce574 100644
--- a/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuiteObjects.pypp.cpp
@@ -59,40 +59,40 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::getObject
- typedef ::FitObject const * ( ::FitSuiteObjects::*getObject_function_type )( ::std::size_t ) const;
+ typedef ::FitObject const * ( ::FitSuiteObjects::*getObject_function_type )( ::size_t ) const;
FitSuiteObjects_exposer.def(
"getObject"
, getObject_function_type( &::FitSuiteObjects::getObject )
- , ( bp::arg("i_item")=(long unsigned int)(0) )
+ , ( bp::arg("i_item")=(::size_t)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getObject
- typedef ::FitObject * ( ::FitSuiteObjects::*getObject_function_type )( ::std::size_t ) ;
+ typedef ::FitObject * ( ::FitSuiteObjects::*getObject_function_type )( ::size_t ) ;
FitSuiteObjects_exposer.def(
"getObject"
, getObject_function_type( &::FitSuiteObjects::getObject )
- , ( bp::arg("i_item")=(long unsigned int)(0) )
+ , ( bp::arg("i_item")=(::size_t)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getRealData
- typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getRealData_function_type )( ::std::size_t ) const;
+ typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getRealData_function_type )( ::size_t ) const;
FitSuiteObjects_exposer.def(
"getRealData"
, getRealData_function_type( &::FitSuiteObjects::getRealData )
- , ( bp::arg("i_item")=(long unsigned int)(0) )
+ , ( bp::arg("i_item")=(::size_t)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getResidualValue
- typedef double ( ::FitSuiteObjects::*getResidualValue_function_type )( ::std::size_t ) ;
+ typedef double ( ::FitSuiteObjects::*getResidualValue_function_type )( ::size_t ) ;
FitSuiteObjects_exposer.def(
"getResidualValue"
@@ -102,40 +102,40 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::getSimulation
- typedef ::Simulation const * ( ::FitSuiteObjects::*getSimulation_function_type )( ::std::size_t ) const;
+ typedef ::Simulation const * ( ::FitSuiteObjects::*getSimulation_function_type )( ::size_t ) const;
FitSuiteObjects_exposer.def(
"getSimulation"
, getSimulation_function_type( &::FitSuiteObjects::getSimulation )
- , ( bp::arg("i_item")=(long unsigned int)(0) )
+ , ( bp::arg("i_item")=(::size_t)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getSimulation
- typedef ::Simulation * ( ::FitSuiteObjects::*getSimulation_function_type )( ::std::size_t ) ;
+ typedef ::Simulation * ( ::FitSuiteObjects::*getSimulation_function_type )( ::size_t ) ;
FitSuiteObjects_exposer.def(
"getSimulation"
, getSimulation_function_type( &::FitSuiteObjects::getSimulation )
- , ( bp::arg("i_item")=(long unsigned int)(0) )
+ , ( bp::arg("i_item")=(::size_t)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getSimulationData
- typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getSimulationData_function_type )( ::std::size_t ) const;
+ typedef ::OutputData< double > const * ( ::FitSuiteObjects::*getSimulationData_function_type )( ::size_t ) const;
FitSuiteObjects_exposer.def(
"getSimulationData"
, getSimulationData_function_type( &::FitSuiteObjects::getSimulationData )
- , ( bp::arg("i_item")=(long unsigned int)(0) )
+ , ( bp::arg("i_item")=(::size_t)(0) )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::FitSuiteObjects::getSizeOfDataSet
- typedef ::std::size_t ( ::FitSuiteObjects::*getSizeOfDataSet_function_type )( ) const;
+ typedef ::size_t ( ::FitSuiteObjects::*getSizeOfDataSet_function_type )( ) const;
FitSuiteObjects_exposer.def(
"getSizeOfDataSet"
@@ -163,12 +163,12 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::setRealData
- typedef void ( ::FitSuiteObjects::*setRealData_function_type )( ::OutputData< double > const &,::std::size_t ) ;
+ typedef void ( ::FitSuiteObjects::*setRealData_function_type )( ::OutputData< double > const &,::size_t ) ;
FitSuiteObjects_exposer.def(
"setRealData"
, setRealData_function_type( &::FitSuiteObjects::setRealData )
- , ( bp::arg("real_data"), bp::arg("i_item")=(long unsigned int)(0) ) );
+ , ( bp::arg("real_data"), bp::arg("i_item")=(::size_t)(0) ) );
}
{ //::FitSuiteObjects::setSimulationNormalize
@@ -183,7 +183,7 @@ void register_FitSuiteObjects_class(){
}
{ //::FitSuiteObjects::size
- typedef ::std::size_t ( ::FitSuiteObjects::*size_function_type )( ) const;
+ typedef ::size_t ( ::FitSuiteObjects::*size_function_type )( ) const;
FitSuiteObjects_exposer.def(
"size"
diff --git a/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp b/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
index 586ccde2d6c4189dd56e6e9fca1313d4fa6dfd89..3ac893aa9913956d70bc67e842334fcc05db6650 100644
--- a/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
@@ -50,7 +50,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::getNfreeParameters
- typedef ::std::size_t ( ::FitSuiteParameters::*getNfreeParameters_function_type )( ) const;
+ typedef ::size_t ( ::FitSuiteParameters::*getNfreeParameters_function_type )( ) const;
FitSuiteParameters_exposer.def(
"getNfreeParameters"
@@ -90,7 +90,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::operator[]
- typedef ::FitParameter const * ( ::FitSuiteParameters::*__getitem___function_type )( ::std::size_t ) const;
+ typedef ::FitParameter const * ( ::FitSuiteParameters::*__getitem___function_type )( ::size_t ) const;
FitSuiteParameters_exposer.def(
"__getitem__"
@@ -101,7 +101,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::operator[]
- typedef ::FitParameter * ( ::FitSuiteParameters::*__getitem___function_type )( ::std::size_t ) ;
+ typedef ::FitParameter * ( ::FitSuiteParameters::*__getitem___function_type )( ::size_t ) ;
FitSuiteParameters_exposer.def(
"__getitem__"
@@ -163,7 +163,7 @@ void register_FitSuiteParameters_class(){
}
{ //::FitSuiteParameters::size
- typedef ::std::size_t ( ::FitSuiteParameters::*size_function_type )( ) const;
+ typedef ::size_t ( ::FitSuiteParameters::*size_function_type )( ) const;
FitSuiteParameters_exposer.def(
"size"
diff --git a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
index 2d8c14cad8db365d3eb2da910988874caa6c3c49..5952056df869de4fc60756008917ad0859e6a21c 100644
--- a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
@@ -41,11 +41,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IFittingDataSelector const * getFittingDataSelector( ) const {
if( bp::override func_getFittingDataSelector = this->get_override( "getFittingDataSelector" ) )
return func_getFittingDataSelector( );
- else
+ else{
return this->IChiSquaredModule::getFittingDataSelector( );
+ }
}
-
::IFittingDataSelector const * default_getFittingDataSelector( ) const {
return IChiSquaredModule::getFittingDataSelector( );
}
@@ -53,11 +53,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IIntensityFunction const * getIntensityFunction( ) const {
if( bp::override func_getIntensityFunction = this->get_override( "getIntensityFunction" ) )
return func_getIntensityFunction( );
- else
+ else{
return this->IChiSquaredModule::getIntensityFunction( );
+ }
}
-
::IIntensityFunction const * default_getIntensityFunction( ) const {
return IChiSquaredModule::getIntensityFunction( );
}
@@ -65,11 +65,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IOutputDataNormalizer const * getOutputDataNormalizer( ) const {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else
+ else{
return this->IChiSquaredModule::getOutputDataNormalizer( );
+ }
}
-
::IOutputDataNormalizer const * default_getOutputDataNormalizer( ) const {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -77,35 +77,35 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IOutputDataNormalizer * getOutputDataNormalizer( ) {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else
+ else{
return this->IChiSquaredModule::getOutputDataNormalizer( );
+ }
}
-
::IOutputDataNormalizer * default_getOutputDataNormalizer( ) {
return IChiSquaredModule::getOutputDataNormalizer( );
}
- virtual double getResidualValue( ::std::size_t arg0 ) const {
+ virtual double getResidualValue( ::size_t arg0 ) const {
if( bp::override func_getResidualValue = this->get_override( "getResidualValue" ) )
return func_getResidualValue( arg0 );
- else
+ else{
return this->IChiSquaredModule::getResidualValue( arg0 );
+ }
}
-
- double default_getResidualValue( ::std::size_t arg0 ) const {
+ double default_getResidualValue( ::size_t arg0 ) const {
return IChiSquaredModule::getResidualValue( arg0 );
}
virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
- else
+ else{
this->IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
+ }
}
-
void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
@@ -113,11 +113,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
- else
+ else{
this->IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
+ }
}
-
void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
@@ -125,11 +125,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
- else
+ else{
this->IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
+ }
}
-
void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -231,8 +231,8 @@ void register_IChiSquaredModule_class(){
}
{ //::IChiSquaredModule::getResidualValue
- typedef double ( ::IChiSquaredModule::*getResidualValue_function_type )( ::std::size_t ) const;
- typedef double ( IChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::std::size_t ) const;
+ typedef double ( ::IChiSquaredModule::*getResidualValue_function_type )( ::size_t ) const;
+ typedef double ( IChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::size_t ) const;
IChiSquaredModule_exposer.def(
"getResidualValue"
diff --git a/Fit/PythonAPI/src/IMinimizer.pypp.cpp b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
index 692986d6c7952638bb5402f67f4ec14b20eae6da..e7d5213970a5d1c10abdb97bd231426200c4efec 100644
--- a/Fit/PythonAPI/src/IMinimizer.pypp.cpp
+++ b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
@@ -26,35 +26,35 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void clear( ) {
if( bp::override func_clear = this->get_override( "clear" ) )
func_clear( );
- else
+ else{
this->IMinimizer::clear( );
+ }
}
-
void default_clear( ) {
IMinimizer::clear( );
}
- virtual double getErrorOfVariable( ::std::size_t arg0 ) const {
+ virtual double getErrorOfVariable( ::size_t arg0 ) const {
if( bp::override func_getErrorOfVariable = this->get_override( "getErrorOfVariable" ) )
return func_getErrorOfVariable( arg0 );
- else
+ else{
return this->IMinimizer::getErrorOfVariable( arg0 );
+ }
}
-
- double default_getErrorOfVariable( ::std::size_t arg0 ) const {
+ double default_getErrorOfVariable( ::size_t arg0 ) const {
return IMinimizer::getErrorOfVariable( arg0 );
}
virtual ::std::vector< double > getErrorOfVariables( ) const {
if( bp::override func_getErrorOfVariables = this->get_override( "getErrorOfVariables" ) )
return func_getErrorOfVariables( );
- else
+ else{
return this->IMinimizer::getErrorOfVariables( );
+ }
}
-
::std::vector< double > default_getErrorOfVariables( ) const {
return IMinimizer::getErrorOfVariables( );
}
@@ -62,71 +62,71 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual double getMinValue( ) const {
if( bp::override func_getMinValue = this->get_override( "getMinValue" ) )
return func_getMinValue( );
- else
+ else{
return this->IMinimizer::getMinValue( );
+ }
}
-
double default_getMinValue( ) const {
return IMinimizer::getMinValue( );
}
- virtual ::std::size_t getNCalls( ) const {
+ virtual ::size_t getNCalls( ) const {
if( bp::override func_getNCalls = this->get_override( "getNCalls" ) )
return func_getNCalls( );
- else
+ else{
return this->IMinimizer::getNCalls( );
+ }
}
-
- ::std::size_t default_getNCalls( ) const {
+ ::size_t default_getNCalls( ) const {
return IMinimizer::getNCalls( );
}
- virtual ::std::size_t getNumberOfVariables( ) const {
+ virtual ::size_t getNumberOfVariables( ) const {
if( bp::override func_getNumberOfVariables = this->get_override( "getNumberOfVariables" ) )
return func_getNumberOfVariables( );
- else
+ else{
return this->IMinimizer::getNumberOfVariables( );
+ }
}
-
- ::std::size_t default_getNumberOfVariables( ) const {
+ ::size_t default_getNumberOfVariables( ) const {
return IMinimizer::getNumberOfVariables( );
}
virtual ::MinimizerOptions getOptions( ) const {
if( bp::override func_getOptions = this->get_override( "getOptions" ) )
return func_getOptions( );
- else
+ else{
return this->IMinimizer::getOptions( );
+ }
}
-
::MinimizerOptions default_getOptions( ) const {
return IMinimizer::getOptions( );
}
- virtual double getValueOfVariableAtMinimum( ::std::size_t arg0 ) const {
+ virtual double getValueOfVariableAtMinimum( ::size_t arg0 ) const {
if( bp::override func_getValueOfVariableAtMinimum = this->get_override( "getValueOfVariableAtMinimum" ) )
return func_getValueOfVariableAtMinimum( arg0 );
- else
+ else{
return this->IMinimizer::getValueOfVariableAtMinimum( arg0 );
+ }
}
-
- double default_getValueOfVariableAtMinimum( ::std::size_t arg0 ) const {
+ double default_getValueOfVariableAtMinimum( ::size_t arg0 ) const {
return IMinimizer::getValueOfVariableAtMinimum( arg0 );
}
virtual ::std::vector< double > getValueOfVariablesAtMinimum( ) const {
if( bp::override func_getValueOfVariablesAtMinimum = this->get_override( "getValueOfVariablesAtMinimum" ) )
return func_getValueOfVariablesAtMinimum( );
- else
+ else{
return this->IMinimizer::getValueOfVariablesAtMinimum( );
+ }
}
-
::std::vector< double > default_getValueOfVariablesAtMinimum( ) const {
return IMinimizer::getValueOfVariablesAtMinimum( );
}
@@ -139,11 +139,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void printResults( ) const {
if( bp::override func_printResults = this->get_override( "printResults" ) )
func_printResults( );
- else
+ else{
this->IMinimizer::printResults( );
+ }
}
-
void default_printResults( ) const {
IMinimizer::printResults( );
}
@@ -151,11 +151,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setOptions( ::MinimizerOptions const & arg0 ) {
if( bp::override func_setOptions = this->get_override( "setOptions" ) )
func_setOptions( boost::ref(arg0) );
- else
+ else{
this->IMinimizer::setOptions( boost::ref(arg0) );
+ }
}
-
void default_setOptions( ::MinimizerOptions const & arg0 ) {
IMinimizer::setOptions( boost::ref(arg0) );
}
@@ -163,11 +163,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setOptions( ::std::string const & arg0 ) {
if( bp::override func_setOptions = this->get_override( "setOptions" ) )
func_setOptions( arg0 );
- else
+ else{
this->IMinimizer::setOptions( arg0 );
+ }
}
-
void default_setOptions( ::std::string const & arg0 ) {
IMinimizer::setOptions( arg0 );
}
@@ -175,11 +175,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setParameters( ::FitSuiteParameters const & arg0 ) {
if( bp::override func_setParameters = this->get_override( "setParameters" ) )
func_setParameters( boost::ref(arg0) );
- else
+ else{
this->IMinimizer::setParameters( boost::ref(arg0) );
+ }
}
-
void default_setParameters( ::FitSuiteParameters const & arg0 ) {
IMinimizer::setParameters( boost::ref(arg0) );
}
@@ -205,8 +205,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getErrorOfVariable
- typedef double ( ::IMinimizer::*getErrorOfVariable_function_type )( ::std::size_t ) const;
- typedef double ( IMinimizer_wrapper::*default_getErrorOfVariable_function_type )( ::std::size_t ) const;
+ typedef double ( ::IMinimizer::*getErrorOfVariable_function_type )( ::size_t ) const;
+ typedef double ( IMinimizer_wrapper::*default_getErrorOfVariable_function_type )( ::size_t ) const;
IMinimizer_exposer.def(
"getErrorOfVariable"
@@ -239,8 +239,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getNCalls
- typedef ::std::size_t ( ::IMinimizer::*getNCalls_function_type )( ) const;
- typedef ::std::size_t ( IMinimizer_wrapper::*default_getNCalls_function_type )( ) const;
+ typedef ::size_t ( ::IMinimizer::*getNCalls_function_type )( ) const;
+ typedef ::size_t ( IMinimizer_wrapper::*default_getNCalls_function_type )( ) const;
IMinimizer_exposer.def(
"getNCalls"
@@ -250,8 +250,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getNumberOfVariables
- typedef ::std::size_t ( ::IMinimizer::*getNumberOfVariables_function_type )( ) const;
- typedef ::std::size_t ( IMinimizer_wrapper::*default_getNumberOfVariables_function_type )( ) const;
+ typedef ::size_t ( ::IMinimizer::*getNumberOfVariables_function_type )( ) const;
+ typedef ::size_t ( IMinimizer_wrapper::*default_getNumberOfVariables_function_type )( ) const;
IMinimizer_exposer.def(
"getNumberOfVariables"
@@ -272,8 +272,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getValueOfVariableAtMinimum
- typedef double ( ::IMinimizer::*getValueOfVariableAtMinimum_function_type )( ::std::size_t ) const;
- typedef double ( IMinimizer_wrapper::*default_getValueOfVariableAtMinimum_function_type )( ::std::size_t ) const;
+ typedef double ( ::IMinimizer::*getValueOfVariableAtMinimum_function_type )( ::size_t ) const;
+ typedef double ( IMinimizer_wrapper::*default_getValueOfVariableAtMinimum_function_type )( ::size_t ) const;
IMinimizer_exposer.def(
"getValueOfVariableAtMinimum"
diff --git a/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
index 03961fd42f54edf9f09a3ad4ce233f78b6345e0e..d3102be1a4b8578ccb595113353c8de045bf2187 100644
--- a/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
+++ b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
@@ -31,11 +31,11 @@ struct ISquaredFunction_wrapper : ISquaredFunction, bp::wrapper< ISquaredFunctio
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else
+ else{
return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
}
diff --git a/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
index e73f1c904aa56c1d756dddd015373eae70f6340c..1f174b834df98ba7427c89851fdabb962ea652c5 100644
--- a/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
+++ b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
@@ -33,11 +33,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual ::OutputDataNormalizer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->OutputDataNormalizer::clone( );
+ }
}
-
::OutputDataNormalizer * default_clone( ) const {
return OutputDataNormalizer::clone( );
}
@@ -45,11 +45,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual ::OutputData< double > * createNormalizedData( ::OutputData< double > const & data ) const {
if( bp::override func_createNormalizedData = this->get_override( "createNormalizedData" ) )
return func_createNormalizedData( boost::ref(data) );
- else
+ else{
return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
+ }
}
-
::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
}
@@ -57,11 +57,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual void setMaximumIntensity( double max_intensity ) {
if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
func_setMaximumIntensity( max_intensity );
- else
+ else{
this->OutputDataNormalizer::setMaximumIntensity( max_intensity );
+ }
}
-
void default_setMaximumIntensity( double max_intensity ) {
OutputDataNormalizer::setMaximumIntensity( max_intensity );
}
diff --git a/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
index 0bce6f350de766396e59c1525029ee93dd8f3714..70b59588290d8d49c637096863ec5648dc3965f9 100644
--- a/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
+++ b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
@@ -33,11 +33,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual ::OutputDataSimpleNormalizer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->OutputDataSimpleNormalizer::clone( );
+ }
}
-
::OutputDataSimpleNormalizer * default_clone( ) const {
return OutputDataSimpleNormalizer::clone( );
}
@@ -45,11 +45,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual void setMaximumIntensity( double max_intensity ) {
if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
func_setMaximumIntensity( max_intensity );
- else
+ else{
this->OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
+ }
}
-
void default_setMaximumIntensity( double max_intensity ) {
OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
}
@@ -57,11 +57,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual ::OutputData< double > * createNormalizedData( ::OutputData< double > const & data ) const {
if( bp::override func_createNormalizedData = this->get_override( "createNormalizedData" ) )
return func_createNormalizedData( boost::ref(data) );
- else
+ else{
return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
+ }
}
-
::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
}
diff --git a/Fit/PythonAPI/src/PythonModule.cpp b/Fit/PythonAPI/src/PythonModule.cpp
index 52a616d52fb25673f53b35e4764df957007fc2b3..a505ce9bb29347cfe8c4f4e4b2d5d9cbb5fac35f 100644
--- a/Fit/PythonAPI/src/PythonModule.cpp
+++ b/Fit/PythonAPI/src/PythonModule.cpp
@@ -6,27 +6,27 @@ GCC_DIAG_OFF(missing-field-initializers);
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
-#include "SquaredFunctionWithGaussianError.pypp.h"
-#include "OutputDataSimpleNormalizer.pypp.h"
#include "AttFitting.pypp.h"
+#include "AttLimits.pypp.h"
+#include "ChiSquaredModule.pypp.h"
+#include "FitObject.pypp.h"
+#include "FitParameter.pypp.h"
+#include "FitSuite.pypp.h"
#include "FitSuiteObjects.pypp.h"
+#include "FitSuiteParameters.pypp.h"
+#include "IChiSquaredModule.pypp.h"
+#include "IMinimizer.pypp.h"
+#include "INamed.pypp.h"
+#include "IOutputDataNormalizer.pypp.h"
#include "ISquaredFunction.pypp.h"
#include "MinimizerFactory.pypp.h"
-#include "OutputDataNormalizer.pypp.h"
#include "MinimizerOptions.pypp.h"
-#include "SquaredFunctionWithSystematicError.pypp.h"
-#include "IOutputDataNormalizer.pypp.h"
-#include "SquaredFunctionWhichOnlyWorks.pypp.h"
-#include "FitParameter.pypp.h"
-#include "FitObject.pypp.h"
-#include "IMinimizer.pypp.h"
-#include "INamed.pypp.h"
+#include "OutputDataNormalizer.pypp.h"
+#include "OutputDataSimpleNormalizer.pypp.h"
#include "SquaredFunctionDefault.pypp.h"
-#include "ChiSquaredModule.pypp.h"
-#include "FitSuite.pypp.h"
-#include "AttLimits.pypp.h"
-#include "IChiSquaredModule.pypp.h"
-#include "FitSuiteParameters.pypp.h"
+#include "SquaredFunctionWhichOnlyWorks.pypp.h"
+#include "SquaredFunctionWithGaussianError.pypp.h"
+#include "SquaredFunctionWithSystematicError.pypp.h"
BOOST_PYTHON_MODULE(libBornAgainFit){
diff --git a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
index 3b0b52c824aaccf828d36061a7c0a4ba77a587a3..24c1031d440dfb73a3a0f7df006e34d0ea02bb61 100644
--- a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionDefault::calculateSquaredDifference( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionDefault::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual double calculateSquaredError( double real_value, double arg1 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, arg1 );
- else
+ else{
return this->SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
+ }
}
-
double default_calculateSquaredError( double real_value, double arg1 ) const {
return SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual ::SquaredFunctionDefault * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SquaredFunctionDefault::clone( );
+ }
}
-
::SquaredFunctionDefault * default_clone( ) const {
return SquaredFunctionDefault::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
index 378918ee7ee2be818a1e7e61ee959902551042b7..bbb302b394a39e8dbddda31cd8b59120bf12a96c 100644
--- a/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionWhichOnlyWorks_wrapper : SquaredFunctionWhichOnlyWorks, bp
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionWhichOnlyWorks::calculateSquaredDifference( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionWhichOnlyWorks::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionWhichOnlyWorks_wrapper : SquaredFunctionWhichOnlyWorks, bp
virtual ::SquaredFunctionWhichOnlyWorks * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SquaredFunctionWhichOnlyWorks::clone( );
+ }
}
-
::SquaredFunctionWhichOnlyWorks * default_clone( ) const {
return SquaredFunctionWhichOnlyWorks::clone( );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionWhichOnlyWorks_wrapper : SquaredFunctionWhichOnlyWorks, bp
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else
+ else{
return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
index 6d869a72a869ab3957b46ac5c9d8a469bc25395d..87abc082ddab8fe0715b108485d9918c947bae3c 100644
--- a/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionWithGaussianError_wrapper : SquaredFunctionWithGaussianErr
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionWithGaussianError::calculateSquaredDifference( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionWithGaussianError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionWithGaussianError_wrapper : SquaredFunctionWithGaussianErr
virtual double calculateSquaredError( double arg0, double arg1 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( arg0, arg1 );
- else
+ else{
return this->SquaredFunctionWithGaussianError::calculateSquaredError( arg0, arg1 );
+ }
}
-
double default_calculateSquaredError( double arg0, double arg1 ) const {
return SquaredFunctionWithGaussianError::calculateSquaredError( arg0, arg1 );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionWithGaussianError_wrapper : SquaredFunctionWithGaussianErr
virtual ::SquaredFunctionWithGaussianError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SquaredFunctionWithGaussianError::clone( );
+ }
}
-
::SquaredFunctionWithGaussianError * default_clone( ) const {
return SquaredFunctionWithGaussianError::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
index 37b0378963542325d24c0bfba602a6189dff1f24..1129f605a5790a1f9349c749d78ddce6dd9e3e5d 100644
--- a/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionWithSystematicError_wrapper : SquaredFunctionWithSystemati
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionWithSystematicError::calculateSquaredDifference( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionWithSystematicError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionWithSystematicError_wrapper : SquaredFunctionWithSystemati
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionWithSystematicError::calculateSquaredError( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return SquaredFunctionWithSystematicError::calculateSquaredError( real_value, simulated_value );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionWithSystematicError_wrapper : SquaredFunctionWithSystemati
virtual ::SquaredFunctionWithSystematicError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SquaredFunctionWithSystematicError::clone( );
+ }
}
-
::SquaredFunctionWithSystematicError * default_clone( ) const {
return SquaredFunctionWithSystematicError::clone( );
}
diff --git a/Fit/python_module.pri b/Fit/python_module.pri
index 71eae99f6300bb9c8953e05ee6618b6dce4bd14c..b85ff59160b2ea3247264300f639bf8bc990e16f 100644
--- a/Fit/python_module.pri
+++ b/Fit/python_module.pri
@@ -1,51 +1,51 @@
HEADERS += \
PythonAPI/inc/PythonFitExposer.h \
PythonAPI/inc/PythonFitList.h \
- PythonAPI/inc/SquaredFunctionWithGaussianError.pypp.h \
- PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h \
PythonAPI/inc/AttFitting.pypp.h \
+ PythonAPI/inc/AttLimits.pypp.h \
+ PythonAPI/inc/ChiSquaredModule.pypp.h \
+ PythonAPI/inc/FitObject.pypp.h \
+ PythonAPI/inc/FitParameter.pypp.h \
+ PythonAPI/inc/FitSuite.pypp.h \
PythonAPI/inc/FitSuiteObjects.pypp.h \
+ PythonAPI/inc/FitSuiteParameters.pypp.h \
+ PythonAPI/inc/IChiSquaredModule.pypp.h \
+ PythonAPI/inc/IMinimizer.pypp.h \
+ PythonAPI/inc/INamed.pypp.h \
+ PythonAPI/inc/IOutputDataNormalizer.pypp.h \
PythonAPI/inc/ISquaredFunction.pypp.h \
PythonAPI/inc/MinimizerFactory.pypp.h \
- PythonAPI/inc/OutputDataNormalizer.pypp.h \
PythonAPI/inc/MinimizerOptions.pypp.h \
- PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h \
- PythonAPI/inc/IOutputDataNormalizer.pypp.h \
- PythonAPI/inc/SquaredFunctionWhichOnlyWorks.pypp.h \
- PythonAPI/inc/FitParameter.pypp.h \
- PythonAPI/inc/FitObject.pypp.h \
- PythonAPI/inc/IMinimizer.pypp.h \
- PythonAPI/inc/INamed.pypp.h \
+ PythonAPI/inc/OutputDataNormalizer.pypp.h \
+ PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h \
PythonAPI/inc/SquaredFunctionDefault.pypp.h \
- PythonAPI/inc/ChiSquaredModule.pypp.h \
- PythonAPI/inc/FitSuite.pypp.h \
- PythonAPI/inc/AttLimits.pypp.h \
- PythonAPI/inc/IChiSquaredModule.pypp.h \
- PythonAPI/inc/FitSuiteParameters.pypp.h
+ PythonAPI/inc/SquaredFunctionWhichOnlyWorks.pypp.h \
+ PythonAPI/inc/SquaredFunctionWithGaussianError.pypp.h \
+ PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h
SOURCES += \
PythonAPI/src/PythonModule.cpp \
- PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp \
- PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp \
- PythonAPI/src/INamed.pypp.cpp \
- PythonAPI/src/FitParameter.pypp.cpp \
+ PythonAPI/src/AttFitting.pypp.cpp \
PythonAPI/src/AttLimits.pypp.cpp \
PythonAPI/src/ChiSquaredModule.pypp.cpp \
+ PythonAPI/src/FitObject.pypp.cpp \
+ PythonAPI/src/FitParameter.pypp.cpp \
+ PythonAPI/src/FitSuite.pypp.cpp \
+ PythonAPI/src/FitSuiteObjects.pypp.cpp \
+ PythonAPI/src/FitSuiteParameters.pypp.cpp \
PythonAPI/src/IChiSquaredModule.pypp.cpp \
+ PythonAPI/src/IMinimizer.pypp.cpp \
+ PythonAPI/src/INamed.pypp.cpp \
+ PythonAPI/src/IOutputDataNormalizer.pypp.cpp \
+ PythonAPI/src/ISquaredFunction.pypp.cpp \
+ PythonAPI/src/MinimizerFactory.pypp.cpp \
+ PythonAPI/src/MinimizerOptions.pypp.cpp \
+ PythonAPI/src/OutputDataNormalizer.pypp.cpp \
+ PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp \
PythonAPI/src/SquaredFunctionDefault.pypp.cpp \
PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp \
- PythonAPI/src/OutputDataNormalizer.pypp.cpp \
- PythonAPI/src/FitSuite.pypp.cpp \
- PythonAPI/src/IMinimizer.pypp.cpp \
PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp \
- PythonAPI/src/MinimizerFactory.pypp.cpp \
- PythonAPI/src/ISquaredFunction.pypp.cpp \
- PythonAPI/src/IOutputDataNormalizer.pypp.cpp \
- PythonAPI/src/FitSuiteObjects.pypp.cpp \
- PythonAPI/src/FitObject.pypp.cpp \
- PythonAPI/src/AttFitting.pypp.cpp \
- PythonAPI/src/FitSuiteParameters.pypp.cpp \
- PythonAPI/src/MinimizerOptions.pypp.cpp
+ PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
INCLUDEPATH += ./PythonAPI/inc
DEPENDPATH += ./PythonAPI/inc
diff --git a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_centered.ima.gz b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_centered.ima.gz
index 2826f0fe259d6a3874ab0e8e2a8f4d5b4ba08b59..9c64a61f84d253795ceb3c25f4061f7098d6800d 100644
Binary files a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_centered.ima.gz and b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_centered.ima.gz differ
diff --git a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_lattice.ima.gz b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_lattice.ima.gz
index 92a42c4e2bd5dae008add9c6cdf014485a0d29c6..340c1f7637661588b112716d08d73167d8d32fd0 100644
Binary files a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_lattice.ima.gz and b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_lattice.ima.gz differ
diff --git a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_rotated.ima.gz b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_rotated.ima.gz
index e4841fce2cab1043c397e6fe9475c815a5f2e91e..3cbefb351378657cc32b6c522d22cfdbe1a28d9c 100644
Binary files a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_rotated.ima.gz and b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_rotated.ima.gz differ
diff --git a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_variants.ima.gz b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_variants.ima.gz
index 1c2a387029ca7f1d465c9842780387f6e844ca7f..97b66eafdafcce84e08d13a639ddf1eec20a7f93 100644
Binary files a/Tests/ReferenceData/BornAgain/isgisaxs06_reference_variants.ima.gz and b/Tests/ReferenceData/BornAgain/isgisaxs06_reference_variants.ima.gz differ
diff --git a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_centered.ima.gz b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_centered.ima.gz
index e5f0de850a282c6555781b983a02bb0900df3f56..9c64a61f84d253795ceb3c25f4061f7098d6800d 100644
Binary files a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_centered.ima.gz and b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_centered.ima.gz differ
diff --git a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_lattice.ima.gz b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_lattice.ima.gz
index 7c977b4d72b71007b40a0e773525758a2acf537f..340c1f7637661588b112716d08d73167d8d32fd0 100644
Binary files a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_lattice.ima.gz and b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_lattice.ima.gz differ
diff --git a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_rotated.ima.gz b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_rotated.ima.gz
index 718397b9c62f00b74ea9ce25d0f5cebadf8d3466..3cbefb351378657cc32b6c522d22cfdbe1a28d9c 100644
Binary files a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_rotated.ima.gz and b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_rotated.ima.gz differ
diff --git a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_variants.ima.gz b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_variants.ima.gz
index fb243101fe1117b64fc0475264b5d28105db0234..97b66eafdafcce84e08d13a639ddf1eec20a7f93 100644
Binary files a/Tests/ReferenceData/IsGISAXS/ex-6/isgi_variants.ima.gz and b/Tests/ReferenceData/IsGISAXS/ex-6/isgi_variants.ima.gz differ