diff --git a/Core/FormFactors/src/FormFactorTetrahedron.cpp b/Core/FormFactors/src/FormFactorTetrahedron.cpp
index a513d30b601f15c5e02ffec6d4150aefb42bcc17..7d7830b3a189ded76c6773592191795046f18849 100644
--- a/Core/FormFactors/src/FormFactorTetrahedron.cpp
+++ b/Core/FormFactors/src/FormFactorTetrahedron.cpp
@@ -88,7 +88,7 @@ complex_t FormFactorTetrahedron::Integrand(double Z, void* params) const
return xy_part *std::exp(complex_t(0.0, 1.0)*m_q.z()*Z);
}
-complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
+/*complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
{ m_q = q;
if ( std::abs(m_q.mag()) < Numeric::double_epsilon) {
@@ -106,10 +106,10 @@ complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
return integral;
}
-}
+}*/
///////////////////
-/*complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
+complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
{
double H = m_height;
double R = m_length/2.0;
@@ -131,14 +131,14 @@ complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
if (std::abs(qx*qx-3.0*qy*qy) <= Numeric::double_epsilon) {
if (std::abs(qx) <= Numeric::double_epsilon) {
- if (std::abs(qz) <= Numeric::double_epsilon) {*/
+ if (std::abs(qz) <= Numeric::double_epsilon) {
// //volume
- /* double sqrt3HdivRtga = m_root3*H/R/tga;
+ double sqrt3HdivRtga = m_root3*H/R/tga;
F = tga/3.*R*R*R*(1. -
(1.-sqrt3HdivRtga)*(1.-sqrt3HdivRtga)*(1.-sqrt3HdivRtga));
- } else {*/
+ } else {
// qx=qy=0 qz!=0
- /* complex_t qzH_half = qz*H/2.0;
+ complex_t qzH_half = qz*H/2.0;
F = m_root3*H*std::exp(im*qzH_half)*(
MathFunctions::Sinc(qzH_half)*
(R*R-im*2.*m_root3*R/(qz*tga)-6./(qz*qz*tga*tga))
@@ -146,9 +146,9 @@ complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
2.*im*R - im*m_root3*H/tga + 2.*m_root3/(qz*tga)));
}
- } else {*/
+ } else {
// qx**2-3qy**2
- /*complex_t qa = 2.0*qy/tga + qz/2.0;
+ complex_t qa = 2.0*qy/tga + qz/2.0;
F = H*m_root3*std::exp(im*2.0*qy*R/m_root3)*(
MathFunctions::Sinc(q3*H)
*(1.0 +m_root3*qy*(-im*2.0*R + m_root3/(q3*tga)))
@@ -158,11 +158,11 @@ complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
}
} else {
- if (std::abs(qx) <= Numeric::double_epsilon) {*/
+ if (std::abs(qx) <= Numeric::double_epsilon) {
//qx=0 qy!=0 case with pb
- // F = m_integrator->integrate(0., m_height);
+ //F = m_integrator->integrate(0., m_height);
- /* complex_t q2x0 =(1./2.)*(qy/tga + qz);
+ complex_t q2x0 =(1./2.)*(qy/tga + qz);
if (std::abs(q2x0) >= Numeric::double_epsilon)
F= 2.*H/(m_root3)*std::exp(im*qz*(L+H)/2.)*(
@@ -172,27 +172,25 @@ complex_t FormFactorTetrahedron::evaluate_for_q(const cvector_t& q) const
3./(qy*q2x0*tga)*std::exp(im*q2x0*H)
)
-std::exp(im*q3*L)*MathFunctions::Sinc(q3*H)/qy/qy
- );*/
- //2./3.*im *(-6.*im * std::exp((1./3.*im) * (-qy*R*m_root3*tga +3.*qz*H*tga + 3.*qy*H)/tga) *R*(qy*qy*qy)* tga-3.*im *std::exp((1./3.*im)*(-qy*R*m_root3*tga+3.*qz*H*tga + 3.*qy*H)/tga)*R*(qy*qy)*qz*(tga*tga)
- //+ (6.*im)*H* std::exp((1./3.*im)* (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga)* (2. / 3.*im)* ((-6.*im) * std::exp((1. / 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * R * (qy*qy*qy) * tga + (-3.*im) * std::exp((1. / 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * R * (qy*qy) * qz * (tga*tga) + (6.*im) * H * std::exp((1./3.*im)* (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * m_root3 * (qy*qy*qy) + (6.*im) * std::exp((-1./3.*im) * qy * R * m_root3) * R * (qy*qy*qy) * tga + (-3.*im) * H* std::exp((1. / 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * m_root3 * qy * (qz*qz) * (tga*tga) + (3.*im) * std::exp((1. / 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * R * qy * (qz*qz) * (tga*tga*tga)+ (3.*im) * H * std::exp((1./ 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * m_root3 * (qy*qy) * qz * tga + (-3.*im) * std::exp((-1. / 3.*im) * qy * R * m_root3) * R * qy * (qz*qz) * (tga*tga*tga) + std::exp((1. / 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * m_root3 * (qz*qz) * (tga*tga*tga)- std::exp((-1. / 3.*im) * (-2. * qy * R * m_root3 * tga - 3. * qz * H * tga + 6. * qy * H) / tga) * m_root3 * (qz*qz)) * (tga*tga*tga) + (3.*im) * std::exp((-1. / 3.*im) * qy * R * m_root3) * R * (qy*qy) * qz * (tga*tga) - std::exp((-1. / 3.*im) * qy * R * m_root3) * m_root3 * (qz*qz) * (tga*tga*tga) + m_root3 * std::exp((2. / 3.*im) * qy * R * m_root3) * (qz*qz) * (tga*tga*tga) + 2. * std::exp((1. / 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * m_root3 * qy * qz * (tga*tga) - 2. * std::exp((-1. / 3.*im) * (-2. * qy * R * m_root3 * tga - 3. * qz * H * tga + 6. * qy * H) / tga) * m_root3 * qy * qz * (tga*tga) - 2. * std::exp((-1. / 3.*im) * qy * R * m_root3) * m_root3 * qy * qz * (tga*tga) + 2.*m_root3 * std::exp((2. / 3.*im) * qy * R * m_root3) * qy * qz * (tga*tga) - 8. * std::exp((1. / 3.*im) * (-qy * R * m_root3 * tga + 3. * qz * H * tga + 3. * qy * H) / tga) * m_root3 * (qy*qy) * tga - std::exp((-1. / 3.*im) * (-2. * qy * R * m_root3* tga - 3. * qz * H * tga + 6. * qy * H) / tga) * m_root3 * (qy*qy) * tga + 8. * std::exp((-1./3.*im) * qy * R * m_root3) * m_root3 * (qy*qy) * tga + m_root3*std::exp((2./3.*im) * qy * R * m_root3)*(qy*qy) * tga)/((qz * tga +qy)*(qz*tga+qy))/(-qz*tga+2.*qy)/(qy*qy);
+ );
- // else {
- // // q2==0
- /* F = 2.*H/(m_root3*qy*qy)*(
+ else {
+ // q2==0
+ F = 2.*H/(m_root3*qy*qy)*(
-std::exp(im*2.*qy*R/m_root3)*MathFunctions::Sinc(qz*3.*H/2.)
+std::exp(-im*qy*R/m_root3)*(1.0+im*3.*qy*L/(2.*tga))
);
}
- } else {*/
+ } else {
//general case
- /* F =-(1.+m_root3*qy/qx)*MathFunctions::Sinc(q1*H)*std::exp(im*q1*L)
+ F =-(1.+m_root3*qy/qx)*MathFunctions::Sinc(q1*H)*std::exp(im*q1*L)
-(1.-m_root3*qy/qx)*MathFunctions::Sinc(q2*H)*std::exp(-im*q2*L)
+2.*MathFunctions::Sinc(q3*H)*std::exp(im*q3*L);
F = H*m_root3*std::exp(im*qz*R*tga/m_root3)/(qx*qx-3.*qy*qy)*F;
}
}
return F;
-}*/
+}
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/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index e40e2599bd06ee0d28131b792dc00d6993e646f3..1fb3d1ba2b3473b3a6f26139fafdad64a1fd21dc 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -4,102 +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 "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 "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"
@@ -156,6 +158,7 @@ BOOST_PYTHON_MODULE(libBornAgainCore){
register_FormFactorSphereGaussianRadius_class();
register_FormFactorSphereUniformRadius_class();
register_FormFactorSpheroid_class();
+ register_FormFactorTetrahedron_class();
register_kvector_t_class();
register_cvector_t_class();
register_Transform3D_class();
@@ -185,6 +188,7 @@ BOOST_PYTHON_MODULE(libBornAgainCore){
register_MaterialManager_class();
register_MesoCrystal_class();
register_MultiLayer_class();
+ register_OffSpecSimulation_class();
register_IntensityData_class();
register_OutputDataIOFactory_class();
register_ParameterPool_class();
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/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( );
}