Skip to content
Snippets Groups Projects
Commit fdbb282c authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Python classes for: Provide automatic generation of diffuse scattering particles: part I

parent 5ca0c600
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ TEMPLATE = lib ...@@ -6,7 +6,7 @@ TEMPLATE = lib
CONFIG += plugin # to remove versions from file name CONFIG += plugin # to remove versions from file name
#CONFIG += debug #CONFIG += debug
QT -= core gui QT -= core gui
#CONFIG += BUILD_PYTHON_BOOST_MODULE # to generate python interface CONFIG += BUILD_PYTHON_BOOST_MODULE # to generate python interface
# including common project properties # including common project properties
include($$PWD/../shared.pri) include($$PWD/../shared.pri)
......
This diff is collapsed.
...@@ -64,6 +64,18 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr ...@@ -64,6 +64,18 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
return FormFactorPyramid::clone( ); return FormFactorPyramid::clone( );
} }
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
else{
return this->FormFactorPyramid::getHeight( );
}
}
double default_getHeight( ) const {
return FormFactorPyramid::getHeight( );
}
virtual int getNumberOfStochasticParameters( ) const { virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) ) if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( ); return func_getNumberOfStochasticParameters( );
...@@ -88,7 +100,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr ...@@ -88,7 +100,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples ); IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
} }
virtual ::ParameterPool * createParameterTree( ) { virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) ) if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( ); return func_createParameterTree( );
else{ else{
...@@ -96,7 +108,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr ...@@ -96,7 +108,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
} }
} }
::ParameterPool * default_createParameterTree( ) { ::ParameterPool * default_createParameterTree( ) const {
return ISample::createParameterTree( ); return ISample::createParameterTree( );
} }
...@@ -112,18 +124,6 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr ...@@ -112,18 +124,6 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f), alpha_i, alpha_f ); return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f), alpha_i, alpha_f );
} }
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
else{
return this->IFormFactor::getHeight( );
}
}
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
virtual double getVolume( ) const { virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) ) if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( ); return func_getVolume( );
...@@ -217,6 +217,10 @@ void register_classes_2(){ ...@@ -217,6 +217,10 @@ void register_classes_2(){
, (::FormFactorPyramid * ( ::FormFactorPyramid::* )( ) const)(&::FormFactorPyramid::clone) , (::FormFactorPyramid * ( ::FormFactorPyramid::* )( ) const)(&::FormFactorPyramid::clone)
, (::FormFactorPyramid * ( FormFactorPyramid_wrapper::* )( ) const)(&FormFactorPyramid_wrapper::default_clone) , (::FormFactorPyramid * ( FormFactorPyramid_wrapper::* )( ) const)(&FormFactorPyramid_wrapper::default_clone)
, bp::return_value_policy< bp::manage_new_object >() ) , bp::return_value_policy< bp::manage_new_object >() )
.def(
"getHeight"
, (double ( ::FormFactorPyramid::* )( ) const)(&::FormFactorPyramid::getHeight)
, (double ( FormFactorPyramid_wrapper::* )( ) const)(&FormFactorPyramid_wrapper::default_getHeight) )
.def( .def(
"getNumberOfStochasticParameters" "getNumberOfStochasticParameters"
, (int ( ::FormFactorPyramid::* )( ) const)(&::FormFactorPyramid::getNumberOfStochasticParameters) , (int ( ::FormFactorPyramid::* )( ) const)(&::FormFactorPyramid::getNumberOfStochasticParameters)
...@@ -229,18 +233,14 @@ void register_classes_2(){ ...@@ -229,18 +233,14 @@ void register_classes_2(){
, bp::return_value_policy< bp::manage_new_object >() ) , bp::return_value_policy< bp::manage_new_object >() )
.def( .def(
"createParameterTree" "createParameterTree"
, (::ParameterPool * ( ::ISample::* )( ) )(&::ISample::createParameterTree) , (::ParameterPool * ( ::ISample::* )( ) const)(&::ISample::createParameterTree)
, (::ParameterPool * ( FormFactorPyramid_wrapper::* )( ) )(&FormFactorPyramid_wrapper::default_createParameterTree) , (::ParameterPool * ( FormFactorPyramid_wrapper::* )( ) const)(&FormFactorPyramid_wrapper::default_createParameterTree)
, bp::return_value_policy< bp::manage_new_object >() ) , bp::return_value_policy< bp::manage_new_object >() )
.def( .def(
"evaluate" "evaluate"
, (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::cvector_t const &,double,double ) const)(&::IFormFactorBorn::evaluate) , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::cvector_t const &,double,double ) const)(&::IFormFactorBorn::evaluate)
, (::complex_t ( FormFactorPyramid_wrapper::* )( ::cvector_t const &,::cvector_t const &,double,double ) const)(&FormFactorPyramid_wrapper::default_evaluate) , (::complex_t ( FormFactorPyramid_wrapper::* )( ::cvector_t const &,::cvector_t const &,double,double ) const)(&FormFactorPyramid_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f"), bp::arg("alpha_i"), bp::arg("alpha_f") ) ) , ( bp::arg("k_i"), bp::arg("k_f"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getHeight"
, (double ( ::IFormFactor::* )( ) const)(&::IFormFactor::getHeight)
, (double ( FormFactorPyramid_wrapper::* )( ) const)(&FormFactorPyramid_wrapper::default_getHeight) )
.def( .def(
"getVolume" "getVolume"
, (double ( ::IFormFactor::* )( ) const)(&::IFormFactor::getVolume) , (double ( ::IFormFactor::* )( ) const)(&::IFormFactor::getVolume)
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment