diff --git a/Core/FormFactors/inc/FormFactorCrystal.h b/Core/FormFactors/inc/FormFactorCrystal.h
index a4b8820f5f72184b9d436dfbdcdf3e36cfd875c2..a707a337fdd919b9b312db48c04d39af95539159 100644
--- a/Core/FormFactors/inc/FormFactorCrystal.h
+++ b/Core/FormFactors/inc/FormFactorCrystal.h
@@ -38,12 +38,12 @@ public:
virtual void setAmbientMaterial(const IMaterial *p_material);
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
#ifndef GCCXML_SKIP_THIS
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const;
#endif
virtual complex_t evaluate_for_q(const cvector_t& q) const;
diff --git a/Core/FormFactors/inc/FormFactorDWBA.h b/Core/FormFactors/inc/FormFactorDWBA.h
index 418bf75f83e4f69cc782deecbfc437f1a0c08328..d69c7a7fb854a3caa98317b4549e94e1c347ed0c 100644
--- a/Core/FormFactors/inc/FormFactorDWBA.h
+++ b/Core/FormFactors/inc/FormFactorDWBA.h
@@ -37,14 +37,14 @@ public:
void setSpecularInfo(const LayerSpecularInfo& layer_specular_info);
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
friend class TestPolarizedDWBATerms;
protected:
const ILayerRTCoefficients *getOutCoeffs(double alpha_f) const;
void calculateTerms(const cvector_t& k_i, const Bin1DCVector& k_f_bin,
- Bin1D alpha_f_bin) const;
+ const Bin1D &alpha_f_bin) const;
LayerSpecularInfo *mp_specular_info;
diff --git a/Core/FormFactors/inc/FormFactorDWBAConstZ.h b/Core/FormFactors/inc/FormFactorDWBAConstZ.h
index 773aa875a3885cd7fd810391684dd1eb33772061..ce87952eafa3787281476fb458bb547b18b5fccb 100644
--- a/Core/FormFactors/inc/FormFactorDWBAConstZ.h
+++ b/Core/FormFactors/inc/FormFactorDWBAConstZ.h
@@ -31,7 +31,7 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
protected:
double m_depth;
diff --git a/Core/FormFactors/inc/FormFactorDWBAPol.h b/Core/FormFactors/inc/FormFactorDWBAPol.h
index 1824adc8aebce7df676f4c33a0cc7341c46e6fe2..e2cef192c1de3d1f99292405f00c5e05ed092dd6 100644
--- a/Core/FormFactors/inc/FormFactorDWBAPol.h
+++ b/Core/FormFactors/inc/FormFactorDWBAPol.h
@@ -36,11 +36,11 @@ public:
//! Throws exception
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f) const;
//! Calculates and returns a polarized form factor calculation in DWBA
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f, Bin1D phi_f) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f, const Bin1D &phi_f) const;
//! Sets reflection/transmission info for polarized DWBA
void setSpecularInfo(const LayerSpecularInfo& layer_specular_info);
@@ -51,7 +51,7 @@ protected:
const ILayerRTCoefficients *getOutCoeffs(double alpha_f,
double phi_f) const;
void calculateTerms(const cvector_t& k_i, const Bin1DCVector& k_f_bin,
- Bin1D alpha_f, Bin1D phi_f) const;
+ const Bin1D &alpha_f, const Bin1D &phi_f) const;
//! The matrix form factor for BA
IFormFactor *mp_form_factor;
diff --git a/Core/FormFactors/inc/FormFactorDWBAPolConstZ.h b/Core/FormFactors/inc/FormFactorDWBAPolConstZ.h
index 85f59542c0080b11eabee3d523ba5622ea336b44..2000380986c3da61fc228fc5d0643eff97918145 100644
--- a/Core/FormFactors/inc/FormFactorDWBAPolConstZ.h
+++ b/Core/FormFactors/inc/FormFactorDWBAPolConstZ.h
@@ -35,7 +35,7 @@ public:
//! Calculates and returns a polarized form factor calculation in DWBA
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f, Bin1D phi_f) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f, const Bin1D &phi_f) const;
protected:
double m_depth;
diff --git a/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h b/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h
index 7250ce6bc4bab8b809ccce7fbfa9c15ad2cc4655..f094436004fef4f262970f3023f11a590f83746c 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorDebyeWaller.h
@@ -44,7 +44,7 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
virtual int getNumberOfStochasticParameters() const {
return mp_form_factor->getNumberOfStochasticParameters();
diff --git a/Core/FormFactors/inc/FormFactorDecoratorFactor.h b/Core/FormFactors/inc/FormFactorDecoratorFactor.h
index b09d7bf22bcf542a1b2f03900812ff61223d2a60..d6bd949c6ef5bacb6995309a162f70a008c8e7c1 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorFactor.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorFactor.h
@@ -32,7 +32,7 @@ public:
//! Evaluate the form factor for scalar calculations
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
virtual int getNumberOfStochasticParameters() const;
@@ -57,7 +57,7 @@ inline FormFactorDecoratorFactor* FormFactorDecoratorFactor::clone() const
}
inline complex_t FormFactorDecoratorFactor::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
return m_factor*mp_form_factor->evaluate(k_i, k_f_bin, alpha_f_bin);
}
diff --git a/Core/FormFactors/inc/FormFactorDecoratorMaterial.h b/Core/FormFactors/inc/FormFactorDecoratorMaterial.h
index 482d19fd62b8fa5219ad7dcb5ffab8d663f18037..9a00148397e77c6fb820684133f28de2c735a3e5 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorMaterial.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorMaterial.h
@@ -48,8 +48,8 @@ public:
#ifndef GCCXML_SKIP_THIS
//! Returns scattering amplitude for matrix interactions
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const;
#endif
private:
diff --git a/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h b/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h
index 0bc2068700b2ea6a259bd1595f7e62bfffa1325a..0c551986ce2b32f62f9e2d83c0ac136ba0739764 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorMultiPositionFactor.h
@@ -33,12 +33,12 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
#ifndef GCCXML_SKIP_THIS
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const;
#endif
virtual int getNumberOfStochasticParameters() const {
@@ -46,7 +46,7 @@ public:
}
private:
- complex_t getPositionsFactor(cvector_t q) const;
+ complex_t getPositionsFactor(const cvector_t &q) const;
std::vector<kvector_t> m_positions;
};
diff --git a/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h b/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h
index 7e08373de5a2e78d0f5103528a8a73123bcbf4a7..d74247bc51ae533357821f1d1ab162626e87ae44 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorPositionFactor.h
@@ -33,12 +33,12 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
#ifndef GCCXML_SKIP_THIS
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const;
#endif
virtual int getNumberOfStochasticParameters() const {
@@ -47,7 +47,7 @@ public:
protected:
kvector_t m_position;
private:
- complex_t getPositionFactor(cvector_t q) const;
+ complex_t getPositionFactor(const cvector_t &q) const;
};
inline FormFactorDecoratorPositionFactor::FormFactorDecoratorPositionFactor(
@@ -65,7 +65,7 @@ FormFactorDecoratorPositionFactor::clone() const
}
inline complex_t FormFactorDecoratorPositionFactor::evaluate(
- const cvector_t& k_i, const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const cvector_t& k_i, const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
cvector_t q = k_i - k_f_bin.getMidPoint();
complex_t pos_factor = getPositionFactor(q);
@@ -73,8 +73,8 @@ inline complex_t FormFactorDecoratorPositionFactor::evaluate(
}
inline Eigen::Matrix2cd FormFactorDecoratorPositionFactor::evaluatePol(
- const cvector_t& k_i, const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const
+ const cvector_t& k_i, const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const
{
cvector_t q = k_i - k_f_bin.getMidPoint();
complex_t pos_factor = getPositionFactor(q);
@@ -83,7 +83,7 @@ inline Eigen::Matrix2cd FormFactorDecoratorPositionFactor::evaluatePol(
}
inline complex_t FormFactorDecoratorPositionFactor::getPositionFactor(
- cvector_t q) const
+ const cvector_t &q) const
{
complex_t qr = q.x()*m_position.x() + q.y()*m_position.y()
+ q.z()*m_position.z();
diff --git a/Core/FormFactors/inc/FormFactorDecoratorTransformation.h b/Core/FormFactors/inc/FormFactorDecoratorTransformation.h
index 848734a8d5dc18b91f298c1e2ae3fba61c65db49..0dc68498a61497b60c472f15e32909907c9819d6 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorTransformation.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorTransformation.h
@@ -43,7 +43,7 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
virtual int getNumberOfStochasticParameters() const
{ return mp_form_factor->getNumberOfStochasticParameters(); }
@@ -54,7 +54,7 @@ protected:
inline complex_t FormFactorDecoratorTransformation::evaluate(
- const cvector_t& k_i, const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const cvector_t& k_i, const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
cvector_t new_ki =
mP_transform->transformedInverse(k_i);
diff --git a/Core/FormFactors/inc/FormFactorWeighted.h b/Core/FormFactors/inc/FormFactorWeighted.h
index d029eef29c0dd22fbec9aec2cae6d69ccdf3139f..da56b3fe1a7c61aafaf89c6c0ab2cc7547a567b4 100644
--- a/Core/FormFactors/inc/FormFactorWeighted.h
+++ b/Core/FormFactors/inc/FormFactorWeighted.h
@@ -38,12 +38,12 @@ public:
virtual void setAmbientMaterial(const IMaterial *p_material);
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
//! Calculates and returns a polarized form factor calculation in DWBA
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const;
virtual int getNumberOfStochasticParameters() const;
diff --git a/Core/FormFactors/inc/IFormFactor.h b/Core/FormFactors/inc/IFormFactor.h
index f8aa3b5e767d8b7d8be28783762685f141bfc3fb..652fa7ec258f1ce8d24b039b3b481cbbed2c62cb 100644
--- a/Core/FormFactors/inc/IFormFactor.h
+++ b/Core/FormFactors/inc/IFormFactor.h
@@ -49,7 +49,7 @@ public:
//! @param alpha_i incident angle wrt scattering surface
//! @param alpha_f outgoing angle wrt scattering surface
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const=0;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const=0;
#ifndef GCCXML_SKIP_THIS
//! Returns scattering amplitude for matrix interactions
@@ -60,8 +60,8 @@ public:
//! @param alpha_f outgoing inclination angle wrt scattering surface
//! @param phi_f outgoing azimuthal angle wrt scattering surface
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const;
#endif
//! Returns number of variable/stochastic parameters
@@ -94,7 +94,7 @@ public:
#ifndef GCCXML_SKIP_THIS
inline Eigen::Matrix2cd IFormFactor::evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin, Bin1D phi_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin, const Bin1D &phi_f_bin) const
{
(void)k_i;
(void)k_f_bin;
diff --git a/Core/FormFactors/inc/IFormFactorBorn.h b/Core/FormFactors/inc/IFormFactorBorn.h
index 9ef47b93b8bea1a9ec13c503b31bf10db2a9f2da..94f0da6ece54f4fd82772294dad7b1da7c9f4f21 100644
--- a/Core/FormFactors/inc/IFormFactorBorn.h
+++ b/Core/FormFactors/inc/IFormFactorBorn.h
@@ -33,12 +33,12 @@ public:
virtual void accept(ISampleVisitor *visitor) const { visitor->visit(this); }
virtual complex_t evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const;
#ifndef GCCXML_SKIP_THIS
virtual Eigen::Matrix2cd evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const;
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const;
#endif
//! evaluate scattering amplitude for complex wavevector
diff --git a/Core/FormFactors/src/FormFactorCrystal.cpp b/Core/FormFactors/src/FormFactorCrystal.cpp
index 00637434a6d0a3318577e68d492d7580edf8face..586e23f715d345b4a752af7a23a82d5f42934686 100644
--- a/Core/FormFactors/src/FormFactorCrystal.cpp
+++ b/Core/FormFactors/src/FormFactorCrystal.cpp
@@ -70,7 +70,7 @@ complex_t FormFactorCrystal::evaluate_for_q(const cvector_t& q) const
}
complex_t FormFactorCrystal::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
// construct a real reciprocal vector
cvector_t q_bin_lower = k_i - k_f_bin.m_q_lower;
@@ -107,7 +107,7 @@ complex_t FormFactorCrystal::evaluate(const cvector_t& k_i,
}
Eigen::Matrix2cd FormFactorCrystal::evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin, Bin1D phi_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin, const Bin1D &phi_f_bin) const
{
// construct a real reciprocal vector
cvector_t q_bin_lower = k_i - k_f_bin.m_q_lower;
diff --git a/Core/FormFactors/src/FormFactorDWBA.cpp b/Core/FormFactors/src/FormFactorDWBA.cpp
index f3af8dd5c91ad7b530432f96614eb77eef0fcbb7..ecda116d512b23edd0023e37ff80fafeb69b4598 100644
--- a/Core/FormFactors/src/FormFactorDWBA.cpp
+++ b/Core/FormFactors/src/FormFactorDWBA.cpp
@@ -38,7 +38,7 @@ FormFactorDWBA* FormFactorDWBA::clone() const
}
complex_t FormFactorDWBA::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
calculateTerms(k_i, k_f_bin, alpha_f_bin);
return m_term_S + m_term_RS + m_term_SR + m_term_RSR;
@@ -52,7 +52,7 @@ void FormFactorDWBA::setSpecularInfo(
}
void FormFactorDWBA::calculateTerms(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
// Retrieve the two different incoming wavevectors in the layer
const ILayerRTCoefficients *p_in_coeff =
diff --git a/Core/FormFactors/src/FormFactorDWBAConstZ.cpp b/Core/FormFactors/src/FormFactorDWBAConstZ.cpp
index 8e5bdc1a871034ef763ac0ca21c4b59004eb05b1..3210a3a13a02d3ac798c3b2485e2db1d4da08dcf 100644
--- a/Core/FormFactors/src/FormFactorDWBAConstZ.cpp
+++ b/Core/FormFactors/src/FormFactorDWBAConstZ.cpp
@@ -24,7 +24,7 @@ FormFactorDWBAConstZ::FormFactorDWBAConstZ(
}
complex_t FormFactorDWBAConstZ::evaluate(
- const cvector_t& k_i, const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const cvector_t& k_i, const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
calculateTerms(k_i, k_f_bin, alpha_f_bin);
const ILayerRTCoefficients *p_in_coeff =
diff --git a/Core/FormFactors/src/FormFactorDWBAPol.cpp b/Core/FormFactors/src/FormFactorDWBAPol.cpp
index 7df7d3969e0f540523d64e2d8632d9f728c30f42..c056ed20f93dd23bb4bf2346f220a9d23fe1c35c 100644
--- a/Core/FormFactors/src/FormFactorDWBAPol.cpp
+++ b/Core/FormFactors/src/FormFactorDWBAPol.cpp
@@ -37,7 +37,7 @@ FormFactorDWBAPol* FormFactorDWBAPol::clone() const
}
complex_t FormFactorDWBAPol::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f) const
{
(void)k_i;
(void)k_f_bin;
@@ -47,7 +47,7 @@ complex_t FormFactorDWBAPol::evaluate(const cvector_t& k_i,
}
Eigen::Matrix2cd FormFactorDWBAPol::evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f, Bin1D phi_f) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f, const Bin1D &phi_f) const
{
calculateTerms(k_i, k_f_bin, alpha_f, phi_f);
Eigen::Matrix2cd result =
@@ -66,7 +66,7 @@ void FormFactorDWBAPol::setSpecularInfo(
}
void FormFactorDWBAPol::calculateTerms(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin, Bin1D phi_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin, const Bin1D &phi_f_bin) const
{
const ILayerRTCoefficients *p_in_coeff =
mp_specular_info->getInCoefficients();
diff --git a/Core/FormFactors/src/FormFactorDWBAPolConstZ.cpp b/Core/FormFactors/src/FormFactorDWBAPolConstZ.cpp
index 66c817fbf1f4d1177350005692a22885312e3757..c3d56198de7ae3376b5a1110b8c3dd08f5f94233 100644
--- a/Core/FormFactors/src/FormFactorDWBAPolConstZ.cpp
+++ b/Core/FormFactors/src/FormFactorDWBAPolConstZ.cpp
@@ -37,7 +37,7 @@ FormFactorDWBAPolConstZ* FormFactorDWBAPolConstZ::clone() const
}
Eigen::Matrix2cd FormFactorDWBAPolConstZ::evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin, Bin1D phi_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin, const Bin1D &phi_f_bin) const
{
// get all different z-components of wavevectors
const ILayerRTCoefficients *in_coeff =
diff --git a/Core/FormFactors/src/FormFactorDecoratorDebyeWaller.cpp b/Core/FormFactors/src/FormFactorDecoratorDebyeWaller.cpp
index 7cdcdb7f370db429494d2a203212db968b3925d9..be20c026e335664487278ef4b97671bfeccf0337 100644
--- a/Core/FormFactors/src/FormFactorDecoratorDebyeWaller.cpp
+++ b/Core/FormFactors/src/FormFactorDecoratorDebyeWaller.cpp
@@ -56,7 +56,7 @@ FormFactorDecoratorDebyeWaller* FormFactorDecoratorDebyeWaller::clone() const
}
complex_t FormFactorDecoratorDebyeWaller::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
cvector_t q = k_i - k_f_bin.getMidPoint();
double qr2 = std::norm(q.x()) + std::norm(q.y());
diff --git a/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp b/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp
index c92e3a33badf920f2c35c4ba93d6c23df045beb2..87dcb5e2a94905d53b7f77e3b1820424606f8499 100644
--- a/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp
+++ b/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp
@@ -66,7 +66,7 @@ complex_t FormFactorDecoratorMaterial::getAmbientRefractiveIndex() const
}
Eigen::Matrix2cd FormFactorDecoratorMaterial::evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin, Bin1D phi_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin, const Bin1D &phi_f_bin) const
{
(void)phi_f_bin;
// the conjugated linear part of time reversal operator T
diff --git a/Core/FormFactors/src/FormFactorDecoratorMultiPositionFactor.cpp b/Core/FormFactors/src/FormFactorDecoratorMultiPositionFactor.cpp
index 80fca1e589546d745eb830bd5d8745c3828cc64f..2a2637c2569c44e94f4cf8d5afd426ff30871bdf 100644
--- a/Core/FormFactors/src/FormFactorDecoratorMultiPositionFactor.cpp
+++ b/Core/FormFactors/src/FormFactorDecoratorMultiPositionFactor.cpp
@@ -31,7 +31,7 @@ FormFactorDecoratorMultiPositionFactor::clone() const
}
complex_t FormFactorDecoratorMultiPositionFactor::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
cvector_t q = k_i - k_f_bin.getMidPoint();
return getPositionsFactor(q)*mp_form_factor->
@@ -39,8 +39,8 @@ complex_t FormFactorDecoratorMultiPositionFactor::evaluate(const cvector_t& k_i,
}
Eigen::Matrix2cd FormFactorDecoratorMultiPositionFactor::evaluatePol(
- const cvector_t& k_i, const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin,
- Bin1D phi_f_bin) const
+ const cvector_t& k_i, const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin,
+ const Bin1D &phi_f_bin) const
{
cvector_t q = k_i - k_f_bin.getMidPoint();
Eigen::Matrix2cd ff = mp_form_factor->evaluatePol(k_i, k_f_bin, alpha_f_bin, phi_f_bin);
@@ -48,7 +48,7 @@ Eigen::Matrix2cd FormFactorDecoratorMultiPositionFactor::evaluatePol(
}
complex_t FormFactorDecoratorMultiPositionFactor::getPositionsFactor(
- cvector_t q) const
+ const cvector_t &q) const
{
complex_t result;
for (size_t i=0; i<m_positions.size(); ++i) {
diff --git a/Core/FormFactors/src/FormFactorWeighted.cpp b/Core/FormFactors/src/FormFactorWeighted.cpp
index 124df77c156f811956fef202d4306c77b45dade1..18b1841b72af8e3302ea16394e4b2f14da6f419a 100644
--- a/Core/FormFactors/src/FormFactorWeighted.cpp
+++ b/Core/FormFactors/src/FormFactorWeighted.cpp
@@ -52,7 +52,7 @@ void FormFactorWeighted::setAmbientMaterial(const IMaterial *p_material)
}
complex_t FormFactorWeighted::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
complex_t result(0.0, 0.0);
for (size_t index=0; index<m_form_factors.size(); ++index) {
@@ -64,7 +64,7 @@ complex_t FormFactorWeighted::evaluate(const cvector_t& k_i,
}
Eigen::Matrix2cd FormFactorWeighted::evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin, Bin1D phi_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin, const Bin1D &phi_f_bin) const
{
Eigen::Matrix2cd result = Eigen::Matrix2cd::Zero();
for (size_t index=0; index<m_form_factors.size(); ++index) {
diff --git a/Core/FormFactors/src/IFormFactorBorn.cpp b/Core/FormFactors/src/IFormFactorBorn.cpp
index 0e6998390e4d9e4a96876d81e9a923b14fce7a9e..e9f79176a97d36d907d8d67c4729c84e71af6788 100644
--- a/Core/FormFactors/src/IFormFactorBorn.cpp
+++ b/Core/FormFactors/src/IFormFactorBorn.cpp
@@ -18,7 +18,7 @@
#include "MathFunctions.h"
complex_t IFormFactorBorn::evaluate(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin) const
{
(void)alpha_f_bin;
Bin1DCVector q_bin(k_i - k_f_bin.m_q_lower, k_i - k_f_bin.m_q_upper);
@@ -29,7 +29,7 @@ complex_t IFormFactorBorn::evaluate(const cvector_t& k_i,
}
Eigen::Matrix2cd IFormFactorBorn::evaluatePol(const cvector_t& k_i,
- const Bin1DCVector& k_f_bin, Bin1D alpha_f_bin, Bin1D phi_f_bin) const
+ const Bin1DCVector& k_f_bin, const Bin1D &alpha_f_bin, const Bin1D &phi_f_bin) const
{
(void)phi_f_bin;
Eigen::Matrix2cd unit_matrix = Eigen::Matrix2cd::Identity();
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 3f33465d84b2a505d8f19270191efe8c70078949..99d3cc39bd7029f7f838aa74cae1ca6615e11a63 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 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 );
}
@@ -114,11 +114,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 c1bfbace3d1db69365402088c2eadc73f121610f..09f545e0797b148490e37c575db7337ce8f81fb4 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 void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else
+ else{
this->Crystal::applyTransformation( boost::ref(transform) );
+ }
}
-
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Crystal::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,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( );
}
@@ -52,11 +52,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( );
}
@@ -64,11 +64,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Geometry::Transform3D const * getTransform( ) const {
if( bp::override func_getTransform = this->get_override( "getTransform" ) )
return func_getTransform( );
- else
+ else{
return this->Crystal::getTransform( );
+ }
}
-
::Geometry::Transform3D const * default_getTransform( ) const {
return Crystal::getTransform( );
}
@@ -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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -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( );
}
@@ -435,8 +435,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 add6a2a0e22ed26add69553641dd7f37577c1ec2..17c52c99368ca4464f26779411000f1a37275fb8 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 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 );
}
@@ -114,11 +114,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( );
}
@@ -143,7 +143,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"
@@ -164,7 +164,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 3a354bc71f8a65c1427a4a4bbd0c18f44d024468..a419ee3c9621a580b6e4f63364a4205cda6aca9b 100644
--- a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
+++ b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
@@ -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,11 +47,11 @@ 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 );
}
@@ -59,11 +59,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
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( );
}
@@ -71,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( );
}
@@ -83,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( );
}
@@ -95,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( );
}
@@ -126,11 +126,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 );
}
@@ -138,11 +138,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( );
}
diff --git a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
index aa27f5532163fcd3607705a6c36220f6f80a918e..7c9c79d41ba6fe448eceb59afb161ff45822cc55 100644
--- a/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorAnisoPyramid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual ::FormFactorAnisoPyramid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorAnisoPyramid::clone( );
+ }
}
-
::FormFactorAnisoPyramid * default_clone( ) const {
return FormFactorAnisoPyramid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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->FormFactorAnisoPyramid::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorAnisoPyramid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else
+ else{
return this->FormFactorAnisoPyramid::getAlpha( );
+ }
}
-
double default_getAlpha( ) const {
return FormFactorAnisoPyramid::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorAnisoPyramid::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorAnisoPyramid::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else
+ else{
return this->FormFactorAnisoPyramid::getLength( );
+ }
}
-
double default_getLength( ) const {
return FormFactorAnisoPyramid::getLength( );
}
@@ -88,11 +88,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorAnisoPyramid::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorAnisoPyramid::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
- else
+ else{
return this->FormFactorAnisoPyramid::getWidth( );
+ }
}
-
double default_getWidth( ) const {
return FormFactorAnisoPyramid::getWidth( );
}
@@ -112,11 +112,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else
+ else{
this->FormFactorAnisoPyramid::setAlpha( alpha );
+ }
}
-
void default_setAlpha( double alpha ) {
FormFactorAnisoPyramid::setAlpha( alpha );
}
@@ -124,11 +124,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorAnisoPyramid::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorAnisoPyramid::setHeight( height );
}
@@ -136,11 +136,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setLength( double length ) {
if( bp::override func_setLength = this->get_override( "setLength" ) )
func_setLength( length );
- else
+ else{
this->FormFactorAnisoPyramid::setLength( length );
+ }
}
-
void default_setLength( double length ) {
FormFactorAnisoPyramid::setLength( length );
}
@@ -148,11 +148,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual void setWidth( double width ) {
if( bp::override func_setWidth = this->get_override( "setWidth" ) )
func_setWidth( width );
- else
+ else{
this->FormFactorAnisoPyramid::setWidth( width );
+ }
}
-
void default_setWidth( double width ) {
FormFactorAnisoPyramid::setWidth( width );
}
@@ -160,11 +160,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -172,11 +172,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -184,11 +184,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -196,59 +196,59 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, bp::wrapper< For
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -256,11 +256,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -268,11 +268,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -280,11 +280,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -292,11 +292,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -304,11 +304,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -316,11 +316,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -347,11 +347,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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 );
}
@@ -359,11 +359,11 @@ struct FormFactorAnisoPyramid_wrapper : FormFactorAnisoPyramid, 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( );
}
@@ -550,8 +550,8 @@ void register_FormFactorAnisoPyramid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorAnisoPyramid_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 ( FormFactorAnisoPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorAnisoPyramid_exposer.def(
"createDistributedFormFactors"
@@ -575,8 +575,8 @@ void register_FormFactorAnisoPyramid_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorAnisoPyramid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorAnisoPyramid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorAnisoPyramid_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index c6b16da8a5b3ca647e7e5a880f8841150d943eef..903dbc78536d03140b28722108f8767174dd23fd 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,11 +112,11 @@ 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( );
}
@@ -124,59 +124,59 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,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( );
}
@@ -196,11 +196,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( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -263,11 +263,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 );
}
@@ -275,11 +275,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( );
}
@@ -405,8 +405,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"
@@ -430,8 +430,8 @@ void register_FormFactorBox_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorBox_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorBox_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorBox_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorCone.pypp.cpp b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
index b9ed3e12609dc76e4154a6e087a8352cf82381d1..8bc67ce5aa58a1fe772c7f46c6a9032b4ddc5e9c 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,11 +160,11 @@ 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( );
}
@@ -172,59 +172,59 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,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( );
}
@@ -244,11 +244,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( );
}
@@ -256,11 +256,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( );
}
@@ -268,11 +268,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( );
}
@@ -280,11 +280,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( );
}
@@ -311,11 +311,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 );
}
@@ -323,11 +323,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( );
}
@@ -491,8 +491,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"
@@ -516,8 +516,8 @@ void register_FormFactorCone_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorCone_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorCone_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorCone_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
index d9568036925b6ab82275eb7a7abe511954c0d75e..5a8f843e7fd680e9bc931e00d464f7b766fdba4e 100644
--- a/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone6.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual ::FormFactorCone6 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorCone6::clone( );
+ }
}
-
::FormFactorCone6 * default_clone( ) const {
return FormFactorCone6::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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->FormFactorCone6::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCone6::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else
+ else{
return this->FormFactorCone6::getAlpha( );
+ }
}
-
double default_getAlpha( ) const {
return FormFactorCone6::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorCone6::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorCone6::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorCone6::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCone6::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorCone6::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorCone6::getRadius( );
}
@@ -100,11 +100,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else
+ else{
this->FormFactorCone6::setAlpha( alpha );
+ }
}
-
void default_setAlpha( double alpha ) {
FormFactorCone6::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorCone6::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorCone6::setHeight( height );
}
@@ -124,11 +124,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else
+ else{
this->FormFactorCone6::setRadius( radius );
+ }
}
-
void default_setRadius( double radius ) {
FormFactorCone6::setRadius( radius );
}
@@ -136,11 +136,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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 FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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,11 +160,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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( );
}
@@ -172,59 +172,59 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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( );
}
@@ -244,11 +244,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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( );
}
@@ -256,11 +256,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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( );
}
@@ -268,11 +268,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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( );
}
@@ -280,11 +280,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -311,11 +311,11 @@ struct FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
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 FormFactorCone6_wrapper : FormFactorCone6, bp::wrapper< FormFactorCone6 >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -491,8 +491,8 @@ void register_FormFactorCone6_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorCone6_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 ( FormFactorCone6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorCone6_exposer.def(
"createDistributedFormFactors"
@@ -516,8 +516,8 @@ void register_FormFactorCone6_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorCone6_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorCone6_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorCone6_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index 822d8cf92525027c5caab93827031fd655d46503..7484a2a0676ac686b85ae1abf9868442041e66ae 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -21,35 +21,35 @@ 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
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,11 +93,11 @@ 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( );
}
@@ -105,35 +105,35 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
@@ -141,11 +141,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -153,11 +153,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( );
}
@@ -165,11 +165,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( );
}
@@ -177,11 +177,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( );
}
@@ -189,11 +189,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( );
}
@@ -201,11 +201,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( );
}
@@ -213,11 +213,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( );
}
@@ -225,11 +225,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( );
}
@@ -256,11 +256,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 );
}
@@ -268,11 +268,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( );
}
@@ -299,8 +299,8 @@ void register_FormFactorCrystal_class(){
}
{ //::FormFactorCrystal::evaluate
- typedef ::complex_t ( ::FormFactorCrystal::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorCrystal_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::FormFactorCrystal::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorCrystal_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorCrystal_exposer.def(
"evaluate"
@@ -379,8 +379,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/FormFactorCuboctahedron.pypp.cpp b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
index 097b067ab5314805e84ad588732c2579fe384ab3..9433d713aa32269cb860861b34ea676bacea8cc3 100644
--- a/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCuboctahedron.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual ::FormFactorCuboctahedron * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorCuboctahedron::clone( );
+ }
}
-
::FormFactorCuboctahedron * default_clone( ) const {
return FormFactorCuboctahedron::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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->FormFactorCuboctahedron::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCuboctahedron::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else
+ else{
return this->FormFactorCuboctahedron::getAlpha( );
+ }
}
-
double default_getAlpha( ) const {
return FormFactorCuboctahedron::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorCuboctahedron::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorCuboctahedron::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getHeightRatio( ) const {
if( bp::override func_getHeightRatio = this->get_override( "getHeightRatio" ) )
return func_getHeightRatio( );
- else
+ else{
return this->FormFactorCuboctahedron::getHeightRatio( );
+ }
}
-
double default_getHeightRatio( ) const {
return FormFactorCuboctahedron::getHeightRatio( );
}
@@ -88,11 +88,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else
+ else{
return this->FormFactorCuboctahedron::getLength( );
+ }
}
-
double default_getLength( ) const {
return FormFactorCuboctahedron::getLength( );
}
@@ -100,11 +100,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorCuboctahedron::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCuboctahedron::getNumberOfStochasticParameters( );
}
@@ -112,11 +112,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else
+ else{
this->FormFactorCuboctahedron::setAlpha( alpha );
+ }
}
-
void default_setAlpha( double alpha ) {
FormFactorCuboctahedron::setAlpha( alpha );
}
@@ -124,11 +124,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorCuboctahedron::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorCuboctahedron::setHeight( height );
}
@@ -136,11 +136,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setHeightRatio( double height_ratio ) {
if( bp::override func_setHeightRatio = this->get_override( "setHeightRatio" ) )
func_setHeightRatio( height_ratio );
- else
+ else{
this->FormFactorCuboctahedron::setHeightRatio( height_ratio );
+ }
}
-
void default_setHeightRatio( double height_ratio ) {
FormFactorCuboctahedron::setHeightRatio( height_ratio );
}
@@ -148,11 +148,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setLength( double length ) {
if( bp::override func_setLength = this->get_override( "setLength" ) )
func_setLength( length );
- else
+ else{
this->FormFactorCuboctahedron::setLength( length );
+ }
}
-
void default_setLength( double length ) {
FormFactorCuboctahedron::setLength( length );
}
@@ -160,11 +160,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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( );
}
@@ -172,11 +172,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else
+ else{
this->IParameterized::clearParameterPool( );
+ }
}
-
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -184,11 +184,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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( );
}
@@ -196,59 +196,59 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -256,11 +256,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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( );
}
@@ -268,11 +268,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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( );
}
@@ -280,11 +280,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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( );
}
@@ -292,11 +292,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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( );
}
@@ -304,11 +304,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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( );
}
@@ -316,11 +316,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -347,11 +347,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
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 );
}
@@ -359,11 +359,11 @@ struct FormFactorCuboctahedron_wrapper : FormFactorCuboctahedron, bp::wrapper< F
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -550,8 +550,8 @@ void register_FormFactorCuboctahedron_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorCuboctahedron_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 ( FormFactorCuboctahedron_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorCuboctahedron_exposer.def(
"createDistributedFormFactors"
@@ -575,8 +575,8 @@ void register_FormFactorCuboctahedron_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorCuboctahedron_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorCuboctahedron_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorCuboctahedron_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index 6f2d80fc07da49aa06a44ff0cf1605c7ed6570af..9040092b6dfe7d8508a6d21610de7148ff00ee86 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,11 +136,11 @@ 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( );
}
@@ -148,59 +148,59 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -244,11 +244,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( );
}
@@ -256,11 +256,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( );
}
@@ -287,11 +287,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 );
}
@@ -299,11 +299,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( );
}
@@ -444,8 +444,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"
@@ -469,8 +469,8 @@ void register_FormFactorCylinder_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorCylinder_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorCylinder_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorCylinder_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index 40bad024a6294473a2648149bdb1a18452c721bf..82a23a1ee30bf17da7a4821cd6778f65266d51db 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -28,35 +28,35 @@ 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
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,11 +88,11 @@ 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( );
}
@@ -100,35 +100,35 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
@@ -136,11 +136,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -172,11 +172,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( );
}
@@ -184,11 +184,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( );
}
@@ -196,11 +196,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( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -251,11 +251,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 );
}
@@ -263,11 +263,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( );
}
@@ -294,8 +294,8 @@ void register_FormFactorDecoratorDebyeWaller_class(){
}
{ //::FormFactorDecoratorDebyeWaller::evaluate
- typedef ::complex_t ( ::FormFactorDecoratorDebyeWaller::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorDecoratorDebyeWaller_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::FormFactorDecoratorDebyeWaller::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorDecoratorDebyeWaller_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorDecoratorDebyeWaller_exposer.def(
"evaluate"
@@ -362,8 +362,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/FormFactorEllipsoidalCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
index df796235cd063253ace4c3c674eed41ff7e2bd6b..372edda7190fbb41746769e947b0dec4fee08377 100644
--- a/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorEllipsoidalCylinder.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual ::FormFactorEllipsoidalCylinder * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorEllipsoidalCylinder::clone( );
+ }
}
-
::FormFactorEllipsoidalCylinder * default_clone( ) const {
return FormFactorEllipsoidalCylinder::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
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->FormFactorEllipsoidalCylinder::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorEllipsoidalCylinder::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorEllipsoidalCylinder::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorEllipsoidalCylinder::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorEllipsoidalCylinder::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual double getRadiusB( ) const {
if( bp::override func_getRadiusB = this->get_override( "getRadiusB" ) )
return func_getRadiusB( );
- else
+ else{
return this->FormFactorEllipsoidalCylinder::getRadiusB( );
+ }
}
-
double default_getRadiusB( ) const {
return FormFactorEllipsoidalCylinder::getRadiusB( );
}
@@ -88,11 +88,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorEllipsoidalCylinder::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorEllipsoidalCylinder::setHeight( height );
}
@@ -100,11 +100,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void setRadiusA( double radius_a ) {
if( bp::override func_setRadiusA = this->get_override( "setRadiusA" ) )
func_setRadiusA( radius_a );
- else
+ else{
this->FormFactorEllipsoidalCylinder::setRadiusA( radius_a );
+ }
}
-
void default_setRadiusA( double radius_a ) {
FormFactorEllipsoidalCylinder::setRadiusA( radius_a );
}
@@ -112,11 +112,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual void setRadiusB( double radius_b ) {
if( bp::override func_setRadiusB = this->get_override( "setRadiusB" ) )
func_setRadiusB( radius_b );
- else
+ else{
this->FormFactorEllipsoidalCylinder::setRadiusB( radius_b );
+ }
}
-
void default_setRadiusB( double radius_b ) {
FormFactorEllipsoidalCylinder::setRadiusB( radius_b );
}
@@ -124,11 +124,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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( );
}
@@ -136,11 +136,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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( );
}
@@ -148,11 +148,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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( );
}
@@ -160,59 +160,59 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -220,11 +220,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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( );
}
@@ -232,11 +232,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
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( );
}
@@ -244,11 +244,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
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( );
}
@@ -256,11 +256,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, bp
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( );
}
@@ -268,11 +268,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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( );
}
@@ -280,11 +280,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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( );
}
@@ -311,11 +311,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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 );
}
@@ -323,11 +323,11 @@ struct FormFactorEllipsoidalCylinder_wrapper : FormFactorEllipsoidalCylinder, 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( );
}
@@ -489,8 +489,8 @@ void register_FormFactorEllipsoidalCylinder_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorEllipsoidalCylinder_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 ( FormFactorEllipsoidalCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorEllipsoidalCylinder_exposer.def(
"createDistributedFormFactors"
@@ -514,8 +514,8 @@ void register_FormFactorEllipsoidalCylinder_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorEllipsoidalCylinder_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorEllipsoidalCylinder_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorEllipsoidalCylinder_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index 0651f14122b6e40712c204771ee9ca128ef59dfb..68d9f02f68aeb7f515edc5f9f1051a8b307987f6 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,11 +124,11 @@ 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( );
}
@@ -136,59 +136,59 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,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( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -244,11 +244,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( );
}
@@ -275,11 +275,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 );
}
@@ -287,11 +287,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( );
}
@@ -420,8 +420,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"
@@ -445,8 +445,8 @@ void register_FormFactorFullSphere_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorFullSphere_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorFullSphere_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorFullSphere_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
index b67c0b7c6c8deb70020e2bc54ab94512ffce03de..d58b738967e7e28d5219d20ebaf6f60e184b7b1a 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,11 +112,11 @@ 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( );
}
@@ -124,59 +124,59 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,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( );
}
@@ -196,11 +196,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( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -263,11 +263,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 );
}
@@ -275,11 +275,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( );
}
@@ -396,8 +396,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"
@@ -421,8 +421,8 @@ void register_FormFactorFullSpheroid_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorFullSpheroid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorFullSpheroid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorFullSpheroid_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index 5ebc322c63a863d7489c13a4263bd4cb893c94f2..5c70842c07570748ad697698c50e2eb1b455a3e1 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,11 +131,11 @@ 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( );
}
@@ -143,59 +143,59 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -203,11 +203,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( );
}
@@ -215,11 +215,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( );
}
@@ -227,11 +227,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( );
}
@@ -239,11 +239,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( );
}
@@ -270,11 +270,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 );
}
@@ -282,11 +282,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( );
}
@@ -415,8 +415,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"
@@ -440,8 +440,8 @@ void register_FormFactorGauss_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorGauss_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorGauss_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorGauss_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
index eb23162d475331895f8f195f1937a34a4d11f5a3..ba2661a402d4a8924c3bb2466d61dc46413d8f59 100644
--- a/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual ::FormFactorHemiEllipsoid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorHemiEllipsoid::clone( );
+ }
}
-
::FormFactorHemiEllipsoid * default_clone( ) const {
return FormFactorHemiEllipsoid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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->FormFactorHemiEllipsoid::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorHemiEllipsoid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorHemiEllipsoid::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorHemiEllipsoid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorHemiEllipsoid::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorHemiEllipsoid::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getRadiusA( ) const {
if( bp::override func_getRadiusA = this->get_override( "getRadiusA" ) )
return func_getRadiusA( );
- else
+ else{
return this->FormFactorHemiEllipsoid::getRadiusA( );
+ }
}
-
double default_getRadiusA( ) const {
return FormFactorHemiEllipsoid::getRadiusA( );
}
@@ -88,11 +88,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual double getRadiusB( ) const {
if( bp::override func_getRadiusB = this->get_override( "getRadiusB" ) )
return func_getRadiusB( );
- else
+ else{
return this->FormFactorHemiEllipsoid::getRadiusB( );
+ }
}
-
double default_getRadiusB( ) const {
return FormFactorHemiEllipsoid::getRadiusB( );
}
@@ -100,11 +100,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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 FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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 FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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,59 +136,59 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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( );
}
@@ -208,11 +208,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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( );
}
@@ -220,11 +220,11 @@ struct FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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 FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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 FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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 FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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 FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
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 FormFactorHemiEllipsoid_wrapper : FormFactorHemiEllipsoid, bp::wrapper< F
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -431,8 +431,8 @@ void register_FormFactorHemiEllipsoid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorHemiEllipsoid_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 ( FormFactorHemiEllipsoid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorHemiEllipsoid_exposer.def(
"createDistributedFormFactors"
@@ -456,8 +456,8 @@ void register_FormFactorHemiEllipsoid_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorHemiEllipsoid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorHemiEllipsoid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorHemiEllipsoid_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index 5b90e45b4ceb14a3699e39f2cbeae81840bae0a7..6081de65caef561bb91697edee798313d374f8b8 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,11 +95,11 @@ 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( );
}
@@ -107,59 +107,59 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -167,11 +167,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( );
}
@@ -179,11 +179,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( );
}
@@ -191,11 +191,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( );
}
@@ -203,11 +203,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( );
}
@@ -215,11 +215,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( );
}
@@ -227,11 +227,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( );
}
@@ -239,11 +239,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( );
}
@@ -270,11 +270,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 );
}
@@ -282,11 +282,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( );
}
@@ -382,8 +382,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"
@@ -407,8 +407,8 @@ void register_FormFactorLorentz_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorLorentz_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorLorentz_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorLorentz_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
index 14d56a2c69f779011d03005d3f5d7d0e5b735509..b6a58c50f85ed0aa0bd8e4faed4655153b5bc784 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 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 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( );
}
@@ -100,11 +100,11 @@ 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( );
}
@@ -112,59 +112,59 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,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( );
}
@@ -184,11 +184,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->IFormFactor::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -196,11 +196,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( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -263,11 +263,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 );
}
@@ -275,11 +275,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( );
}
@@ -394,8 +394,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"
@@ -419,8 +419,8 @@ void register_FormFactorParallelepiped_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorParallelepiped_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorParallelepiped_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorParallelepiped_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index 35de71c1cd9526c38114173690910bf00469f7a5..372dc3dfac857e2876afa9bab62e9285ed971b30 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 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( );
}
@@ -64,11 +64,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else
+ else{
return this->FormFactorPrism3::getLength( );
+ }
}
-
double default_getLength( ) const {
return FormFactorPrism3::getLength( );
}
@@ -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 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 );
}
@@ -100,11 +100,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setLength( double length ) {
if( bp::override func_setLength = this->get_override( "setLength" ) )
func_setLength( length );
- else
+ else{
this->FormFactorPrism3::setLength( length );
+ }
}
-
void default_setLength( double length ) {
FormFactorPrism3::setLength( length );
}
@@ -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,11 +136,11 @@ 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( );
}
@@ -148,59 +148,59 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -244,11 +244,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( );
}
@@ -256,11 +256,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( );
}
@@ -268,11 +268,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( );
}
@@ -299,11 +299,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 );
}
@@ -311,11 +311,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( );
}
@@ -456,8 +456,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"
@@ -481,8 +481,8 @@ void register_FormFactorPrism3_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorPrism3_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorPrism3_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorPrism3_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
index f45575078bb2ca8be28bbc61d1e4b54dbcf16614..6fd08b6949ff6b28a19321b311bdf52daba85e97 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,11 +136,11 @@ 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( );
}
@@ -148,59 +148,59 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -244,11 +244,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( );
}
@@ -256,11 +256,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( );
}
@@ -287,11 +287,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 );
}
@@ -299,11 +299,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( );
}
@@ -444,8 +444,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"
@@ -469,8 +469,8 @@ void register_FormFactorPrism6_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorPrism6_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorPrism6_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorPrism6_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index 86ad40e2989ca698cd31c4d6a3de28b154f90d61..4e673cd21ddf527c822acdf4b690c4017c539ced 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 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( );
}
@@ -76,11 +76,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else
+ else{
return this->FormFactorPyramid::getLength( );
+ }
}
-
double default_getLength( ) const {
return FormFactorPyramid::getLength( );
}
@@ -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 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 );
}
@@ -124,11 +124,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setLength( double length ) {
if( bp::override func_setLength = this->get_override( "setLength" ) )
func_setLength( length );
- else
+ else{
this->FormFactorPyramid::setLength( length );
+ }
}
-
void default_setLength( double length ) {
FormFactorPyramid::setLength( length );
}
@@ -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,11 +160,11 @@ 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( );
}
@@ -172,59 +172,59 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,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( );
}
@@ -244,11 +244,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( );
}
@@ -256,11 +256,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( );
}
@@ -268,11 +268,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( );
}
@@ -280,11 +280,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( );
}
@@ -292,11 +292,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( );
}
@@ -323,11 +323,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 );
}
@@ -335,11 +335,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( );
}
@@ -503,8 +503,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"
@@ -528,8 +528,8 @@ void register_FormFactorPyramid_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorPyramid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorPyramid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorPyramid_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
index ccc6f7619326b3990fe33143ca23b1130ec56371..9f1628e075f6f7292b69bc1ce3cf51a07f49cda6 100644
--- a/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple1.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual ::FormFactorRipple1 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorRipple1::clone( );
+ }
}
-
::FormFactorRipple1 * default_clone( ) const {
return FormFactorRipple1::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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->FormFactorRipple1::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorRipple1::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorRipple1::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorRipple1::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else
+ else{
return this->FormFactorRipple1::getLength( );
+ }
}
-
double default_getLength( ) const {
return FormFactorRipple1::getLength( );
}
@@ -76,11 +76,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorRipple1::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorRipple1::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
- else
+ else{
return this->FormFactorRipple1::getWidth( );
+ }
}
-
double default_getWidth( ) const {
return FormFactorRipple1::getWidth( );
}
@@ -100,11 +100,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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 FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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 FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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,59 +136,59 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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( );
}
@@ -208,11 +208,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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( );
}
@@ -220,11 +220,11 @@ struct FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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 FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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 FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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 FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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 FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
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 FormFactorRipple1_wrapper : FormFactorRipple1, bp::wrapper< FormFactorRip
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -431,8 +431,8 @@ void register_FormFactorRipple1_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorRipple1_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 ( FormFactorRipple1_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorRipple1_exposer.def(
"createDistributedFormFactors"
@@ -456,8 +456,8 @@ void register_FormFactorRipple1_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorRipple1_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorRipple1_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorRipple1_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
index f5f7fdf5545e38648a852efd59cceee5167db33e..eedf58c3f37d491fe58ba695a898046908b0d199 100644
--- a/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorRipple2.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual ::FormFactorRipple2 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorRipple2::clone( );
+ }
}
-
::FormFactorRipple2 * default_clone( ) const {
return FormFactorRipple2::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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->FormFactorRipple2::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorRipple2::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getAsymetry( ) const {
if( bp::override func_getAsymetry = this->get_override( "getAsymetry" ) )
return func_getAsymetry( );
- else
+ else{
return this->FormFactorRipple2::getAsymetry( );
+ }
}
-
double default_getAsymetry( ) const {
return FormFactorRipple2::getAsymetry( );
}
@@ -64,11 +64,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorRipple2::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorRipple2::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else
+ else{
return this->FormFactorRipple2::getLength( );
+ }
}
-
double default_getLength( ) const {
return FormFactorRipple2::getLength( );
}
@@ -88,11 +88,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorRipple2::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorRipple2::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual double getWidth( ) const {
if( bp::override func_getWidth = this->get_override( "getWidth" ) )
return func_getWidth( );
- else
+ else{
return this->FormFactorRipple2::getWidth( );
+ }
}
-
double default_getWidth( ) const {
return FormFactorRipple2::getWidth( );
}
@@ -112,11 +112,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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( );
}
@@ -148,59 +148,59 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
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 FormFactorRipple2_wrapper : FormFactorRipple2, bp::wrapper< FormFactorRip
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -454,8 +454,8 @@ void register_FormFactorRipple2_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorRipple2_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 ( FormFactorRipple2_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorRipple2_exposer.def(
"createDistributedFormFactors"
@@ -479,8 +479,8 @@ void register_FormFactorRipple2_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorRipple2_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorRipple2_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorRipple2_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
index 4d7915d49d2821aadc7c73ca5687e390fd371e92..8fa8ca8574b4f2c2be3af22bcb05bf75fa419171 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,11 +88,11 @@ 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( );
}
@@ -100,59 +100,59 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -160,11 +160,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( );
}
@@ -172,11 +172,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( );
}
@@ -184,11 +184,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( );
}
@@ -196,11 +196,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( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -251,11 +251,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 );
}
@@ -263,11 +263,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( );
}
@@ -361,8 +361,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"
@@ -386,8 +386,8 @@ void register_FormFactorSphere_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorSphere_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorSphere_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorSphere_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index 43c73df4a4cef0c5be062b6fe4fcce6f0f582d3e..04edd8f4fa6caaa7bc04aa5c43fba2f50a6227ec 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -148,35 +148,35 @@ 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,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( );
}
@@ -196,11 +196,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( );
}
@@ -208,11 +208,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( );
}
@@ -220,11 +220,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( );
}
@@ -232,11 +232,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( );
}
@@ -263,11 +263,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 );
}
@@ -275,11 +275,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( );
}
@@ -306,8 +306,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"
@@ -421,8 +421,8 @@ void register_FormFactorSphereGaussianRadius_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorSphereGaussianRadius_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorSphereGaussianRadius_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorSphereGaussianRadius_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
index 598456e8d1b08ee10873b853eaa2a5103e4879b6..cd8daf7b31d0484918f64cd73c2035d5a7c6b3a5 100644
--- a/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereUniformRadius.pypp.cpp
@@ -28,35 +28,35 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual ::FormFactorSphereUniformRadius * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorSphereUniformRadius::clone( );
+ }
}
-
::FormFactorSphereUniformRadius * default_clone( ) const {
return FormFactorSphereUniformRadius::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->FormFactorSphereUniformRadius::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 {
FormFactorSphereUniformRadius::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->FormFactorSphereUniformRadius::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSphereUniformRadius::evaluate_for_q( boost::ref(q) );
}
@@ -64,11 +64,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorSphereUniformRadius::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorSphereUniformRadius::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorSphereUniformRadius::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphereUniformRadius::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else
+ else{
return this->FormFactorSphereUniformRadius::isDistributedFormFactor( );
+ }
}
-
bool default_isDistributedFormFactor( ) const {
return FormFactorSphereUniformRadius::isDistributedFormFactor( );
}
@@ -100,11 +100,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
@@ -112,11 +112,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
@@ -124,11 +124,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
@@ -136,11 +136,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -148,35 +148,35 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
@@ -196,11 +196,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
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 FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, bp
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 FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
@@ -232,11 +232,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
@@ -263,11 +263,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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 );
}
@@ -275,11 +275,11 @@ struct FormFactorSphereUniformRadius_wrapper : FormFactorSphereUniformRadius, 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( );
}
@@ -306,8 +306,8 @@ void register_FormFactorSphereUniformRadius_class(){
}
{ //::FormFactorSphereUniformRadius::createDistributedFormFactors
- typedef void ( ::FormFactorSphereUniformRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorSphereUniformRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( ::FormFactorSphereUniformRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( FormFactorSphereUniformRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorSphereUniformRadius_exposer.def(
"createDistributedFormFactors"
@@ -421,8 +421,8 @@ void register_FormFactorSphereUniformRadius_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorSphereUniformRadius_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorSphereUniformRadius_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorSphereUniformRadius_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
index 0e316d4c8c5ebd5d52669946e7d38d3343d28e9f..9c8e6e411a9fd15ba99fa5e6aef9215e0f2b010b 100644
--- a/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual ::FormFactorSpheroid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorSpheroid::clone( );
+ }
}
-
::FormFactorSpheroid * default_clone( ) const {
return FormFactorSpheroid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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->FormFactorSpheroid::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSpheroid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorSpheroid::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorSpheroid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual double getHeightFullSpheroid( ) const {
if( bp::override func_getHeightFullSpheroid = this->get_override( "getHeightFullSpheroid" ) )
return func_getHeightFullSpheroid( );
- else
+ else{
return this->FormFactorSpheroid::getHeightFullSpheroid( );
+ }
}
-
double default_getHeightFullSpheroid( ) const {
return FormFactorSpheroid::getHeightFullSpheroid( );
}
@@ -76,11 +76,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorSpheroid::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSpheroid::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else
+ else{
return this->FormFactorSpheroid::getRadius( );
+ }
}
-
double default_getRadius( ) const {
return FormFactorSpheroid::getRadius( );
}
@@ -100,11 +100,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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 FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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 FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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,59 +136,59 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -196,11 +196,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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( );
}
@@ -208,11 +208,11 @@ struct FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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 FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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 FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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 FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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 FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
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 FormFactorSpheroid_wrapper : FormFactorSpheroid, bp::wrapper< FormFactorS
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -419,8 +419,8 @@ void register_FormFactorSpheroid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorSpheroid_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 ( FormFactorSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorSpheroid_exposer.def(
"createDistributedFormFactors"
@@ -444,8 +444,8 @@ void register_FormFactorSpheroid_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorSpheroid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorSpheroid_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorSpheroid_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp b/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
index 4d70eccff3794aea5700cac84be6d6682ef99821..8bd018c8a16f1f12ac43dd797dfaf46beb816122 100644
--- a/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorTetrahedron.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual ::FormFactorTetrahedron * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FormFactorTetrahedron::clone( );
+ }
}
-
::FormFactorTetrahedron * default_clone( ) const {
return FormFactorTetrahedron::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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->FormFactorTetrahedron::evaluate_for_q( boost::ref(q) );
+ }
}
-
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorTetrahedron::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else
+ else{
return this->FormFactorTetrahedron::getAlpha( );
+ }
}
-
double default_getAlpha( ) const {
return FormFactorTetrahedron::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else
+ else{
return this->FormFactorTetrahedron::getHeight( );
+ }
}
-
double default_getHeight( ) const {
return FormFactorTetrahedron::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual double getLength( ) const {
if( bp::override func_getLength = this->get_override( "getLength" ) )
return func_getLength( );
- else
+ else{
return this->FormFactorTetrahedron::getLength( );
+ }
}
-
double default_getLength( ) const {
return FormFactorTetrahedron::getLength( );
}
@@ -88,11 +88,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else
+ else{
return this->FormFactorTetrahedron::getNumberOfStochasticParameters( );
+ }
}
-
int default_getNumberOfStochasticParameters( ) const {
return FormFactorTetrahedron::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else
+ else{
this->FormFactorTetrahedron::setAlpha( alpha );
+ }
}
-
void default_setAlpha( double alpha ) {
FormFactorTetrahedron::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else
+ else{
this->FormFactorTetrahedron::setHeight( height );
+ }
}
-
void default_setHeight( double height ) {
FormFactorTetrahedron::setHeight( height );
}
@@ -124,11 +124,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual void setLength( double length ) {
if( bp::override func_setLength = this->get_override( "setLength" ) )
func_setLength( length );
- else
+ else{
this->FormFactorTetrahedron::setLength( length );
+ }
}
-
void default_setLength( double length ) {
FormFactorTetrahedron::setLength( length );
}
@@ -136,11 +136,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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 FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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,11 +160,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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( );
}
@@ -172,59 +172,59 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -232,11 +232,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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( );
}
@@ -244,11 +244,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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( );
}
@@ -256,11 +256,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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( );
}
@@ -268,11 +268,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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( );
}
@@ -280,11 +280,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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( );
}
@@ -292,11 +292,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual void printSampleTree( ) {
if( bp::override func_printSampleTree = this->get_override( "printSampleTree" ) )
func_printSampleTree( );
- else
+ else{
this->ISample::printSampleTree( );
+ }
}
-
void default_printSampleTree( ) {
ISample::printSampleTree( );
}
@@ -323,11 +323,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
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 );
}
@@ -335,11 +335,11 @@ struct FormFactorTetrahedron_wrapper : FormFactorTetrahedron, bp::wrapper< FormF
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -503,8 +503,8 @@ void register_FormFactorTetrahedron_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
- typedef void ( FormFactorTetrahedron_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 ( FormFactorTetrahedron_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
FormFactorTetrahedron_exposer.def(
"createDistributedFormFactors"
@@ -528,8 +528,8 @@ void register_FormFactorTetrahedron_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( FormFactorTetrahedron_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( FormFactorTetrahedron_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
FormFactorTetrahedron_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
index 8d21d07f2a3bb57ef389ed27bf76a29fc4649ce6..f86e4ae450dda96335f5869d65a4db910fe81935 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::Transform3D 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::Transform3D 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 4ce4a10a7c2334255a0f523ded1a73c370c039fb..230fe3022fcb3bc64b5226f4ffb891f385b892e8 100644
--- a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
+++ b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
@@ -33,11 +33,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else
+ else{
this->IClusteredParticles::applyTransformation( boost::ref(transform) );
+ }
}
-
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
IClusteredParticles::applyTransformation( boost::ref(transform) );
}
@@ -55,11 +55,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::Geometry::Transform3D const * getTransform( ) const {
if( bp::override func_getTransform = this->get_override( "getTransform" ) )
return func_getTransform( );
- else
+ else{
return this->IClusteredParticles::getTransform( );
+ }
}
-
::Geometry::Transform3D const * default_getTransform( ) const {
return IClusteredParticles::getTransform( );
}
@@ -72,11 +72,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( );
}
@@ -84,11 +84,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( );
}
@@ -96,11 +96,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -108,11 +108,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( );
}
@@ -120,11 +120,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( );
}
@@ -132,11 +132,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( );
}
@@ -144,11 +144,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( );
}
@@ -156,11 +156,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( );
}
@@ -187,11 +187,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 );
}
@@ -199,24 +199,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( );
}
@@ -418,8 +418,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 de31cada49ae2a5d935d5e7789dfeeed8a646ccf..940fab7309a68c0ef67c483c370524b626f3863c 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,35 +45,35 @@ 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( );
}
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 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( );
}
@@ -93,11 +93,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( );
}
@@ -105,11 +105,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -117,11 +117,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( );
}
@@ -129,11 +129,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( );
}
@@ -141,11 +141,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( );
}
@@ -172,11 +172,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 );
}
@@ -184,11 +184,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( );
}
@@ -237,8 +237,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 8cd261b5a4b6fdc1a8a82dd336fb1b8449c438e0..1c900adf5225f422f775a999bfea0c81c4e12112 100644
--- a/Core/PythonAPI/src/IDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/IDecoration.pypp.cpp
@@ -40,7 +40,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 );
}
@@ -50,24 +50,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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -111,11 +111,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( );
}
@@ -123,11 +123,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( );
}
@@ -135,11 +135,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( );
}
@@ -147,11 +147,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( );
}
@@ -159,11 +159,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( );
}
@@ -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( );
}
@@ -263,7 +263,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"
@@ -282,8 +282,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"
@@ -293,7 +293,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"
@@ -302,7 +302,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"
@@ -456,8 +456,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 1bfbec60f6e7dae500d4b78475bb104089b314bd..791afdbbb89bfe0a8db2c8ee2baf902d6c5c7e91 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 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 );
}
@@ -117,11 +117,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 c9ec190383df32e5e124a67a3c93f67a6a235c91..567a7e4048f46c45885f9175d24459cd22d40b78 100644
--- a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
+++ b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
@@ -38,11 +38,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
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 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( );
}
@@ -62,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( );
}
@@ -74,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( );
}
@@ -105,11 +105,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 );
}
@@ -117,11 +117,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( );
}
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index 1385a08b954afcc588330caf7f7193f2a09e1c54..542bb2ede91c74780b58ce9cd2855e9072f52d68 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -30,31 +30,31 @@ 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 );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
bp::override func_evaluate = this->get_override( "evaluate" );
- return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -158,11 +158,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( );
}
@@ -170,11 +170,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -182,11 +182,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( );
}
@@ -194,11 +194,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( );
}
@@ -206,11 +206,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( );
}
@@ -237,11 +237,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 );
}
@@ -249,11 +249,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( );
}
@@ -278,8 +278,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"
@@ -291,7 +291,7 @@ void register_IFormFactor_class(){
}
{ //::IFormFactor::evaluate
- typedef ::complex_t ( ::IFormFactor::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactor::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
IFormFactor_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index d6edb33d9890c7cdd7245f5784a68b453ef30463..4f92ab7b0a6e883b37e1968a3eb5fc16119ee7c5 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -30,16 +30,16 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
return func_clone( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & 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
- return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
+ else{
+ return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(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 );
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
+ return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
@@ -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,11 +86,11 @@ 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( );
}
@@ -98,35 +98,35 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
@@ -134,11 +134,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -146,11 +146,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( );
}
@@ -158,11 +158,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( );
}
@@ -170,11 +170,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( );
}
@@ -182,11 +182,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( );
}
@@ -194,11 +194,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( );
}
@@ -206,11 +206,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( );
}
@@ -218,11 +218,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( );
}
@@ -249,11 +249,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 );
}
@@ -261,11 +261,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( );
}
@@ -290,8 +290,8 @@ void register_IFormFactorBorn_class(){
}
{ //::IFormFactorBorn::evaluate
- typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
- typedef ::complex_t ( IFormFactorBorn_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactorBorn::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
+ typedef ::complex_t ( IFormFactorBorn_wrapper::*default_evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
IFormFactorBorn_exposer.def(
"evaluate"
@@ -368,8 +368,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 5d1d447416111a2087da045d013bc78b74d44f1b..43323f80e6b2b1cead73318fb8e5a634b3bc3953 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -31,11 +31,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( );
}
@@ -43,11 +43,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( );
}
@@ -55,11 +55,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( );
}
@@ -67,11 +67,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( );
}
@@ -79,11 +79,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( );
}
@@ -91,11 +91,11 @@ 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( );
}
@@ -103,52 +103,52 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
- 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( );
}
- virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D alpha_f_bin ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, ::Bin1D const & alpha_f_bin ) const {
bp::override func_evaluate = this->get_override( "evaluate" );
- return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_f_bin );
+ return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), boost::ref(alpha_f_bin) );
}
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -156,11 +156,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( );
}
@@ -168,11 +168,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( );
}
@@ -180,11 +180,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( );
}
@@ -192,11 +192,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( );
}
@@ -204,11 +204,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( );
}
@@ -235,11 +235,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 );
}
@@ -247,11 +247,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( );
}
@@ -364,8 +364,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"
@@ -389,7 +389,7 @@ void register_IFormFactorDecorator_class(){
}
{ //::IFormFactor::evaluate
- typedef ::complex_t ( ::IFormFactor::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D ) const;
+ typedef ::complex_t ( ::IFormFactor::*evaluate_function_type )( ::cvector_t const &,::Bin1DCVector const &,::Bin1D const & ) const;
IFormFactorDecorator_exposer.def(
"evaluate"
diff --git a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
index bb778471e308a58170b3fa69d3038ee7139f28f4..6cc8ddeffa91a0ccb9642b2f5b99a6c821aa8bbf 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -98,11 +98,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( );
}
@@ -110,11 +110,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -122,11 +122,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( );
}
@@ -134,11 +134,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( );
}
@@ -146,11 +146,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( );
}
@@ -177,11 +177,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 );
}
@@ -189,11 +189,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 9364a49d4d02aa2d9dde3caf3a2ce32e84937515..4fdcc750924443ab7986aaa7b4fdbf7c89439de2 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::Transform3D 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::Transform3D 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 270c7cda80a8a579dbb61a4e11335012fb7a3c01..5c6ebffeeede8ce3c0ae7380a7806a6c458d4b5b 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 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 );
}
@@ -121,11 +121,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 2b51f7601e0f640ec3e5a2c08b71b321bf9662fc..41b775dc6300d331c48bd8883a0c05ff65e7c393 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 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 );
}
@@ -117,11 +117,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 d758d4431865405a793bc2bded3d502fc39477d6..88da2207a83fcec68c5bb0050ed29c508ba05f91 100644
--- a/Core/PythonAPI/src/ISample.pypp.cpp
+++ b/Core/PythonAPI/src/ISample.pypp.cpp
@@ -38,11 +38,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( );
}
@@ -50,11 +50,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -62,11 +62,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -74,11 +74,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( );
}
@@ -86,11 +86,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( );
}
@@ -98,11 +98,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( );
}
@@ -110,11 +110,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( );
}
@@ -122,11 +122,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( );
}
@@ -134,11 +134,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( );
}
@@ -165,11 +165,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 );
}
@@ -177,11 +177,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 3ce253f17d13077d8ae0100c5c0eda7d61a89257..bc194a182d3208350f86fdb9543367f4586deef9 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 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 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/Instrument.pypp.cpp b/Core/PythonAPI/src/Instrument.pypp.cpp
index 32f9e1a1d1d6193fcaaa9d93eed9233e42cee0da..7e2dc045bda7dd8d658fda3e4ef1e616b4c16a2c 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 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 );
}
@@ -114,11 +114,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( );
}
@@ -152,7 +152,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"
@@ -163,7 +163,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"
@@ -221,7 +221,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 f3161ed713661bdfb72a117ed68dcf7c5f1320fa..3680bbe8c0abb90ab77f8a0bffc95370cf7c33cb 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -191,11 +191,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 );
}
@@ -203,11 +203,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 0753d66da359bb67f85b21feb74fbf942874c571..e297089f173ec461a34ad7f301585c0ff050c270 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -191,11 +191,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 );
}
@@ -203,11 +203,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 7825deaae3bd3de4a330e18d3094aeded60526b8..cebdfd43429eba881de15199e73c1c14ee6869fd 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -191,11 +191,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 );
}
@@ -203,11 +203,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 cac4dc45457ac02609254a5f00edb31c455a9e0e..60967add3e3fea8b9de38533e1a1eea5b6684ba1 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -191,11 +191,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 );
}
@@ -203,11 +203,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 842fde2fb08f7391e9ec0cf7a59bd3c0686c4eaa..a649b341c83a0d2a204f13d692680c99377855b2 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 void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::applyTransformation( boost::ref(transform) );
+ }
}
-
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,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( );
}
@@ -52,11 +52,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( );
}
@@ -64,11 +64,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -76,11 +76,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( );
}
@@ -88,11 +88,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else
+ else{
return this->Particle::getAmbientMaterial( );
+ }
}
-
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -172,11 +172,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( );
}
@@ -184,11 +184,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( );
}
@@ -215,11 +215,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 );
}
@@ -227,11 +227,11 @@ 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( );
}
@@ -239,24 +239,24 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::setTransformation( boost::ref(transform) );
+ }
}
-
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( 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( );
}
@@ -486,8 +486,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 107b589131d408c5741916b3b0cc91ce4894b752..e2cdcfdf4e158b8f57edd0de40bd943c67fbd62b 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -217,11 +217,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( );
}
@@ -229,11 +229,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( );
}
@@ -241,11 +241,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( );
}
@@ -253,11 +253,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( );
}
@@ -265,11 +265,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( );
}
@@ -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( );
}
@@ -595,8 +595,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 f88b26117a1cf14f322a0e5c18c51a319254544f..5e150acbcf60bf248ce75119bcd7cd3f8c1e6976 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -81,11 +81,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( );
}
@@ -93,11 +93,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( );
}
@@ -105,11 +105,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( );
}
@@ -117,11 +117,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( );
}
@@ -129,11 +129,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( );
}
@@ -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( );
}
@@ -391,8 +391,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 5661e67c699594409df112e55b5dd6cb2d55dbf4..f5bded2feb6178a14df38209a67c70a69e18edaa 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -95,11 +95,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( );
}
@@ -107,11 +107,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else
+ else{
return this->ISample::getCompositeSample( );
+ }
}
-
::ICompositeSample * default_getCompositeSample( ) {
return ISample::getCompositeSample( );
}
@@ -119,11 +119,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( );
}
@@ -131,11 +131,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( );
}
@@ -143,11 +143,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( );
}
@@ -174,11 +174,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 );
}
@@ -186,11 +186,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 271f7288e25336e077e0d22526bb80064b9570f4..09e937917f438c2897d405718743cccaba5ff150 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 void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::applyTransformation( boost::ref(transform) );
+ }
}
-
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,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( );
}
@@ -52,11 +52,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( );
}
@@ -64,11 +64,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -76,11 +76,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( );
}
@@ -88,11 +88,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else
+ else{
return this->Particle::getAmbientMaterial( );
+ }
}
-
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -172,11 +172,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( );
}
@@ -203,11 +203,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 );
}
@@ -215,11 +215,11 @@ 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( );
}
@@ -227,24 +227,24 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::setTransformation( boost::ref(transform) );
+ }
}
-
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( 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( );
}
@@ -452,8 +452,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 de475b94a9ec200eb4e20bc3752d1be8b0d28c3f..f498dabb226a76a59e0324502eece3e51988b95c 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -88,11 +88,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( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -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"
@@ -508,8 +508,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/OffSpecSimulation.pypp.cpp b/Core/PythonAPI/src/OffSpecSimulation.pypp.cpp
index d387505782bd2004daedfde89cefaeb520e9fb99..ef559c9a7acaf3779289d22338d73604789c6cb9 100644
--- a/Core/PythonAPI/src/OffSpecSimulation.pypp.cpp
+++ b/Core/PythonAPI/src/OffSpecSimulation.pypp.cpp
@@ -28,11 +28,11 @@ struct OffSpecSimulation_wrapper : OffSpecSimulation, bp::wrapper< OffSpecSimula
virtual ::OffSpecSimulation * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->OffSpecSimulation::clone( );
+ }
}
-
::OffSpecSimulation * default_clone( ) const {
return OffSpecSimulation::clone( );
}
@@ -40,11 +40,11 @@ struct OffSpecSimulation_wrapper : OffSpecSimulation, bp::wrapper< OffSpecSimula
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 OffSpecSimulation_wrapper : OffSpecSimulation, bp::wrapper< OffSpecSimula
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 OffSpecSimulation_wrapper : OffSpecSimulation, bp::wrapper< OffSpecSimula
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 OffSpecSimulation_wrapper : OffSpecSimulation, bp::wrapper< OffSpecSimula
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 OffSpecSimulation_wrapper : OffSpecSimulation, bp::wrapper< OffSpecSimula
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 );
}
@@ -119,11 +119,11 @@ struct OffSpecSimulation_wrapper : OffSpecSimulation, bp::wrapper< OffSpecSimula
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else
+ else{
this->IParameterized::setParametersAreChanged( );
+ }
}
-
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -257,7 +257,7 @@ void register_OffSpecSimulation_class(){
}
{ //::OffSpecSimulation::setDetectorParameters
- typedef void ( ::OffSpecSimulation::*setDetectorParameters_function_type )( ::std::size_t,double,double,::std::size_t,double,double,bool ) ;
+ typedef void ( ::OffSpecSimulation::*setDetectorParameters_function_type )( ::size_t,double,double,::size_t,double,double,bool ) ;
OffSpecSimulation_exposer.def(
"setDetectorParameters"
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 e142733be87e4e1e51dfaabc8f0e0479414a4d2b..c3254261557fc992aee7266a95d2fdc6b32681cb 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 void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::applyTransformation( boost::ref(transform) );
+ }
}
-
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -54,11 +54,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( );
}
@@ -66,11 +66,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( );
}
@@ -78,11 +78,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 );
}
@@ -90,11 +90,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else
+ else{
return this->Particle::getAmbientMaterial( );
+ }
}
-
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -102,11 +102,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( );
}
@@ -114,11 +114,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( );
}
@@ -126,11 +126,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( );
}
@@ -138,11 +138,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( );
}
@@ -150,11 +150,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::setTransformation( boost::ref(transform) );
+ }
}
-
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( boost::ref(transform) );
}
@@ -162,11 +162,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( );
}
@@ -174,11 +174,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( );
}
@@ -186,11 +186,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -198,11 +198,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( );
}
@@ -210,11 +210,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( );
}
@@ -222,11 +222,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( );
}
@@ -234,11 +234,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( );
}
@@ -246,11 +246,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( );
}
@@ -277,11 +277,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 );
}
@@ -289,24 +289,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( );
}
@@ -575,8 +575,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 ad2ab1bfa96019a4485a74313556fb36846637e6..90ac41a1912e24b9bb3caeccec4c7ee708fffa9e 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 void applyTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_applyTransformation = this->get_override( "applyTransformation" ) )
func_applyTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::applyTransformation( boost::ref(transform) );
+ }
}
-
void default_applyTransformation( ::Geometry::Transform3D const & transform ) {
Particle::applyTransformation( boost::ref(transform) );
}
@@ -40,11 +40,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( );
}
@@ -52,11 +52,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( );
}
@@ -64,11 +64,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -76,11 +76,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( );
}
@@ -88,11 +88,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::IMaterial const * getAmbientMaterial( ) const {
if( bp::override func_getAmbientMaterial = this->get_override( "getAmbientMaterial" ) )
return func_getAmbientMaterial( );
- else
+ else{
return this->Particle::getAmbientMaterial( );
+ }
}
-
::IMaterial const * default_getAmbientMaterial( ) const {
return Particle::getAmbientMaterial( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -148,11 +148,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( );
}
@@ -160,11 +160,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( );
}
@@ -172,11 +172,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( );
}
@@ -203,11 +203,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 );
}
@@ -215,11 +215,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( );
}
@@ -227,24 +227,24 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void setTransformation( ::Geometry::Transform3D const & transform ) {
if( bp::override func_setTransformation = this->get_override( "setTransformation" ) )
func_setTransformation( boost::ref(transform) );
- else
+ else{
this->Particle::setTransformation( boost::ref(transform) );
+ }
}
-
void default_setTransformation( ::Geometry::Transform3D const & transform ) {
Particle::setTransformation( 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( );
}
@@ -452,8 +452,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 780a3b774da25a21859ef5e5a9dc80d24ab48466..1c96408325b357540fc33095cdab174dbbdc6e7f 100644
--- a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
@@ -35,11 +35,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( );
}
@@ -47,83 +47,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( );
}
@@ -131,11 +131,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( );
}
@@ -143,11 +143,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -155,11 +155,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( );
}
@@ -167,11 +167,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( );
}
@@ -179,11 +179,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( );
}
@@ -191,11 +191,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( );
}
@@ -203,11 +203,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( );
}
@@ -234,11 +234,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 );
}
@@ -246,24 +246,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( );
}
@@ -342,8 +342,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"
@@ -354,7 +354,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"
@@ -376,8 +376,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"
@@ -387,8 +387,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"
@@ -398,8 +398,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"
@@ -535,8 +535,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 bea496bcbe540faf6015e251ab915be990551566..965c45de43880ecbca82793de995db82f4d46add 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -88,11 +88,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( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -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( );
}
@@ -406,8 +406,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 77d913740e9fc8a4e07155c5ba493d033c2ae658..a9e364e86be475193d7a8f4a922e45718e3b57e1 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 bool containsMagneticMaterial( ) const {
if( bp::override func_containsMagneticMaterial = this->get_override( "containsMagneticMaterial" ) )
return func_containsMagneticMaterial( );
- else
+ else{
return this->ISample::containsMagneticMaterial( );
+ }
}
-
bool default_containsMagneticMaterial( ) const {
return ISample::containsMagneticMaterial( );
}
@@ -88,11 +88,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( );
}
@@ -100,11 +100,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( );
}
@@ -112,11 +112,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( );
}
@@ -124,11 +124,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( );
}
@@ -136,11 +136,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( );
}
@@ -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( );
}
@@ -387,8 +387,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 cf08f7f28760b53dcefde1f5b3be7cabb9e6b6be..1fb3d1ba2b3473b3a6f26139fafdad64a1fd21dc 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -4,104 +4,104 @@
#include "numpy/arrayobject.h"
// the order of 3 guys above is important
-#include "IFTDistribution2D.pypp.h"
-#include "IntensityDataHelper.pypp.h"
-#include "Detector.pypp.h"
-#include "FormFactorRipple2.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 "FormFactorCylinder.pypp.h"
-#include "ICloneable.pypp.h"
-#include "StochasticSampledParameter.pypp.h"
-#include "HomogeneousMaterial.pypp.h"
+#include "Bin1D.pypp.h"
+#include "Bin1DCVector.pypp.h"
+#include "Crystal.pypp.h"
+#include "cvector_t.pypp.h"
+#include "Detector.pypp.h"
+#include "FormFactorAnisoPyramid.pypp.h"
+#include "FormFactorBox.pypp.h"
+#include "FormFactorCone.pypp.h"
#include "FormFactorCone6.pypp.h"
-#include "vector_integer_t.pypp.h"
-#include "AxisDouble.pypp.h"
-#include "IAxis.pypp.h"
-#include "FormFactorTetrahedron.pypp.h"
-#include "Layer.pypp.h"
-#include "ThreadInfo.pypp.h"
-#include "IFormFactor.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 "FormFactorSphereUniformRadius.pypp.h"
-#include "AxisBin.pypp.h"
-#include "FormFactorGauss.pypp.h"
+#include "FormFactorCrystal.pypp.h"
+#include "FormFactorCuboctahedron.pypp.h"
+#include "FormFactorCylinder.pypp.h"
+#include "FormFactorDecoratorDebyeWaller.pypp.h"
+#include "FormFactorEllipsoidalCylinder.pypp.h"
+#include "FormFactorFullSphere.pypp.h"
#include "FormFactorFullSpheroid.pypp.h"
-#include "FormFactorAnisoPyramid.pypp.h"
-#include "PythonInterface_global_variables.pypp.h"
-#include "ISampleBuilder.pypp.h"
-#include "StochasticParameter_t.pypp.h"
-#include "StochasticDoubleGaussian.pypp.h"
+#include "FormFactorGauss.pypp.h"
+#include "FormFactorHemiEllipsoid.pypp.h"
+#include "FormFactorLorentz.pypp.h"
+#include "FormFactorParallelepiped.pypp.h"
+#include "FormFactorPrism3.pypp.h"
#include "FormFactorPrism6.pypp.h"
-#include "InterferenceFunction2DLattice.pypp.h"
#include "FormFactorPyramid.pypp.h"
-#include "FormFactorBox.pypp.h"
+#include "FormFactorRipple1.pypp.h"
+#include "FormFactorRipple2.pypp.h"
+#include "FormFactorSphere.pypp.h"
+#include "FormFactorSphereGaussianRadius.pypp.h"
+#include "FormFactorSphereUniformRadius.pypp.h"
#include "FormFactorSpheroid.pypp.h"
-#include "IResolutionFunction2D.pypp.h"
-#include "IFormFactorBorn.pypp.h"
-#include "MultiLayer.pypp.h"
-#include "ParticleDecoration.pypp.h"
-#include "IDecoration.pypp.h"
+#include "FormFactorTetrahedron.pypp.h"
#include "FTDistribution2DCauchy.pypp.h"
+#include "HomogeneousMaterial.pypp.h"
+#include "IAxis.pypp.h"
+#include "ICloneable.pypp.h"
+#include "IClusteredParticles.pypp.h"
#include "ICompositeSample.pypp.h"
-#include "cvector_t.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 "FormFactorEllipsoidalCylinder.pypp.h"
-#include "MesoCrystal.pypp.h"
-#include "FormFactorDecoratorDebyeWaller.pypp.h"
-#include "vector_IFormFactorPtr_t.pypp.h"
-#include "IMaterial.pypp.h"
+#include "IDecoration.pypp.h"
+#include "IDetectorResolution.pypp.h"
+#include "IFormFactor.pypp.h"
+#include "IFormFactorBorn.pypp.h"
#include "IFormFactorDecorator.pypp.h"
+#include "IFTDistribution2D.pypp.h"
+#include "IInterferenceFunction.pypp.h"
+#include "IMaterial.pypp.h"
#include "Instrument.pypp.h"
-#include "IDetectorResolution.pypp.h"
-#include "FormFactorHemiEllipsoid.pypp.h"
+#include "IntensityData.pypp.h"
+#include "IntensityDataHelper.pypp.h"
+#include "InterferenceFunction1DParaCrystal.pypp.h"
+#include "InterferenceFunction2DLattice.pypp.h"
+#include "InterferenceFunction2DParaCrystal.pypp.h"
+#include "InterferenceFunctionNone.pypp.h"
+#include "IObservable.pypp.h"
+#include "IObserver.pypp.h"
+#include "IParameterized.pypp.h"
+#include "IResolutionFunction2D.pypp.h"
+#include "ISample.pypp.h"
+#include "ISampleBuilder.pypp.h"
#include "ISelectionRule.pypp.h"
-#include "Bin1D.pypp.h"
-#include "ParticleInfo.pypp.h"
-#include "vector_longinteger_t.pypp.h"
+#include "kvector_t.pypp.h"
+#include "Lattice.pypp.h"
+#include "Lattice2DIFParameters.pypp.h"
+#include "LatticeBasis.pypp.h"
+#include "Layer.pypp.h"
#include "LayerInterface.pypp.h"
-#include "FormFactorFullSphere.pypp.h"
-#include "Transform3D.pypp.h"
-#include "OffSpecSimulation.pypp.h"
-#include "FormFactorRipple1.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 "MaterialManager.pypp.h"
+#include "MesoCrystal.pypp.h"
+#include "MultiLayer.pypp.h"
+#include "OffSpecSimulation.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 "FormFactorCuboctahedron.pypp.h"
+#include "ParameterPool.pypp.h"
+#include "Particle.pypp.h"
+#include "ParticleBuilder.pypp.h"
+#include "ParticleCoreShell.pypp.h"
+#include "ParticleDecoration.pypp.h"
+#include "ParticleInfo.pypp.h"
+#include "PositionParticleInfo.pypp.h"
#include "PythonInterface_free_functions.pypp.h"
-#include "kvector_t.pypp.h"
+#include "PythonInterface_global_variables.pypp.h"
+#include "RealParameterWrapper.pypp.h"
+#include "ResolutionFunction2DSimple.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 "ThreadInfo.pypp.h"
+#include "Transform3D.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 ee1d7a797f57d200e23305cd031ec408cb794191..c607587eab0ffd99e151b0118fc973e1cf0132c8 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 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 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/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 71115765752fae65f0d39a719b745e1390784cc8..5c370336c3d1985f2959c6a60615c0edcdeec7cb 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 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 );
}
@@ -119,11 +119,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( );
}
@@ -236,7 +236,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"
@@ -276,7 +276,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/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/FitStrategyAdjustParameters.pypp.cpp b/Fit/PythonAPI/src/FitStrategyAdjustParameters.pypp.cpp
index fdc55ea2978494b5d97d2f8fe3e59a6460fdec11..479d5f2e21e92135e43a90ac25eca54f3d790f5b 100644
--- a/Fit/PythonAPI/src/FitStrategyAdjustParameters.pypp.cpp
+++ b/Fit/PythonAPI/src/FitStrategyAdjustParameters.pypp.cpp
@@ -33,11 +33,11 @@ struct FitStrategyAdjustParameters_wrapper : FitStrategyAdjustParameters, bp::wr
virtual void clear( ) {
if( bp::override func_clear = this->get_override( "clear" ) )
func_clear( );
- else
+ else{
this->FitStrategyAdjustParameters::clear( );
+ }
}
-
void default_clear( ) {
FitStrategyAdjustParameters::clear( );
}
@@ -45,11 +45,11 @@ struct FitStrategyAdjustParameters_wrapper : FitStrategyAdjustParameters, bp::wr
virtual ::FitStrategyAdjustParameters * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FitStrategyAdjustParameters::clone( );
+ }
}
-
::FitStrategyAdjustParameters * default_clone( ) const {
return FitStrategyAdjustParameters::clone( );
}
@@ -57,11 +57,11 @@ struct FitStrategyAdjustParameters_wrapper : FitStrategyAdjustParameters, bp::wr
virtual void execute( ) {
if( bp::override func_execute = this->get_override( "execute" ) )
func_execute( );
- else
+ else{
this->FitStrategyAdjustParameters::execute( );
+ }
}
-
void default_execute( ) {
FitStrategyAdjustParameters::execute( );
}
@@ -69,11 +69,11 @@ struct FitStrategyAdjustParameters_wrapper : FitStrategyAdjustParameters, bp::wr
virtual void setPreserveOriginalValues( bool preserve_values ) {
if( bp::override func_setPreserveOriginalValues = this->get_override( "setPreserveOriginalValues" ) )
func_setPreserveOriginalValues( preserve_values );
- else
+ else{
this->FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
}
-
void default_setPreserveOriginalValues( bool preserve_values ) {
FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
}
diff --git a/Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp b/Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp
index 8fa11cd7a45a677c21b71842f6dc79617846ec07..21be2f145fa7b9d5db95c23f892893680301f3c2 100644
--- a/Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp
+++ b/Fit/PythonAPI/src/FitStrategyDefault.pypp.cpp
@@ -33,11 +33,11 @@ struct FitStrategyDefault_wrapper : FitStrategyDefault, bp::wrapper< FitStrategy
virtual ::IFitStrategy * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FitStrategyDefault::clone( );
+ }
}
-
::IFitStrategy * default_clone( ) const {
return FitStrategyDefault::clone( );
}
@@ -45,11 +45,11 @@ struct FitStrategyDefault_wrapper : FitStrategyDefault, bp::wrapper< FitStrategy
virtual void execute( ) {
if( bp::override func_execute = this->get_override( "execute" ) )
func_execute( );
- else
+ else{
this->FitStrategyDefault::execute( );
+ }
}
-
void default_execute( ) {
FitStrategyDefault::execute( );
}
diff --git a/Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp b/Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp
index 886c16916782f580310524a783cc4f10d3442aa8..5ea8c67a98b77608acbd83fc70a23f3e38294960 100644
--- a/Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp
+++ b/Fit/PythonAPI/src/FitStrategyFixParameters.pypp.cpp
@@ -40,11 +40,11 @@ struct FitStrategyFixParameters_wrapper : FitStrategyFixParameters, bp::wrapper<
virtual void clear( ) {
if( bp::override func_clear = this->get_override( "clear" ) )
func_clear( );
- else
+ else{
this->FitStrategyFixParameters::clear( );
+ }
}
-
void default_clear( ) {
FitStrategyFixParameters::clear( );
}
@@ -52,11 +52,11 @@ struct FitStrategyFixParameters_wrapper : FitStrategyFixParameters, bp::wrapper<
virtual ::FitStrategyFixParameters * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FitStrategyFixParameters::clone( );
+ }
}
-
::FitStrategyFixParameters * default_clone( ) const {
return FitStrategyFixParameters::clone( );
}
@@ -64,11 +64,11 @@ struct FitStrategyFixParameters_wrapper : FitStrategyFixParameters, bp::wrapper<
virtual void setFixed( ::std::vector< std::string > const & pars ) {
if( bp::override func_setFixed = this->get_override( "setFixed" ) )
func_setFixed( boost::ref(pars) );
- else
+ else{
this->FitStrategyFixParameters::setFixed( boost::ref(pars) );
+ }
}
-
void default_setFixed( ::std::vector< std::string > const & pars ) {
FitStrategyFixParameters::setFixed( boost::ref(pars) );
}
@@ -76,11 +76,11 @@ struct FitStrategyFixParameters_wrapper : FitStrategyFixParameters, bp::wrapper<
virtual void execute( ) {
if( bp::override func_execute = this->get_override( "execute" ) )
func_execute( );
- else
+ else{
this->FitStrategyAdjustParameters::execute( );
+ }
}
-
void default_execute( ) {
FitStrategyAdjustParameters::execute( );
}
@@ -88,11 +88,11 @@ struct FitStrategyFixParameters_wrapper : FitStrategyFixParameters, bp::wrapper<
virtual void setPreserveOriginalValues( bool preserve_values ) {
if( bp::override func_setPreserveOriginalValues = this->get_override( "setPreserveOriginalValues" ) )
func_setPreserveOriginalValues( preserve_values );
- else
+ else{
this->FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
}
-
void default_setPreserveOriginalValues( bool preserve_values ) {
FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
}
diff --git a/Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp b/Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp
index b97d4a684760c96bacf526a96aa248b23c74e9b5..1c0e383f05183e9e9eabaf3bb623ba09c56ed81f 100644
--- a/Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp
+++ b/Fit/PythonAPI/src/FitStrategyReleaseParameters.pypp.cpp
@@ -40,11 +40,11 @@ struct FitStrategyReleaseParameters_wrapper : FitStrategyReleaseParameters, bp::
virtual void clear( ) {
if( bp::override func_clear = this->get_override( "clear" ) )
func_clear( );
- else
+ else{
this->FitStrategyReleaseParameters::clear( );
+ }
}
-
void default_clear( ) {
FitStrategyReleaseParameters::clear( );
}
@@ -52,11 +52,11 @@ struct FitStrategyReleaseParameters_wrapper : FitStrategyReleaseParameters, bp::
virtual ::FitStrategyReleaseParameters * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->FitStrategyReleaseParameters::clone( );
+ }
}
-
::FitStrategyReleaseParameters * default_clone( ) const {
return FitStrategyReleaseParameters::clone( );
}
@@ -64,11 +64,11 @@ struct FitStrategyReleaseParameters_wrapper : FitStrategyReleaseParameters, bp::
virtual void setReleased( ::std::vector< std::string > const & pars ) {
if( bp::override func_setReleased = this->get_override( "setReleased" ) )
func_setReleased( boost::ref(pars) );
- else
+ else{
this->FitStrategyReleaseParameters::setReleased( boost::ref(pars) );
+ }
}
-
void default_setReleased( ::std::vector< std::string > const & pars ) {
FitStrategyReleaseParameters::setReleased( boost::ref(pars) );
}
@@ -76,11 +76,11 @@ struct FitStrategyReleaseParameters_wrapper : FitStrategyReleaseParameters, bp::
virtual void execute( ) {
if( bp::override func_execute = this->get_override( "execute" ) )
func_execute( );
- else
+ else{
this->FitStrategyAdjustParameters::execute( );
+ }
}
-
void default_execute( ) {
FitStrategyAdjustParameters::execute( );
}
@@ -88,11 +88,11 @@ struct FitStrategyReleaseParameters_wrapper : FitStrategyReleaseParameters, bp::
virtual void setPreserveOriginalValues( bool preserve_values ) {
if( bp::override func_setPreserveOriginalValues = this->get_override( "setPreserveOriginalValues" ) )
func_setPreserveOriginalValues( preserve_values );
- else
+ else{
this->FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
+ }
}
-
void default_setPreserveOriginalValues( bool preserve_values ) {
FitStrategyAdjustParameters::setPreserveOriginalValues( preserve_values );
}
diff --git a/Fit/PythonAPI/src/FitSuite.pypp.cpp b/Fit/PythonAPI/src/FitSuite.pypp.cpp
index d873c4cc497d3f44be241f81b573de334e1411e0..a110610d2bd6c6ee6d553915855bca586cea83e5 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( );
}
@@ -193,7 +193,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"
@@ -202,7 +202,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/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 96def5a3fdc323afd4a98804371ed3c3a47eb21d..ee2e95198f4a9f5581d991b6f785171752d0f769 100644
--- a/Fit/PythonAPI/src/PythonModule.cpp
+++ b/Fit/PythonAPI/src/PythonModule.cpp
@@ -6,34 +6,34 @@ GCC_DIAG_OFF(missing-field-initializers);
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
-#include "FitStrategyFixParameters.pypp.h"
-#include "OutputDataSimpleNormalizer.pypp.h"
#include "AttFitting.pypp.h"
-#include "FitSuiteObjects.pypp.h"
-#include "ISquaredFunction.pypp.h"
-#include "MinimizerFactory.pypp.h"
-#include "SquaredFunctionMeanSquaredError.pypp.h"
-#include "OutputDataNormalizer.pypp.h"
-#include "vector_string_t.pypp.h"
-#include "MinimizerOptions.pypp.h"
-#include "IFitStrategy.pypp.h"
-#include "IOutputDataNormalizer.pypp.h"
-#include "FitParameter.pypp.h"
-#include "FitObject.pypp.h"
-#include "IMinimizer.pypp.h"
-#include "INamed.pypp.h"
-#include "FitStrategyReleaseParameters.pypp.h"
-#include "FitStrategyAdjustParameters.pypp.h"
-#include "SquaredFunctionDefault.pypp.h"
+#include "AttLimits.pypp.h"
#include "ChiSquaredModule.pypp.h"
+#include "FitObject.pypp.h"
+#include "FitParameter.pypp.h"
#include "FitStrategyAdjustMinimizer.pypp.h"
+#include "FitStrategyAdjustParameters.pypp.h"
#include "FitStrategyDefault.pypp.h"
+#include "FitStrategyFixParameters.pypp.h"
+#include "FitStrategyReleaseParameters.pypp.h"
#include "FitSuite.pypp.h"
-#include "AttLimits.pypp.h"
-#include "IChiSquaredModule.pypp.h"
+#include "FitSuiteObjects.pypp.h"
#include "FitSuiteParameters.pypp.h"
-#include "SquaredFunctionSystematicError.pypp.h"
+#include "IChiSquaredModule.pypp.h"
+#include "IFitStrategy.pypp.h"
+#include "IMinimizer.pypp.h"
+#include "INamed.pypp.h"
+#include "IOutputDataNormalizer.pypp.h"
+#include "ISquaredFunction.pypp.h"
+#include "MinimizerFactory.pypp.h"
+#include "MinimizerOptions.pypp.h"
+#include "OutputDataNormalizer.pypp.h"
+#include "OutputDataSimpleNormalizer.pypp.h"
+#include "SquaredFunctionDefault.pypp.h"
#include "SquaredFunctionGaussianError.pypp.h"
+#include "SquaredFunctionMeanSquaredError.pypp.h"
+#include "SquaredFunctionSystematicError.pypp.h"
+#include "vector_string_t.pypp.h"
BOOST_PYTHON_MODULE(libBornAgainFit){
diff --git a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
index 9b4d17d693fa41be165354c85ac9b0f22d73eebb..7657ac679b988e02b8556eb113b8e2bf1ebab022 100644
--- a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
@@ -26,11 +26,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 );
}
@@ -38,11 +38,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual double calculateSquaredError( double real_value, double simulated_value=0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionDefault::calculateSquaredError( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredError( double real_value, double simulated_value=0 ) const {
return SquaredFunctionDefault::calculateSquaredError( real_value, simulated_value );
}
@@ -50,11 +50,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/SquaredFunctionGaussianError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionGaussianError.pypp.cpp
index 532433e882e432cb1af5bc41ac0aa60d5476c2a4..f161ba6fac4d6af8823d5e9db41ffd90abf6c25b 100644
--- a/Fit/PythonAPI/src/SquaredFunctionGaussianError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionGaussianError.pypp.cpp
@@ -26,11 +26,11 @@ struct SquaredFunctionGaussianError_wrapper : SquaredFunctionGaussianError, 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->SquaredFunctionGaussianError::calculateSquaredDifference( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionGaussianError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -38,11 +38,11 @@ struct SquaredFunctionGaussianError_wrapper : SquaredFunctionGaussianError, bp::
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->SquaredFunctionGaussianError::calculateSquaredError( arg0, arg1 );
+ }
}
-
double default_calculateSquaredError( double arg0, double arg1 ) const {
return SquaredFunctionGaussianError::calculateSquaredError( arg0, arg1 );
}
@@ -50,11 +50,11 @@ struct SquaredFunctionGaussianError_wrapper : SquaredFunctionGaussianError, bp::
virtual ::SquaredFunctionGaussianError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SquaredFunctionGaussianError::clone( );
+ }
}
-
::SquaredFunctionGaussianError * default_clone( ) const {
return SquaredFunctionGaussianError::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp
index 39872437b176f59bc5e684936fc89b856e26b368..11117888e514dc8889c895445bb3f367a3dc68e8 100644
--- a/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionMeanSquaredError.pypp.cpp
@@ -26,11 +26,11 @@ struct SquaredFunctionMeanSquaredError_wrapper : SquaredFunctionMeanSquaredError
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->SquaredFunctionMeanSquaredError::calculateSquaredDifference( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionMeanSquaredError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -38,11 +38,11 @@ struct SquaredFunctionMeanSquaredError_wrapper : SquaredFunctionMeanSquaredError
virtual double calculateSquaredError( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionMeanSquaredError::calculateSquaredError( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredError( double real_value, double simulated_value ) const {
return SquaredFunctionMeanSquaredError::calculateSquaredError( real_value, simulated_value );
}
@@ -50,11 +50,11 @@ struct SquaredFunctionMeanSquaredError_wrapper : SquaredFunctionMeanSquaredError
virtual ::SquaredFunctionMeanSquaredError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SquaredFunctionMeanSquaredError::clone( );
+ }
}
-
::SquaredFunctionMeanSquaredError * default_clone( ) const {
return SquaredFunctionMeanSquaredError::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp
index 3c321f1af1aeaebc187a7c4fbe426bfe6798147a..9798b5586db26adcc5a8b2cedb29de924a67bf22 100644
--- a/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionSystematicError.pypp.cpp
@@ -26,11 +26,11 @@ struct SquaredFunctionSystematicError_wrapper : SquaredFunctionSystematicError,
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->SquaredFunctionSystematicError::calculateSquaredDifference( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionSystematicError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -38,11 +38,11 @@ struct SquaredFunctionSystematicError_wrapper : SquaredFunctionSystematicError,
virtual double calculateSquaredError( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else
+ else{
return this->SquaredFunctionSystematicError::calculateSquaredError( real_value, simulated_value );
+ }
}
-
double default_calculateSquaredError( double real_value, double simulated_value ) const {
return SquaredFunctionSystematicError::calculateSquaredError( real_value, simulated_value );
}
@@ -50,11 +50,11 @@ struct SquaredFunctionSystematicError_wrapper : SquaredFunctionSystematicError,
virtual ::SquaredFunctionSystematicError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else
+ else{
return this->SquaredFunctionSystematicError::clone( );
+ }
}
-
::SquaredFunctionSystematicError * default_clone( ) const {
return SquaredFunctionSystematicError::clone( );
}