diff --git a/App/App.pro b/App/App.pro
index c50a9f0e17705b9289fc8091a551851fc5a012ac..288e81fd60049b8d9ed64946f4f57c025783b317 100644
--- a/App/App.pro
+++ b/App/App.pro
@@ -143,7 +143,7 @@ HEADERS += \
inc/TestRoughness.h \
inc/TestToySimulation.h \
inc/TreeEventStructure.h \
- inc/Version.h
+ inc/Version.h \
LOCATIONS = $$PWD/inc \
@@ -165,12 +165,12 @@ DEPENDPATH += $${LOCATIONS}
# -----------------------------------------------------------------------------
# to throw exception in the case floating point exception
# -----------------------------------------------------------------------------
-CONFIG(DEBUG) {
- QMAKE_CXXFLAGS_DEBUG += -DDEBUG_FPE
- # mac requires his own patched version of fp_exceptions
- macx:HEADERS += inc/fp_exception_glibc_extension.h
- macx:SOURCES += src/fp_exception_glibc_extension.c
-}
+#CONFIG(DEBUG) {
+# QMAKE_CXXFLAGS_DEBUG += -DDEBUG_FPE
+# # mac requires his own patched version of fp_exceptions
+# macx:HEADERS += inc/fp_exception_glibc_extension.h
+# macx:SOURCES += src/fp_exception_glibc_extension.c
+#}
# -----------------------------------------------------------------------------
# additional libraries
diff --git a/App/src/main.cpp b/App/src/main.cpp
index d577fe576977a9db2b9a7a036ce500e2e23349ce..4a387566ef05667712495a679ff3f9407783eaaa 100644
--- a/App/src/main.cpp
+++ b/App/src/main.cpp
@@ -20,28 +20,19 @@
#include "CoreOptionsDescription.h"
#include "Version.h"
#include "MessageService.h"
+#include "Utils.h"
#include <iostream>
#include <string>
#include "TROOT.h"
#include "TApplication.h"
-#ifdef DEBUG_FPE
-#include <fenv.h>
-#ifdef Q_OS_MAC
-#include "fp_exception_glibc_extension.h"
-#endif
-#endif
-
//! Universal test program.
int main(int argc, char **argv)
{
-#ifdef DEBUG_FPE
- std::cout << "main() -> Enabling floating point exception debugging"
- << std::endl;
- feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
-#endif
+ Utils::EnableFloatingPointExceptions();
+
std::cout << AppVersion::g_app_name << " "
<< AppVersion::g_app_version_number << std::endl;
diff --git a/Core/Algorithms/src/DecouplingApproximationStrategy.cpp b/Core/Algorithms/src/DecouplingApproximationStrategy.cpp
index f08698cd4647bda4ab0f7e7958f08cdabfeb1da7..3b992770680b4c8e4fd8d91d069445572f4554d8 100644
--- a/Core/Algorithms/src/DecouplingApproximationStrategy.cpp
+++ b/Core/Algorithms/src/DecouplingApproximationStrategy.cpp
@@ -15,6 +15,7 @@
#include "DecouplingApproximationStrategy.h"
#include "Exceptions.h"
+#include <cassert>
void DecouplingApproximationStrategy::init(
const SafePointerVector<FormFactorInfo>& form_factor_infos,
@@ -37,9 +38,16 @@ double DecouplingApproximationStrategy::evaluate(
for (size_t i=0; i<m_ff_infos.size(); ++i) {
complex_t ff =
m_ff_infos[i]->mp_ff->evaluate(k_i, k_f_bin, alpha_i, alpha_f);
+
double fraction = m_ff_infos[i]->m_abundance;
amplitude += fraction*ff;
intensity += fraction*(std::norm(ff));
+
+ assert(!std::isnan(amplitude.real()));
+ assert(!std::isnan(amplitude.imag()));
+ assert(!std::isinf(amplitude.real()));
+ assert(!std::isinf(amplitude.imag()));
+
}
double amplitude_norm = std::norm(amplitude);
double itf_function = m_ifs[0]->evaluate(k_i-k_f_bin.getMidPoint());
diff --git a/Core/Algorithms/src/LocalMonodisperseApproximationStrategy.cpp b/Core/Algorithms/src/LocalMonodisperseApproximationStrategy.cpp
index 60df8a00e2f6664c1ea667ebe6be81aea3f1c03d..339dc762e344bec4731e4d534d1a695506295e02 100644
--- a/Core/Algorithms/src/LocalMonodisperseApproximationStrategy.cpp
+++ b/Core/Algorithms/src/LocalMonodisperseApproximationStrategy.cpp
@@ -15,6 +15,8 @@
#include "LocalMonodisperseApproximationStrategy.h"
#include "Exceptions.h"
+#include <cassert>
+
LocalMonodisperseApproximationStrategy::LocalMonodisperseApproximationStrategy(SimulationParameters sim_params)
: IInterferenceFunctionStrategy(sim_params)
@@ -56,6 +58,9 @@ double LocalMonodisperseApproximationStrategy::evaluate(const cvector_t& k_i,
intensity += fraction*(itf_function*std::norm(ff));
}
}
+ assert(!std::isnan(intensity));
+ assert(!std::isinf(intensity));
+
return intensity;
}
diff --git a/Core/Algorithms/src/OpticalFresnel.cpp b/Core/Algorithms/src/OpticalFresnel.cpp
index b52d927b458098a5da3b7e1d720d86d0a37b32e3..989ef54de7b39e8c6e52711fff3496875e19551f 100644
--- a/Core/Algorithms/src/OpticalFresnel.cpp
+++ b/Core/Algorithms/src/OpticalFresnel.cpp
@@ -17,6 +17,7 @@
#include <algorithm>
#include "OpticalFresnel.h"
#include "Numeric.h"
+#include <cassert>
void OpticalFresnel::execute(const MultiLayer& sample, const kvector_t& kvec, MultiLayerCoeff_t& coeff)
{
@@ -41,6 +42,27 @@ void OpticalFresnel::execute(const MultiLayer& sample, const kvector_t& kvec, Mu
calculateX2(sample, coeff);
calculateRT2(sample, coeff);
+
+#ifdef DEBUG_FPE
+ // checking coeff
+ for(size_t i=0; i<coeff.size(); ++i) {
+ assert(!std::isnan(coeff[i].kz.real()));
+ assert(!std::isinf(coeff[i].kz.real()));
+ assert(!std::isnan(coeff[i].kz.imag()));
+ assert(!std::isinf(coeff[i].kz.imag()));
+ //
+ assert(!std::isnan(coeff[i].R.real()));
+ assert(!std::isinf(coeff[i].R.real()));
+ assert(!std::isnan(coeff[i].R.imag()));
+ assert(!std::isinf(coeff[i].R.imag()));
+ //
+ assert(!std::isnan(coeff[i].T.real()));
+ assert(!std::isinf(coeff[i].T.real()));
+ assert(!std::isnan(coeff[i].T.imag()));
+ assert(!std::isinf(coeff[i].T.imag()));
+ }
+#endif
+
}
void OpticalFresnel::calculateKZ(const MultiLayer& sample, const kvector_t& kvec, MultiLayerCoeff_t& coeff) const
diff --git a/Core/Core.pro b/Core/Core.pro
index 313c474eb56a5512e2b5628d04fe527b28e9cdcf..dd1ec7100d375682caa144c54f744783a038ec7b 100644
--- a/Core/Core.pro
+++ b/Core/Core.pro
@@ -6,7 +6,13 @@ TEMPLATE = lib
CONFIG += plugin # to remove versions from file name
QT -= core gui
QMAKE_EXTENSION_SHLIB = so # making standard *.so extension
-# CONFIG += BORNAGAIN_PYTHON
+#CONFIG += BORNAGAIN_PYTHON
+
+# -----------------------------------------------------------------------------
+# common project settings
+# -----------------------------------------------------------------------------
+include($$PWD/../shared.pri)
+
# -----------------------------------------------------------------------------
# source and headers
@@ -305,6 +311,24 @@ contains(CONFIG, BORNAGAIN_PYTHON) {
include($$PWD/python_module.pri)
}
+# -----------------------------------------------------------------------------
+# propagating operation system type inside the code FIXME
+# -----------------------------------------------------------------------------
+# (note, that when Qt libraries are used, it is already done in <qglobal.h>)
+macx {
+ DEFINES += Q_OS_MAC
+}
+unix:!macx {
+ DEFINES += Q_OS_LINUX
+}
+
+CONFIG(debug, debug|release) {
+ QMAKE_CXXFLAGS_DEBUG += -DDEBUG_FPE
+ # mac requires his own patched version of fp_exceptions
+ macx:HEADERS += Tools/inc/fp_exception_glibc_extension.h
+ macx:SOURCES += Tools/src/fp_exception_glibc_extension.c
+}
+
# -----------------------------------------------------------------------------
# Installing library into dedicated directory at the end of compilation
@@ -314,8 +338,3 @@ INSTALLS += target
QMAKE_DISTCLEAN += $$target.path/$(TARGET)
QMAKE_POST_LINK = (make install)
-# -----------------------------------------------------------------------------
-# common project settings
-# -----------------------------------------------------------------------------
-include($$PWD/../shared.pri)
-
diff --git a/Core/Fitting/inc/FitSuite.h b/Core/Fitting/inc/FitSuite.h
index c45f7527c839643474aa4429e4a98bb5a81a577a..d4fc3188051c773db38d626a53fc4ee7bc05fdb5 100644
--- a/Core/Fitting/inc/FitSuite.h
+++ b/Core/Fitting/inc/FitSuite.h
@@ -88,7 +88,7 @@ class FitSuite : public IObservable
void printResults() const;
//! set print level
- void setPrintLevel(int print_every_nth);
+ void initPrint(int print_every_nth);
AttFitting &getAttributes() { return m_fit_attributes; }
void setAttributes(const AttFitting &fit_attributes) { m_fit_attributes = fit_attributes; }
diff --git a/Core/Fitting/inc/FitSuiteParameters.h b/Core/Fitting/inc/FitSuiteParameters.h
index 053ed1df027c85e43f5f2e1eade9fcf3fbb1292c..375395e1d427eca1d40f76c4f06c3b9f52a11cb9 100644
--- a/Core/Fitting/inc/FitSuiteParameters.h
+++ b/Core/Fitting/inc/FitSuiteParameters.h
@@ -28,7 +28,8 @@ class ParameterPool;
class FitSuiteParameters
{
public:
- typedef SafePointerVector<FitParameter > parameters_t;
+ //typedef SafePointerVector<FitParameter > parameters_t;
+ typedef std::vector<FitParameter * > parameters_t;
typedef parameters_t::iterator iterator;
typedef parameters_t::const_iterator const_iterator;
diff --git a/Core/Fitting/src/FitSuite.cpp b/Core/Fitting/src/FitSuite.cpp
index 8216bab1171d366f752a548861b103099c0ff6c6..99f607bee34b7246e7f7317b2677b522826f98cc 100644
--- a/Core/Fitting/src/FitSuite.cpp
+++ b/Core/Fitting/src/FitSuite.cpp
@@ -153,7 +153,7 @@ void FitSuite::printResults() const
}
// set print level
-void FitSuite::setPrintLevel(int print_every_nth)
+void FitSuite::initPrint(int print_every_nth)
{
boost::shared_ptr<FitSuitePrintObserver > observer(new FitSuitePrintObserver(print_every_nth));
attachObserver(observer);
diff --git a/Core/Fitting/src/FitSuiteParameters.cpp b/Core/Fitting/src/FitSuiteParameters.cpp
index b4bd838a683d2c9487b38ee1afb063d6d0bf0567..bba30a3469707d2729678dca6e1109500a869b41 100644
--- a/Core/Fitting/src/FitSuiteParameters.cpp
+++ b/Core/Fitting/src/FitSuiteParameters.cpp
@@ -20,6 +20,7 @@
//! clear all defined parameters
void FitSuiteParameters::clear()
{
+ for(parameters_t::iterator it = m_parameters.begin(); it!=m_parameters.end(); ++it) delete (*it);
m_parameters.clear();
}
diff --git a/Core/PythonAPI/inc/PythonPlusplusHelper.h b/Core/PythonAPI/inc/PythonPlusplusHelper.h
index 0e163e980636e7fa3ea5ab6dfc279fbfcff5a8df..a313ceef9f6a666f04b0a0464cef4319325d540a 100644
--- a/Core/PythonAPI/inc/PythonPlusplusHelper.h
+++ b/Core/PythonAPI/inc/PythonPlusplusHelper.h
@@ -22,9 +22,10 @@
#include "IFormFactor.h"
#include "MaterialManager.h"
#include "IStochasticParameter.h"
+#include "OutputData.h"
-// there is some weared behavior of pyplusplus
-// without this definition it gets screwed up as soon as it sees in the code vector<kvector> like in LatticeBasis.h
+
+//! this is special namespace to help Py++ generate correct names
namespace pyplusplus {
namespace aliases {
using namespace Geometry;
@@ -37,10 +38,13 @@ namespace pyplusplus {
typedef std::vector<IFormFactor *> vector_IFormFactorPtr_t;
typedef ISingleton<MaterialManager> MaterialManagerSingleton_t;
typedef StochasticParameter<double> StochasticParameter_t;
+ typedef OutputData<double > ndimdata_t;
+ typedef std::vector<int > vector_integer_t;
+ typedef std::vector<unsigned long int > vector_longinteger_t;
}
}
-//! To help pyplusplus to expose kvector_t in python during automatic code generation.
+//! helper class to provide Py++ with explicit template instantiations
class PythonPlusplusHelper
{
@@ -52,6 +56,15 @@ class PythonPlusplusHelper
size_t pyplusplus_boost_vectorof_cvector() { return sizeof(pyplusplus::aliases::vector_cvector_t); }
size_t pyplusplus_boost_vectorof_DiffuseParticleInfoPtr() { return sizeof(pyplusplus::aliases::vector_DiffuseParticleInfoPtr_t); }
size_t pyplusplus_boost_stochastic_parameter() { return sizeof(pyplusplus::aliases::StochasticParameter_t); }
+ size_t pyplusplus_boost_outputdata() { return sizeof(pyplusplus::aliases::ndimdata_t); }
};
+//! helper function to set value via subscript operator from python
+template <class Self, class Key, class Value>
+void pyplusplus_setitem(Self& self, Key const& key, Value const& value)
+{
+ self[key] = value;
+}
+
+
#endif // PYTHONPLUSPLUSHELPER_H
diff --git a/Core/PythonAPI/inc/__call_policies.pypp.hpp b/Core/PythonAPI/inc/__call_policies.pypp.hpp
index 4b3f4cc1da1d9584bcf73e21600ec6a153ef32a9..06d8f24fdac0f194ff9c34cb73176132c3fb0925 100644
--- a/Core/PythonAPI/inc/__call_policies.pypp.hpp
+++ b/Core/PythonAPI/inc/__call_policies.pypp.hpp
@@ -155,7 +155,7 @@ struct as_tuple_impl{
}
static PyTypeObject const *get_pytype(){
- return& PyTuple_Type;
+ return &PyTuple_Type;
}
};
diff --git a/Core/PythonAPI/inc/__convenience.pypp.hpp b/Core/PythonAPI/inc/__convenience.pypp.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..da5c4d86ea081137ac164024e8b242f8051bafb2
--- /dev/null
+++ b/Core/PythonAPI/inc/__convenience.pypp.hpp
@@ -0,0 +1,191 @@
+// This file has been generated by Py++.
+
+// Copyright 2004-2008 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __convenience_pyplusplus_hpp__
+#define __convenience_pyplusplus_hpp__
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+
+namespace pyplusplus{ namespace convenience{
+
+//TODO: Replace index_type with Boost.Python defined ssize_t type.
+// This should be done by checking Python and Boost.Python version.
+typedef int index_type;
+
+inline void
+raise_error( PyObject *exception, const char *message ){
+ PyErr_SetString(exception, message);
+ boost::python::throw_error_already_set();
+}
+
+inline index_type sequence_len(boost::python::object const& obj){
+ if( !PySequence_Check( obj.ptr() ) ){
+ raise_error( PyExc_TypeError, "Sequence expected" );
+ }
+
+ index_type result = PyObject_Length( obj.ptr() );
+ if( PyErr_Occurred() ){
+ boost::python::throw_error_already_set();
+ }
+ return result;
+}
+
+inline void
+ensure_sequence( boost::python::object seq, index_type expected_length=-1 ){
+ index_type length = sequence_len( seq );
+ if( expected_length != -1 && length != expected_length ){
+ std::stringstream err;
+ err << "Expected sequence length is " << expected_length << ". "
+ << "Actual sequence length is " << length << ".";
+ raise_error( PyExc_ValueError, err.str().c_str() );
+ }
+}
+
+template< class ExpectedType >
+void ensure_uniform_sequence( boost::python::object seq, index_type expected_length=-1 ){
+ ensure_sequence( seq, expected_length );
+
+ index_type length = sequence_len( seq );
+ for( index_type index = 0; index < length; ++index ){
+ boost::python::object item = seq[index];
+
+ boost::python::extract<ExpectedType> type_checker( item );
+ if( !type_checker.check() ){
+ std::string expected_type_name( boost::python::type_id<ExpectedType>().name() );
+
+ std::string item_type_name("different");
+ PyObject* item_impl = item.ptr();
+ if( item_impl && item_impl->ob_type && item_impl->ob_type->tp_name ){
+ item_type_name = std::string( item_impl->ob_type->tp_name );
+ }
+
+ std::stringstream err;
+ err << "Sequence should contain only items with type \"" << expected_type_name << "\". "
+ << "Item at position " << index << " has \"" << item_type_name << "\" type.";
+ raise_error( PyExc_ValueError, err.str().c_str() );
+ }
+ }
+}
+
+template< class Iterator, class Inserter >
+void copy_container( Iterator begin, Iterator end, Inserter inserter ){
+ for( Iterator index = begin; index != end; ++index )
+ inserter( *index );
+}
+
+template< class Inserter >
+void copy_sequence( boost::python::object const& seq, Inserter inserter ){
+ index_type length = sequence_len( seq );
+ for( index_type index = 0; index < length; ++index ){
+ inserter = seq[index];
+ }
+}
+
+template< class Inserter, class TItemType >
+void copy_sequence( boost::python::object const& seq, Inserter inserter, boost::type< TItemType > ){
+ index_type length = sequence_len( seq );
+ for( index_type index = 0; index < length; ++index ){
+ boost::python::object item = seq[index];
+ inserter = boost::python::extract< TItemType >( item );
+ }
+}
+
+struct list_inserter{
+ list_inserter( boost::python::list& py_list )
+ : m_py_list( py_list )
+ {}
+
+ template< class T >
+ void operator()( T const & value ){
+ m_py_list.append( value );
+ }
+private:
+ boost::python::list& m_py_list;
+};
+
+template < class T >
+struct array_inserter_t{
+ array_inserter_t( T* array, index_type size )
+ : m_array( array )
+ , m_curr_pos( 0 )
+ , m_size( size )
+ {}
+
+ void insert( const T& item ){
+ if( m_size <= m_curr_pos ){
+ std::stringstream err;
+ err << "Index out of range. Array size is" << m_size << ", "
+ << "current position is" << m_curr_pos << ".";
+ raise_error( PyExc_ValueError, err.str().c_str() );
+ }
+ m_array[ m_curr_pos ] = item;
+ m_curr_pos += 1;
+ }
+
+ array_inserter_t<T>&
+ operator=( boost::python::object const & item ){
+ insert( boost::python::extract< T >( item ) );
+ return *this;
+ }
+
+private:
+ T* m_array;
+ index_type m_curr_pos;
+ const index_type m_size;
+};
+
+template< class T>
+array_inserter_t<T> array_inserter( T* array, index_type size ){
+ return array_inserter_t<T>( array, size );
+}
+
+inline boost::python::object
+get_out_argument( boost::python::object result, const char* arg_name ){
+ if( !PySequence_Check( result.ptr() ) ){
+ return result;
+ }
+ boost::python::object cls = boost::python::getattr( result, "__class__" );
+ boost::python::object cls_name = boost::python::getattr( cls, "__name__" );
+ std::string name = boost::python::extract< std::string >( cls_name );
+ if( "named_tuple" == name ){
+ return boost::python::getattr( result, arg_name );
+ }
+ else{
+ return result;
+ }
+
+}
+
+inline boost::python::object
+get_out_argument( boost::python::object result, index_type index ){
+ if( !PySequence_Check( result.ptr() ) ){
+ return result;
+ }
+ boost::python::object cls = boost::python::getattr( result, "__class__" );
+ boost::python::object cls_name = boost::python::getattr( cls, "__name__" );
+ std::string name = boost::python::extract< std::string >( cls_name );
+ if( "named_tuple" == name ){
+ return result[ index ];
+ }
+ else{
+ return result;
+ }
+}
+
+} /*pyplusplus*/ } /*convenience*/
+
+namespace pyplus_conv = pyplusplus::convenience;
+
+#endif//__convenience_pyplusplus_hpp__
+
+
diff --git a/Fit/PythonAPI/inc/ndimdata_t.pypp.h b/Core/PythonAPI/inc/ndimdata_t.pypp.h
similarity index 100%
rename from Fit/PythonAPI/inc/ndimdata_t.pypp.h
rename to Core/PythonAPI/inc/ndimdata_t.pypp.h
diff --git a/Core/PythonAPI/inc/vector_integer_t.pypp.h b/Core/PythonAPI/inc/vector_integer_t.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..5e65e50f2a98f5cd41b3f0a0197f8fd4d051e0c5
--- /dev/null
+++ b/Core/PythonAPI/inc/vector_integer_t.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef vector_integer_t_hpp__pyplusplus_wrapper
+#define vector_integer_t_hpp__pyplusplus_wrapper
+
+void register_vector_integer_t_class();
+
+#endif//vector_integer_t_hpp__pyplusplus_wrapper
diff --git a/Core/PythonAPI/inc/vector_longinteger_t.pypp.h b/Core/PythonAPI/inc/vector_longinteger_t.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..59e4375f3a4531a8f626f60bed43559e42fec37f
--- /dev/null
+++ b/Core/PythonAPI/inc/vector_longinteger_t.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef vector_longinteger_t_hpp__pyplusplus_wrapper
+#define vector_longinteger_t_hpp__pyplusplus_wrapper
+
+void register_vector_longinteger_t_class();
+
+#endif//vector_longinteger_t_hpp__pyplusplus_wrapper
diff --git a/Core/PythonAPI/src/Bin1D.pypp.cpp b/Core/PythonAPI/src/Bin1D.pypp.cpp
index 8499255cb223cc635d0aaf2f50749b0dc9af3350..1133402b44e068dbad85740ea3d859b96b21a6b8 100644
--- a/Core/PythonAPI/src/Bin1D.pypp.cpp
+++ b/Core/PythonAPI/src/Bin1D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -82,9 +83,9 @@ void register_Bin1D_class(){
bp::class_< Bin1D >( "Bin1D" )
.def(
"getMidPoint"
- , (double ( ::Bin1D::* )( ) const)(& ::Bin1D::getMidPoint ) )
- .def_readwrite( "m_lower",& Bin1D::m_lower )
- .def_readwrite( "m_upper",& Bin1D::m_upper )
+ , (double ( ::Bin1D::* )( ) const)( &::Bin1D::getMidPoint ) )
+ .def_readwrite( "m_lower", &Bin1D::m_lower )
+ .def_readwrite( "m_upper", &Bin1D::m_upper )
.def( bp::self != bp::self )
.def( bp::self == bp::self );
diff --git a/Core/PythonAPI/src/Bin1DCVector.pypp.cpp b/Core/PythonAPI/src/Bin1DCVector.pypp.cpp
index 53bec5c8f54c6797c2797847321059de58fd5077..071f2316e48601325b6d6416789e072ad387dfd3 100644
--- a/Core/PythonAPI/src/Bin1DCVector.pypp.cpp
+++ b/Core/PythonAPI/src/Bin1DCVector.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -80,15 +81,15 @@ namespace bp = boost::python;
void register_Bin1DCVector_class(){
bp::class_< Bin1DCVector >( "Bin1DCVector", bp::init< >() )
- .def( bp::init< cvector_t const& , cvector_t const& >(( bp::arg("lower"), bp::arg("upper") )) )
- .def( bp::init< double, Bin1D const& , Bin1D const& >(( bp::arg("wavelength"), bp::arg("alpha_bin"), bp::arg("phi_bin") )) )
+ .def( bp::init< cvector_t const &, cvector_t const & >(( bp::arg("lower"), bp::arg("upper") )) )
+ .def( bp::init< double, Bin1D const &, Bin1D const & >(( bp::arg("wavelength"), bp::arg("alpha_bin"), bp::arg("phi_bin") )) )
.def(
"getDelta"
- , (::cvector_t ( ::Bin1DCVector::* )( ) const)(& ::Bin1DCVector::getDelta ) )
+ , (::cvector_t ( ::Bin1DCVector::* )( ) const)( &::Bin1DCVector::getDelta ) )
.def(
"getMidPoint"
- , (::cvector_t ( ::Bin1DCVector::* )( ) const)(& ::Bin1DCVector::getMidPoint ) )
- .def_readwrite( "m_q_lower",& Bin1DCVector::m_q_lower )
- .def_readwrite( "m_q_upper",& Bin1DCVector::m_q_upper );
+ , (::cvector_t ( ::Bin1DCVector::* )( ) const)( &::Bin1DCVector::getMidPoint ) )
+ .def_readwrite( "m_q_lower", &Bin1DCVector::m_q_lower )
+ .def_readwrite( "m_q_upper", &Bin1DCVector::m_q_upper );
}
diff --git a/Core/PythonAPI/src/Crystal.pypp.cpp b/Core/PythonAPI/src/Crystal.pypp.cpp
index 7ba40924476e094866cfdfc29246a44349eeed60..c4a201288765ac5ab212808470623d9acc60e9ba 100644
--- a/Core/PythonAPI/src/Crystal.pypp.cpp
+++ b/Core/PythonAPI/src/Crystal.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
- Crystal_wrapper(::LatticeBasis const& lattice_basis, ::Lattice const& lattice )
+ Crystal_wrapper(::LatticeBasis const & lattice_basis, ::Lattice const & lattice )
: Crystal( boost::ref(lattice_basis), boost::ref(lattice) )
, bp::wrapper< Crystal >(){
// constructor
@@ -98,7 +101,7 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
return Crystal::clone( );
}
- virtual ::std::vector< DiffuseParticleInfo* > * createDiffuseParticleInfo( ::ParticleInfo const& parent_info ) const {
+ virtual ::std::vector< DiffuseParticleInfo* > * createDiffuseParticleInfo( ::ParticleInfo const & parent_info ) const {
if( bp::override func_createDiffuseParticleInfo = this->get_override( "createDiffuseParticleInfo" ) )
return func_createDiffuseParticleInfo( boost::ref(parent_info) );
else{
@@ -106,11 +109,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
}
}
- ::std::vector< DiffuseParticleInfo* > * default_createDiffuseParticleInfo( ::ParticleInfo const& parent_info ) const {
+ ::std::vector< DiffuseParticleInfo* > * default_createDiffuseParticleInfo( ::ParticleInfo const & parent_info ) const {
return Crystal::createDiffuseParticleInfo( boost::ref(parent_info) );
}
- virtual ::IFormFactor * createTotalFormFactor( ::IFormFactor const& meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
+ virtual ::IFormFactor * createTotalFormFactor( ::IFormFactor const & meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
if( bp::override func_createTotalFormFactor = this->get_override( "createTotalFormFactor" ) )
return func_createTotalFormFactor( boost::ref(meso_crystal_form_factor), ambient_refractive_index );
else{
@@ -118,7 +121,7 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
}
}
- ::IFormFactor * default_createTotalFormFactor( ::IFormFactor const& meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
+ ::IFormFactor * default_createTotalFormFactor( ::IFormFactor const & meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
return Crystal::createTotalFormFactor( boost::ref(meso_crystal_form_factor), ambient_refractive_index );
}
@@ -146,6 +149,18 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -206,6 +221,37 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< Crystal_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -234,7 +280,7 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
void register_Crystal_class(){
- bp::class_< Crystal_wrapper, bp::bases< IClusteredParticles >, boost::noncopyable >( "Crystal", bp::init< LatticeBasis const& , Lattice const& >(( bp::arg("lattice_basis"), bp::arg("lattice") )) )
+ bp::class_< Crystal_wrapper, bp::bases< IClusteredParticles >, boost::noncopyable >( "Crystal", bp::init< LatticeBasis const &, Lattice const & >(( bp::arg("lattice_basis"), bp::arg("lattice") )) )
.def(
"clone"
, (::Crystal * ( ::Crystal::* )( ) const)(&::Crystal::clone)
@@ -242,26 +288,26 @@ void register_Crystal_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createBasis"
- , (::Particle * ( ::Crystal::* )( ) const)(& ::Crystal::createBasis )
+ , (::Particle * ( ::Crystal::* )( ) const)( &::Crystal::createBasis )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createDiffuseParticleInfo"
- , (::std::vector< DiffuseParticleInfo* > * ( ::Crystal::* )( ::ParticleInfo const& ) const)(&::Crystal::createDiffuseParticleInfo)
- , (::std::vector< DiffuseParticleInfo* > * ( Crystal_wrapper::* )( ::ParticleInfo const& ) const)(&Crystal_wrapper::default_createDiffuseParticleInfo)
+ , (::std::vector< DiffuseParticleInfo* > * ( ::Crystal::* )( ::ParticleInfo const & ) const)(&::Crystal::createDiffuseParticleInfo)
+ , (::std::vector< DiffuseParticleInfo* > * ( Crystal_wrapper::* )( ::ParticleInfo const & ) const)(&Crystal_wrapper::default_createDiffuseParticleInfo)
, ( bp::arg("parent_info") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createTotalFormFactor"
- , (::IFormFactor * ( ::Crystal::* )( ::IFormFactor const& ,::complex_t ) const)(&::Crystal::createTotalFormFactor)
- , (::IFormFactor * ( Crystal_wrapper::* )( ::IFormFactor const& ,::complex_t ) const)(&Crystal_wrapper::default_createTotalFormFactor)
+ , (::IFormFactor * ( ::Crystal::* )( ::IFormFactor const &,::complex_t ) const)(&::Crystal::createTotalFormFactor)
+ , (::IFormFactor * ( Crystal_wrapper::* )( ::IFormFactor const &,::complex_t ) const)(&Crystal_wrapper::default_createTotalFormFactor)
, ( bp::arg("meso_crystal_form_factor"), bp::arg("ambient_refractive_index") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"getLattice"
- , (::Lattice ( ::Crystal::* )( ) const)(& ::Crystal::getLattice ) )
+ , (::Lattice ( ::Crystal::* )( ) const)( &::Crystal::getLattice ) )
.def(
"getLatticeBasis"
- , (::LatticeBasis const * ( ::Crystal::* )( ) const)(& ::Crystal::getLatticeBasis )
+ , (::LatticeBasis const * ( ::Crystal::* )( ) const)( &::Crystal::getLatticeBasis )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"setAmbientRefractiveIndex"
@@ -270,12 +316,16 @@ void register_Crystal_class(){
, ( bp::arg("refractive_index") ) )
.def(
"setDWFactor"
- , (void ( ::Crystal::* )( double ) )(& ::Crystal::setDWFactor )
+ , (void ( ::Crystal::* )( double ) )( &::Crystal::setDWFactor )
, ( bp::arg("dw_factor") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( Crystal_wrapper::* )( ) )(&Crystal_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( Crystal_wrapper::* )( ) )(&Crystal_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -299,6 +349,15 @@ void register_Crystal_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( Crystal_wrapper::* )( ) )(&Crystal_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &Crystal_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( Crystal_wrapper::* )( ::std::string const &,double ) )(&Crystal_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/DiffuseDWBASimulation.pypp.cpp b/Core/PythonAPI/src/DiffuseDWBASimulation.pypp.cpp
index eb4abae503642629162bec033a8097c282808613..e40041bfbc7a12fb18cb0644a3b920ae2121e6ad 100644
--- a/Core/PythonAPI/src/DiffuseDWBASimulation.pypp.cpp
+++ b/Core/PythonAPI/src/DiffuseDWBASimulation.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -117,10 +118,10 @@ void register_DiffuseDWBASimulation_class(){
bp::class_< DiffuseDWBASimulation_wrapper, bp::bases< LayerDWBASimulation >, boost::noncopyable >( "DiffuseDWBASimulation", bp::init< >() )
.def(
"getSize"
- , (::size_t ( ::DiffuseDWBASimulation::* )( ) const)(& ::DiffuseDWBASimulation::getSize ) )
+ , (::size_t ( ::DiffuseDWBASimulation::* )( ) const)( &::DiffuseDWBASimulation::getSize ) )
.def(
"rescaleAbundances"
- , (void ( ::DiffuseDWBASimulation::* )( double ) )(& ::DiffuseDWBASimulation::rescaleAbundances )
+ , (void ( ::DiffuseDWBASimulation::* )( double ) )( &::DiffuseDWBASimulation::rescaleAbundances )
, ( bp::arg("factor") ) )
.def(
"run"
@@ -128,11 +129,11 @@ void register_DiffuseDWBASimulation_class(){
, (void ( DiffuseDWBASimulation_wrapper::* )( ) )(&DiffuseDWBASimulation_wrapper::default_run) )
.def(
"setRefractiveIndex"
- , (void ( ::DiffuseDWBASimulation::* )( ::complex_t ) )(& ::DiffuseDWBASimulation::setRefractiveIndex )
+ , (void ( ::DiffuseDWBASimulation::* )( ::complex_t ) )( &::DiffuseDWBASimulation::setRefractiveIndex )
, ( bp::arg("n") ) )
.def(
"setSurfaceDensity"
- , (void ( ::DiffuseDWBASimulation::* )( double ) )(& ::DiffuseDWBASimulation::setSurfaceDensity )
+ , (void ( ::DiffuseDWBASimulation::* )( double ) )( &::DiffuseDWBASimulation::setSurfaceDensity )
, ( bp::arg("surface_density") ) )
.def(
"clone"
diff --git a/Core/PythonAPI/src/DiffuseParticleInfo.pypp.cpp b/Core/PythonAPI/src/DiffuseParticleInfo.pypp.cpp
index 091686426005deab205309190c7d8d6fcc61f0bc..4d08286f4e5ab22c99bd6c5be107d065d302f469 100644
--- a/Core/PythonAPI/src/DiffuseParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/DiffuseParticleInfo.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -103,6 +106,18 @@ struct DiffuseParticleInfo_wrapper : DiffuseParticleInfo, bp::wrapper< DiffusePa
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -163,6 +178,37 @@ struct DiffuseParticleInfo_wrapper : DiffuseParticleInfo, bp::wrapper< DiffusePa
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< DiffuseParticleInfo_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -199,30 +245,34 @@ void register_DiffuseParticleInfo_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"getHeightRange"
- , (double ( ::DiffuseParticleInfo::* )( ) const)(& ::DiffuseParticleInfo::getHeightRange ) )
+ , (double ( ::DiffuseParticleInfo::* )( ) const)( &::DiffuseParticleInfo::getHeightRange ) )
.def(
"getNumberPerMeso"
- , (double ( ::DiffuseParticleInfo::* )( ) const)(& ::DiffuseParticleInfo::getNumberPerMeso ) )
+ , (double ( ::DiffuseParticleInfo::* )( ) const)( &::DiffuseParticleInfo::getNumberPerMeso ) )
.def(
"scaleAbundance"
- , (void ( ::DiffuseParticleInfo::* )( double ) )(& ::DiffuseParticleInfo::scaleAbundance )
+ , (void ( ::DiffuseParticleInfo::* )( double ) )( &::DiffuseParticleInfo::scaleAbundance )
, ( bp::arg("factor") ) )
.def(
"scaleNumberPerMeso"
- , (void ( ::DiffuseParticleInfo::* )( double ) )(& ::DiffuseParticleInfo::scaleNumberPerMeso )
+ , (void ( ::DiffuseParticleInfo::* )( double ) )( &::DiffuseParticleInfo::scaleNumberPerMeso )
, ( bp::arg("factor") ) )
.def(
"setHeightRange"
- , (void ( ::DiffuseParticleInfo::* )( double ) )(& ::DiffuseParticleInfo::setHeightRange )
+ , (void ( ::DiffuseParticleInfo::* )( double ) )( &::DiffuseParticleInfo::setHeightRange )
, ( bp::arg("height_range") ) )
.def(
"setNumberPerMeso"
- , (void ( ::DiffuseParticleInfo::* )( double ) )(& ::DiffuseParticleInfo::setNumberPerMeso )
+ , (void ( ::DiffuseParticleInfo::* )( double ) )( &::DiffuseParticleInfo::setNumberPerMeso )
, ( bp::arg("n") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( DiffuseParticleInfo_wrapper::* )( ) )(&DiffuseParticleInfo_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( DiffuseParticleInfo_wrapper::* )( ) )(&DiffuseParticleInfo_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -246,6 +296,15 @@ void register_DiffuseParticleInfo_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( DiffuseParticleInfo_wrapper::* )( ) )(&DiffuseParticleInfo_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &DiffuseParticleInfo_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( DiffuseParticleInfo_wrapper::* )( ::std::string const &,double ) )(&DiffuseParticleInfo_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
index b0ebd796ea6315592190ec22f41741a7f370157b..0972a469a6b1fd8c45e272cfc2a6c5aeaa929600 100644
--- a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
+++ b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTDistribution2DCauchy > {
- FTDistribution2DCauchy_wrapper(FTDistribution2DCauchy const& arg )
+ FTDistribution2DCauchy_wrapper(FTDistribution2DCauchy const & arg )
: FTDistribution2DCauchy( arg )
, bp::wrapper< FTDistribution2DCauchy >(){
// copy constructor
@@ -117,7 +120,7 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
return FTDistribution2DCauchy::evaluate( qx, qy );
}
- virtual void transformToStarBasis( double qX, double qY, double alpha, double a, double b, double& qa, double& qb ) const {
+ virtual void transformToStarBasis( double qX, double qY, double alpha, double a, double b, double & qa, double & qb ) const {
if( bp::override func_transformToStarBasis = this->get_override( "transformToStarBasis" ) )
func_transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
else{
@@ -125,7 +128,7 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
}
}
- void default_transformToStarBasis( double qX, double qY, double alpha, double a, double b, double& qa, double& qb ) const {
+ void default_transformToStarBasis( double qX, double qY, double alpha, double a, double b, double & qa, double & qb ) const {
FTDistribution2DCauchy::transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
}
@@ -141,6 +144,18 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -165,6 +180,37 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
IParameterized::printParameters( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FTDistribution2DCauchy_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -194,13 +240,17 @@ void register_FTDistribution2DCauchy_class(){
, ( bp::arg("qx"), bp::arg("qy") ) )
.def(
"transformToStarBasis"
- , (void ( ::FTDistribution2DCauchy::* )( double,double,double,double,double,double& ,double& ) const)(&::FTDistribution2DCauchy::transformToStarBasis)
- , (void ( FTDistribution2DCauchy_wrapper::* )( double,double,double,double,double,double& ,double& ) const)(&FTDistribution2DCauchy_wrapper::default_transformToStarBasis)
+ , (void ( ::FTDistribution2DCauchy::* )( double,double,double,double,double,double &,double & ) const)(&::FTDistribution2DCauchy::transformToStarBasis)
+ , (void ( FTDistribution2DCauchy_wrapper::* )( double,double,double,double,double,double &,double & ) const)(&FTDistribution2DCauchy_wrapper::default_transformToStarBasis)
, ( bp::arg("qX"), bp::arg("qY"), bp::arg("alpha"), bp::arg("a"), bp::arg("b"), bp::arg("qa"), bp::arg("qb") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FTDistribution2DCauchy_wrapper::* )( ) )(&FTDistribution2DCauchy_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FTDistribution2DCauchy_wrapper::* )( ) )(&FTDistribution2DCauchy_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -210,6 +260,15 @@ void register_FTDistribution2DCauchy_class(){
"printParameters"
, (void ( ::IParameterized::* )( ) const)(&::IParameterized::printParameters)
, (void ( FTDistribution2DCauchy_wrapper::* )( ) const)(&FTDistribution2DCauchy_wrapper::default_printParameters) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FTDistribution2DCauchy_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FTDistribution2DCauchy_wrapper::* )( ::std::string const &,double ) )(&FTDistribution2DCauchy_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index 74b1200fa8569a7b5404b29eb0196020b3be8927..7aecce678fe1e5641747fcff2ed404acbe66b5cf 100644
--- a/Core/PythonAPI/src/FormFactorBox.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
return FormFactorBox::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -106,7 +109,7 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorBox::evaluate_for_q( boost::ref(q) );
}
@@ -170,7 +173,19 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -178,7 +193,7 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -194,7 +209,7 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -202,7 +217,7 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -242,7 +257,26 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorBox_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -250,10 +284,22 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -278,8 +324,8 @@ void register_FormFactorBox_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorBox::* )( ::cvector_t const& ) const)(&::FormFactorBox::evaluate_for_q)
- , (::complex_t ( FormFactorBox_wrapper::* )( ::cvector_t const& ) const)(&FormFactorBox_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorBox::* )( ::cvector_t const & ) const)(&::FormFactorBox::evaluate_for_q)
+ , (::complex_t ( FormFactorBox_wrapper::* )( ::cvector_t const & ) const)(&FormFactorBox_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -299,15 +345,19 @@ void register_FormFactorBox_class(){
, (double ( FormFactorBox_wrapper::* )( ) const)(&FormFactorBox_wrapper::default_getVolume) )
.def(
"getwidth"
- , (double ( ::FormFactorBox::* )( ) const)(& ::FormFactorBox::getwidth ) )
+ , (double ( ::FormFactorBox::* )( ) const)( &::FormFactorBox::getwidth ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorBox_wrapper::* )( ) )(&FormFactorBox_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorBox_wrapper::* )( ) )(&FormFactorBox_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorBox_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorBox_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorBox_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorBox_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -317,8 +367,8 @@ void register_FormFactorBox_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorBox_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorBox_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorBox_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorBox_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"isDistributedFormFactor"
@@ -332,11 +382,20 @@ void register_FormFactorBox_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorBox_wrapper::* )( ) )(&FormFactorBox_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorBox_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorBox_wrapper::* )( ::complex_t const& ) )(&FormFactorBox_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorBox_wrapper::* )( ::complex_t const & ) )(&FormFactorBox_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorBox_wrapper::* )( ::std::string const &,double ) )(&FormFactorBox_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index e888209dc0c52f8cc3f5a503f95637ed1b690503..6dce8aeadd04d1c004374588e9534ead6230af52 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCrystal > {
- FormFactorCrystal_wrapper(::Crystal const& p_crystal, ::IFormFactor const& meso_crystal_form_factor, ::complex_t const& ambient_refractive_index )
+ FormFactorCrystal_wrapper(::Crystal const & p_crystal, ::IFormFactor const & meso_crystal_form_factor, ::complex_t const & ambient_refractive_index )
: FormFactorCrystal( boost::ref(p_crystal), boost::ref(meso_crystal_form_factor), boost::ref(ambient_refractive_index) )
, bp::wrapper< FormFactorCrystal >(){
// constructor
@@ -110,7 +113,7 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
return FormFactorCrystal::getVolume( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -118,7 +121,7 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
FormFactorCrystal::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -134,7 +137,19 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -142,7 +157,7 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -158,7 +173,7 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -166,11 +181,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" );
return func_evaluate_for_q( boost::ref(q) );
}
@@ -247,6 +262,37 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorCrystal_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -263,7 +309,7 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
void register_FormFactorCrystal_class(){
- bp::class_< FormFactorCrystal_wrapper, bp::bases< IFormFactorBorn >, boost::noncopyable >( "FormFactorCrystal", bp::init< Crystal const& , IFormFactor const& , complex_t const& >(( bp::arg("p_crystal"), bp::arg("meso_crystal_form_factor"), bp::arg("ambient_refractive_index") )) )
+ bp::class_< FormFactorCrystal_wrapper, bp::bases< IFormFactorBorn >, boost::noncopyable >( "FormFactorCrystal", bp::init< Crystal const &, IFormFactor const &, complex_t const & >(( bp::arg("p_crystal"), bp::arg("meso_crystal_form_factor"), bp::arg("ambient_refractive_index") )) )
.def(
"clone"
, (::FormFactorCrystal * ( ::FormFactorCrystal::* )( ) const)(&::FormFactorCrystal::clone)
@@ -275,17 +321,21 @@ void register_FormFactorCrystal_class(){
, (double ( FormFactorCrystal_wrapper::* )( ) const)(&FormFactorCrystal_wrapper::default_getVolume) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::FormFactorCrystal::* )( ::complex_t const& ) )(&::FormFactorCrystal::setAmbientRefractiveIndex)
- , (void ( FormFactorCrystal_wrapper::* )( ::complex_t const& ) )(&FormFactorCrystal_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::FormFactorCrystal::* )( ::complex_t const & ) )(&::FormFactorCrystal::setAmbientRefractiveIndex)
+ , (void ( FormFactorCrystal_wrapper::* )( ::complex_t const & ) )(&FormFactorCrystal_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorCrystal_wrapper::* )( ) )(&FormFactorCrystal_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorCrystal_wrapper::* )( ) )(&FormFactorCrystal_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorCrystal_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorCrystal_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorCrystal_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorCrystal_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -295,12 +345,12 @@ void register_FormFactorCrystal_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorCrystal_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorCrystal_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorCrystal_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorCrystal_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"evaluate_for_q"
- , bp::pure_virtual( (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ) const)(&::IFormFactorBorn::evaluate_for_q) )
+ , bp::pure_virtual( (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const & ) const)(&::IFormFactorBorn::evaluate_for_q) )
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -326,6 +376,15 @@ void register_FormFactorCrystal_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorCrystal_wrapper::* )( ) )(&FormFactorCrystal_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorCrystal_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorCrystal_wrapper::* )( ::std::string const &,double ) )(&FormFactorCrystal_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index ce2bbfcf4e46cbf1202db1f194b681055ec9bb38..1472ee829c29fd236f689f401e1461928f84357b 100644
--- a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
return FormFactorCylinder::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -106,7 +109,7 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCylinder::evaluate_for_q( boost::ref(q) );
}
@@ -158,7 +161,19 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -166,7 +181,7 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -182,7 +197,7 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -190,7 +205,7 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -242,7 +257,26 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorCylinder_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -250,10 +284,22 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -278,8 +324,8 @@ void register_FormFactorCylinder_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorCylinder::* )( ::cvector_t const& ) const)(&::FormFactorCylinder::evaluate_for_q)
- , (::complex_t ( FormFactorCylinder_wrapper::* )( ::cvector_t const& ) const)(&FormFactorCylinder_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorCylinder::* )( ::cvector_t const & ) const)(&::FormFactorCylinder::evaluate_for_q)
+ , (::complex_t ( FormFactorCylinder_wrapper::* )( ::cvector_t const & ) const)(&FormFactorCylinder_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -297,10 +343,14 @@ void register_FormFactorCylinder_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorCylinder_wrapper::* )( ) )(&FormFactorCylinder_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorCylinder_wrapper::* )( ) )(&FormFactorCylinder_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorCylinder_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorCylinder_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorCylinder_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorCylinder_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -310,8 +360,8 @@ void register_FormFactorCylinder_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorCylinder_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorCylinder_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorCylinder_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorCylinder_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getVolume"
@@ -329,11 +379,20 @@ void register_FormFactorCylinder_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorCylinder_wrapper::* )( ) )(&FormFactorCylinder_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorCylinder_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorCylinder_wrapper::* )( ::complex_t const& ) )(&FormFactorCylinder_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorCylinder_wrapper::* )( ::complex_t const & ) )(&FormFactorCylinder_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorCylinder_wrapper::* )( ::std::string const &,double ) )(&FormFactorCylinder_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index 25781aa7ed73e8fe7a784e7e6d1d5246cf033b18..358baf2596031d8a7d0b537afdd3ae114a16b231 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller, bp::wrapper< FormFactorDecoratorDebyeWaller > {
- FormFactorDecoratorDebyeWaller_wrapper(::IFormFactor const& p_form_factor, double dw_h_factor, double dw_r_factor )
+ FormFactorDecoratorDebyeWaller_wrapper(::IFormFactor const & p_form_factor, double dw_h_factor, double dw_r_factor )
: FormFactorDecoratorDebyeWaller( boost::ref(p_form_factor), dw_h_factor, dw_r_factor )
, bp::wrapper< FormFactorDecoratorDebyeWaller >(){
// constructor
@@ -98,7 +101,7 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
return FormFactorDecoratorDebyeWaller::clone( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -106,7 +109,7 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -134,7 +137,19 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -142,7 +157,7 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -230,7 +245,26 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorDecoratorDebyeWaller_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -238,10 +272,22 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactorDecorator::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -258,7 +304,7 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
void register_FormFactorDecoratorDebyeWaller_class(){
- bp::class_< FormFactorDecoratorDebyeWaller_wrapper, bp::bases< IFormFactorDecorator >, boost::noncopyable >( "FormFactorDecoratorDebyeWaller", bp::init< IFormFactor const& , double, double >(( bp::arg("p_form_factor"), bp::arg("dw_h_factor"), bp::arg("dw_r_factor") )) )
+ bp::class_< FormFactorDecoratorDebyeWaller_wrapper, bp::bases< IFormFactorDecorator >, boost::noncopyable >( "FormFactorDecoratorDebyeWaller", bp::init< IFormFactor const &, double, double >(( bp::arg("p_form_factor"), bp::arg("dw_h_factor"), bp::arg("dw_r_factor") )) )
.def(
"clone"
, (::FormFactorDecoratorDebyeWaller * ( ::FormFactorDecoratorDebyeWaller::* )( ) const)(&::FormFactorDecoratorDebyeWaller::clone)
@@ -266,8 +312,8 @@ void register_FormFactorDecoratorDebyeWaller_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::FormFactorDecoratorDebyeWaller::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::FormFactorDecoratorDebyeWaller::evaluate)
- , (::complex_t ( FormFactorDecoratorDebyeWaller_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorDecoratorDebyeWaller_wrapper::default_evaluate)
+ , (::complex_t ( ::FormFactorDecoratorDebyeWaller::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::FormFactorDecoratorDebyeWaller::evaluate)
+ , (::complex_t ( FormFactorDecoratorDebyeWaller_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorDecoratorDebyeWaller_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getNumberOfStochasticParameters"
@@ -277,10 +323,14 @@ void register_FormFactorDecoratorDebyeWaller_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorDecoratorDebyeWaller_wrapper::* )( ) )(&FormFactorDecoratorDebyeWaller_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorDecoratorDebyeWaller_wrapper::* )( ) )(&FormFactorDecoratorDebyeWaller_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorDecoratorDebyeWaller_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorDecoratorDebyeWaller_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorDecoratorDebyeWaller_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorDecoratorDebyeWaller_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -312,11 +362,20 @@ void register_FormFactorDecoratorDebyeWaller_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorDecoratorDebyeWaller_wrapper::* )( ) )(&FormFactorDecoratorDebyeWaller_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorDecoratorDebyeWaller_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactorDecorator::* )( ::complex_t const& ) )(&::IFormFactorDecorator::setAmbientRefractiveIndex)
- , (void ( FormFactorDecoratorDebyeWaller_wrapper::* )( ::complex_t const& ) )(&FormFactorDecoratorDebyeWaller_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactorDecorator::* )( ::complex_t const & ) )(&::IFormFactorDecorator::setAmbientRefractiveIndex)
+ , (void ( FormFactorDecoratorDebyeWaller_wrapper::* )( ::complex_t const & ) )(&FormFactorDecoratorDebyeWaller_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorDecoratorDebyeWaller_wrapper::* )( ::std::string const &,double ) )(&FormFactorDecoratorDebyeWaller_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index e8cc98984eb2d97faa17d7998efc631bcc217e8f..e277e7a3a1cc7cba7aa1866848c597cb24530f29 100644
--- a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
return FormFactorFullSphere::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -106,7 +109,7 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorFullSphere::evaluate_for_q( boost::ref(q) );
}
@@ -158,7 +161,19 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -166,7 +181,7 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -182,7 +197,7 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -190,7 +205,7 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -242,7 +257,26 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorFullSphere_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -250,10 +284,22 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -278,8 +324,8 @@ void register_FormFactorFullSphere_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorFullSphere::* )( ::cvector_t const& ) const)(&::FormFactorFullSphere::evaluate_for_q)
- , (::complex_t ( FormFactorFullSphere_wrapper::* )( ::cvector_t const& ) const)(&FormFactorFullSphere_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorFullSphere::* )( ::cvector_t const & ) const)(&::FormFactorFullSphere::evaluate_for_q)
+ , (::complex_t ( FormFactorFullSphere_wrapper::* )( ::cvector_t const & ) const)(&FormFactorFullSphere_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -297,10 +343,14 @@ void register_FormFactorFullSphere_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorFullSphere_wrapper::* )( ) )(&FormFactorFullSphere_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorFullSphere_wrapper::* )( ) )(&FormFactorFullSphere_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorFullSphere_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorFullSphere_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorFullSphere_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorFullSphere_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -310,8 +360,8 @@ void register_FormFactorFullSphere_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorFullSphere_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorFullSphere_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorFullSphere_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorFullSphere_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getVolume"
@@ -329,11 +379,20 @@ void register_FormFactorFullSphere_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorFullSphere_wrapper::* )( ) )(&FormFactorFullSphere_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorFullSphere_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorFullSphere_wrapper::* )( ::complex_t const& ) )(&FormFactorFullSphere_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorFullSphere_wrapper::* )( ::complex_t const & ) )(&FormFactorFullSphere_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorFullSphere_wrapper::* )( ::std::string const &,double ) )(&FormFactorFullSphere_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index 0cb00dd31936b6087f0215bbb518169a40d644b7..80e31e9018f1d75fe692e97833eed73b2af62a35 100644
--- a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -105,7 +108,7 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
return FormFactorGauss::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -113,7 +116,7 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorGauss::evaluate_for_q( boost::ref(q) );
}
@@ -141,7 +144,19 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -149,7 +164,7 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -165,7 +180,7 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -173,7 +188,7 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -249,7 +264,26 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorGauss_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -257,10 +291,22 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -286,8 +332,8 @@ void register_FormFactorGauss_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorGauss::* )( ::cvector_t const& ) const)(&::FormFactorGauss::evaluate_for_q)
- , (::complex_t ( FormFactorGauss_wrapper::* )( ::cvector_t const& ) const)(&FormFactorGauss_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorGauss::* )( ::cvector_t const & ) const)(&::FormFactorGauss::evaluate_for_q)
+ , (::complex_t ( FormFactorGauss_wrapper::* )( ::cvector_t const & ) const)(&FormFactorGauss_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getNumberOfStochasticParameters"
@@ -297,10 +343,14 @@ void register_FormFactorGauss_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorGauss_wrapper::* )( ) )(&FormFactorGauss_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorGauss_wrapper::* )( ) )(&FormFactorGauss_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorGauss_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorGauss_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorGauss_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorGauss_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -310,8 +360,8 @@ void register_FormFactorGauss_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorGauss_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorGauss_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorGauss_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorGauss_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getHeight"
@@ -337,11 +387,20 @@ void register_FormFactorGauss_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorGauss_wrapper::* )( ) )(&FormFactorGauss_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorGauss_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorGauss_wrapper::* )( ::complex_t const& ) )(&FormFactorGauss_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorGauss_wrapper::* )( ::complex_t const & ) )(&FormFactorGauss_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorGauss_wrapper::* )( ::std::string const &,double ) )(&FormFactorGauss_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index 8abd3cf04eff13e4f1b568c05b31221f516f45c5..c95f8d930f26518b1a37f9e5f9353b10c050e7c0 100644
--- a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -105,7 +108,7 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
return FormFactorLorentz::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -113,7 +116,7 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorLorentz::evaluate_for_q( boost::ref(q) );
}
@@ -141,7 +144,19 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -149,7 +164,7 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -165,7 +180,7 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -173,7 +188,7 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -249,7 +264,26 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorLorentz_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -257,10 +291,22 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -286,8 +332,8 @@ void register_FormFactorLorentz_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorLorentz::* )( ::cvector_t const& ) const)(&::FormFactorLorentz::evaluate_for_q)
- , (::complex_t ( FormFactorLorentz_wrapper::* )( ::cvector_t const& ) const)(&FormFactorLorentz_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorLorentz::* )( ::cvector_t const & ) const)(&::FormFactorLorentz::evaluate_for_q)
+ , (::complex_t ( FormFactorLorentz_wrapper::* )( ::cvector_t const & ) const)(&FormFactorLorentz_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getNumberOfStochasticParameters"
@@ -297,10 +343,14 @@ void register_FormFactorLorentz_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorLorentz_wrapper::* )( ) )(&FormFactorLorentz_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorLorentz_wrapper::* )( ) )(&FormFactorLorentz_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorLorentz_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorLorentz_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorLorentz_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorLorentz_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -310,8 +360,8 @@ void register_FormFactorLorentz_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorLorentz_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorLorentz_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorLorentz_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorLorentz_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getHeight"
@@ -337,11 +387,20 @@ void register_FormFactorLorentz_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorLorentz_wrapper::* )( ) )(&FormFactorLorentz_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorLorentz_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorLorentz_wrapper::* )( ::complex_t const& ) )(&FormFactorLorentz_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorLorentz_wrapper::* )( ::complex_t const & ) )(&FormFactorLorentz_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorLorentz_wrapper::* )( ::std::string const &,double ) )(&FormFactorLorentz_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
index 074b95b067c40c15278a7b99ad88bba068afaf09..9687291fd2a2ab5b0f8b54f45e77661e09a71e8b 100644
--- a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
return FormFactorParallelepiped::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -106,7 +109,7 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorParallelepiped::evaluate_for_q( boost::ref(q) );
}
@@ -170,7 +173,19 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -178,7 +193,7 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -194,7 +209,7 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -202,7 +217,7 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -242,7 +257,26 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorParallelepiped_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -250,10 +284,22 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -278,8 +324,8 @@ void register_FormFactorParallelepiped_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorParallelepiped::* )( ::cvector_t const& ) const)(&::FormFactorParallelepiped::evaluate_for_q)
- , (::complex_t ( FormFactorParallelepiped_wrapper::* )( ::cvector_t const& ) const)(&FormFactorParallelepiped_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorParallelepiped::* )( ::cvector_t const & ) const)(&::FormFactorParallelepiped::evaluate_for_q)
+ , (::complex_t ( FormFactorParallelepiped_wrapper::* )( ::cvector_t const & ) const)(&FormFactorParallelepiped_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -301,10 +347,14 @@ void register_FormFactorParallelepiped_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorParallelepiped_wrapper::* )( ) )(&FormFactorParallelepiped_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorParallelepiped_wrapper::* )( ) )(&FormFactorParallelepiped_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorParallelepiped_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorParallelepiped_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorParallelepiped_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorParallelepiped_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -314,8 +364,8 @@ void register_FormFactorParallelepiped_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorParallelepiped_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorParallelepiped_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorParallelepiped_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorParallelepiped_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"isDistributedFormFactor"
@@ -329,11 +379,20 @@ void register_FormFactorParallelepiped_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorParallelepiped_wrapper::* )( ) )(&FormFactorParallelepiped_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorParallelepiped_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorParallelepiped_wrapper::* )( ::complex_t const& ) )(&FormFactorParallelepiped_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorParallelepiped_wrapper::* )( ::complex_t const & ) )(&FormFactorParallelepiped_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorParallelepiped_wrapper::* )( ::std::string const &,double ) )(&FormFactorParallelepiped_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index c49dae24a4bc0d13f56ca498916dd054b354f978..8ef7fe0eccb6e8ba62c22312bec761ce371be033 100644
--- a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
return FormFactorPrism3::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -106,7 +109,7 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPrism3::evaluate_for_q( boost::ref(q) );
}
@@ -146,7 +149,19 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -154,7 +169,7 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -170,7 +185,7 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -178,7 +193,7 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -242,7 +257,26 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorPrism3_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -250,10 +284,22 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -278,8 +324,8 @@ void register_FormFactorPrism3_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorPrism3::* )( ::cvector_t const& ) const)(&::FormFactorPrism3::evaluate_for_q)
- , (::complex_t ( FormFactorPrism3_wrapper::* )( ::cvector_t const& ) const)(&FormFactorPrism3_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorPrism3::* )( ::cvector_t const & ) const)(&::FormFactorPrism3::evaluate_for_q)
+ , (::complex_t ( FormFactorPrism3_wrapper::* )( ::cvector_t const & ) const)(&FormFactorPrism3_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -293,10 +339,14 @@ void register_FormFactorPrism3_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorPrism3_wrapper::* )( ) )(&FormFactorPrism3_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorPrism3_wrapper::* )( ) )(&FormFactorPrism3_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorPrism3_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorPrism3_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorPrism3_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorPrism3_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -306,8 +356,8 @@ void register_FormFactorPrism3_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorPrism3_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorPrism3_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorPrism3_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorPrism3_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getRadius"
@@ -329,11 +379,20 @@ void register_FormFactorPrism3_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorPrism3_wrapper::* )( ) )(&FormFactorPrism3_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorPrism3_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorPrism3_wrapper::* )( ::complex_t const& ) )(&FormFactorPrism3_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorPrism3_wrapper::* )( ::complex_t const & ) )(&FormFactorPrism3_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorPrism3_wrapper::* )( ::std::string const &,double ) )(&FormFactorPrism3_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index 80503b87a5a3c81bd146918ceff72f5b82d8e324..2b4bc69c8d417e2d4bf1142aaad8ddc8cf41ec11 100644
--- a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
return FormFactorPyramid::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -106,7 +109,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPyramid::evaluate_for_q( boost::ref(q) );
}
@@ -146,7 +149,19 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -154,7 +169,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -170,7 +185,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -178,7 +193,7 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -242,7 +257,26 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorPyramid_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -250,10 +284,22 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -278,8 +324,8 @@ void register_FormFactorPyramid_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorPyramid::* )( ::cvector_t const& ) const)(&::FormFactorPyramid::evaluate_for_q)
- , (::complex_t ( FormFactorPyramid_wrapper::* )( ::cvector_t const& ) const)(&FormFactorPyramid_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorPyramid::* )( ::cvector_t const & ) const)(&::FormFactorPyramid::evaluate_for_q)
+ , (::complex_t ( FormFactorPyramid_wrapper::* )( ::cvector_t const & ) const)(&FormFactorPyramid_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -293,10 +339,14 @@ void register_FormFactorPyramid_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorPyramid_wrapper::* )( ) )(&FormFactorPyramid_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorPyramid_wrapper::* )( ) )(&FormFactorPyramid_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( FormFactorPyramid_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&FormFactorPyramid_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( FormFactorPyramid_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&FormFactorPyramid_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -306,8 +356,8 @@ void register_FormFactorPyramid_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorPyramid_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorPyramid_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorPyramid_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorPyramid_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getRadius"
@@ -329,11 +379,20 @@ void register_FormFactorPyramid_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorPyramid_wrapper::* )( ) )(&FormFactorPyramid_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorPyramid_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorPyramid_wrapper::* )( ::complex_t const& ) )(&FormFactorPyramid_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorPyramid_wrapper::* )( ::complex_t const & ) )(&FormFactorPyramid_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorPyramid_wrapper::* )( ::std::string const &,double ) )(&FormFactorPyramid_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index a71ac3d87a7fa2b749911595f33947d03e8e5538..deb62fbe832c98f4c82cecc7d5950ae168599471 100644
--- a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
return FormFactorSphereGaussianRadius::clone( );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ 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{
@@ -106,7 +109,7 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
}
}
- ::complex_t default_evaluate_for_q( ::cvector_t const& q ) const {
+ ::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSphereGaussianRadius::evaluate_for_q( boost::ref(q) );
}
@@ -158,6 +161,18 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -170,7 +185,7 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -178,7 +193,7 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -230,7 +245,26 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< FormFactorSphereGaussianRadius_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -238,10 +272,22 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -266,8 +312,8 @@ void register_FormFactorSphereGaussianRadius_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate_for_q"
- , (::complex_t ( ::FormFactorSphereGaussianRadius::* )( ::cvector_t const& ) const)(&::FormFactorSphereGaussianRadius::evaluate_for_q)
- , (::complex_t ( FormFactorSphereGaussianRadius_wrapper::* )( ::cvector_t const& ) const)(&FormFactorSphereGaussianRadius_wrapper::default_evaluate_for_q)
+ , (::complex_t ( ::FormFactorSphereGaussianRadius::* )( ::cvector_t const & ) const)(&::FormFactorSphereGaussianRadius::evaluate_for_q)
+ , (::complex_t ( FormFactorSphereGaussianRadius_wrapper::* )( ::cvector_t const & ) const)(&FormFactorSphereGaussianRadius_wrapper::default_evaluate_for_q)
, ( bp::arg("q") ) )
.def(
"getHeight"
@@ -285,6 +331,10 @@ void register_FormFactorSphereGaussianRadius_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( FormFactorSphereGaussianRadius_wrapper::* )( ) )(&FormFactorSphereGaussianRadius_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( FormFactorSphereGaussianRadius_wrapper::* )( ) )(&FormFactorSphereGaussianRadius_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -292,8 +342,8 @@ void register_FormFactorSphereGaussianRadius_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( FormFactorSphereGaussianRadius_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&FormFactorSphereGaussianRadius_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( FormFactorSphereGaussianRadius_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&FormFactorSphereGaussianRadius_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getRadius"
@@ -311,11 +361,20 @@ void register_FormFactorSphereGaussianRadius_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( FormFactorSphereGaussianRadius_wrapper::* )( ) )(&FormFactorSphereGaussianRadius_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &FormFactorSphereGaussianRadius_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( FormFactorSphereGaussianRadius_wrapper::* )( ::complex_t const& ) )(&FormFactorSphereGaussianRadius_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( FormFactorSphereGaussianRadius_wrapper::* )( ::complex_t const & ) )(&FormFactorSphereGaussianRadius_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( FormFactorSphereGaussianRadius_wrapper::* )( ::std::string const &,double ) )(&FormFactorSphereGaussianRadius_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
index 7be7a8ef9dbd13e6e8834baf600b6db6b5c61b6e..e0aa45645d5998eb2b2261b9169144092316b5b8 100644
--- a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,17 +80,15 @@ namespace bp = boost::python;
void register_HomogeneousMaterial_class(){
- bp::class_< HomogeneousMaterial, bp::bases< IMaterial > >( "HomogeneousMaterial", bp::init< >() )
- .def( bp::init< complex_t const& >(( bp::arg("refractive_index") )) )
- .def( bp::init< std::string const& , complex_t const& >(( bp::arg("name"), bp::arg("refractive_index") )) )
- .def( bp::init< std::string const& , double, double >(( bp::arg("name"), bp::arg("refractive_index_real"), bp::arg("refractive_index_imag") )) )
- .def( bp::init< HomogeneousMaterial const& >(( bp::arg("other") )) )
+ bp::class_< HomogeneousMaterial, bp::bases< IMaterial > >( "HomogeneousMaterial", bp::init< complex_t const & >(( bp::arg("refractive_index") )) )
+ .def( bp::init< std::string const &, complex_t const & >(( bp::arg("name"), bp::arg("refractive_index") )) )
+ .def( bp::init< std::string const &, double, double >(( bp::arg("name"), bp::arg("refractive_index_real"), bp::arg("refractive_index_imag") )) )
.def(
"getRefractiveIndex"
- , (::complex_t ( ::HomogeneousMaterial::* )( ) const)(& ::HomogeneousMaterial::getRefractiveIndex ) )
+ , (::complex_t ( ::HomogeneousMaterial::* )( ) const)( &::HomogeneousMaterial::getRefractiveIndex ) )
.def(
"setRefractiveIndex"
- , (void ( ::HomogeneousMaterial::* )( ::complex_t ) )(& ::HomogeneousMaterial::setRefractiveIndex )
+ , (void ( ::HomogeneousMaterial::* )( ::complex_t const & ) )( &::HomogeneousMaterial::setRefractiveIndex )
, ( bp::arg("refractive_index") ) );
}
diff --git a/Core/PythonAPI/src/ICloneable.pypp.cpp b/Core/PythonAPI/src/ICloneable.pypp.cpp
index e4f12c168a7ebe682a6096723a82a68989b819f7..a7002ef2202e4e3ae1b9596151425b23407f6535 100644
--- a/Core/PythonAPI/src/ICloneable.pypp.cpp
+++ b/Core/PythonAPI/src/ICloneable.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
index fecb629e40efa50dd7b70eb2a0022d6d8484df15..346469225497f53f4a8a67c80ba9cba650b9bea1 100644
--- a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
+++ b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
return IClusteredParticles::clone( );
}
- virtual ::std::vector< DiffuseParticleInfo* > * createDiffuseParticleInfo( ::ParticleInfo const& parent_info ) const {
+ virtual ::std::vector< DiffuseParticleInfo* > * createDiffuseParticleInfo( ::ParticleInfo const & parent_info ) const {
if( bp::override func_createDiffuseParticleInfo = this->get_override( "createDiffuseParticleInfo" ) )
return func_createDiffuseParticleInfo( boost::ref(parent_info) );
else{
@@ -106,11 +109,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
}
}
- ::std::vector< DiffuseParticleInfo* > * default_createDiffuseParticleInfo( ::ParticleInfo const& parent_info ) const {
+ ::std::vector< DiffuseParticleInfo* > * default_createDiffuseParticleInfo( ::ParticleInfo const & parent_info ) const {
return IClusteredParticles::createDiffuseParticleInfo( boost::ref(parent_info) );
}
- virtual ::IFormFactor * createTotalFormFactor( ::IFormFactor const& meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
+ virtual ::IFormFactor * createTotalFormFactor( ::IFormFactor const & meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
if( bp::override func_createTotalFormFactor = this->get_override( "createTotalFormFactor" ) )
return func_createTotalFormFactor( boost::ref(meso_crystal_form_factor), ambient_refractive_index );
else{
@@ -118,7 +121,7 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
}
}
- ::IFormFactor * default_createTotalFormFactor( ::IFormFactor const& meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
+ ::IFormFactor * default_createTotalFormFactor( ::IFormFactor const & meso_crystal_form_factor, ::complex_t ambient_refractive_index ) const {
return IClusteredParticles::createTotalFormFactor( boost::ref(meso_crystal_form_factor), ambient_refractive_index );
}
@@ -139,6 +142,18 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -199,6 +214,37 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IClusteredParticles_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -235,14 +281,14 @@ void register_IClusteredParticles_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createDiffuseParticleInfo"
- , (::std::vector< DiffuseParticleInfo* > * ( ::IClusteredParticles::* )( ::ParticleInfo const& ) const)(&::IClusteredParticles::createDiffuseParticleInfo)
- , (::std::vector< DiffuseParticleInfo* > * ( IClusteredParticles_wrapper::* )( ::ParticleInfo const& ) const)(&IClusteredParticles_wrapper::default_createDiffuseParticleInfo)
+ , (::std::vector< DiffuseParticleInfo* > * ( ::IClusteredParticles::* )( ::ParticleInfo const & ) const)(&::IClusteredParticles::createDiffuseParticleInfo)
+ , (::std::vector< DiffuseParticleInfo* > * ( IClusteredParticles_wrapper::* )( ::ParticleInfo const & ) const)(&IClusteredParticles_wrapper::default_createDiffuseParticleInfo)
, ( bp::arg("parent_info") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createTotalFormFactor"
- , (::IFormFactor * ( ::IClusteredParticles::* )( ::IFormFactor const& ,::complex_t ) const)(&::IClusteredParticles::createTotalFormFactor)
- , (::IFormFactor * ( IClusteredParticles_wrapper::* )( ::IFormFactor const& ,::complex_t ) const)(&IClusteredParticles_wrapper::default_createTotalFormFactor)
+ , (::IFormFactor * ( ::IClusteredParticles::* )( ::IFormFactor const &,::complex_t ) const)(&::IClusteredParticles::createTotalFormFactor)
+ , (::IFormFactor * ( IClusteredParticles_wrapper::* )( ::IFormFactor const &,::complex_t ) const)(&IClusteredParticles_wrapper::default_createTotalFormFactor)
, ( bp::arg("meso_crystal_form_factor"), bp::arg("ambient_refractive_index") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -253,6 +299,10 @@ void register_IClusteredParticles_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( IClusteredParticles_wrapper::* )( ) )(&IClusteredParticles_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( IClusteredParticles_wrapper::* )( ) )(&IClusteredParticles_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -276,6 +326,15 @@ void register_IClusteredParticles_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( IClusteredParticles_wrapper::* )( ) )(&IClusteredParticles_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &IClusteredParticles_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( IClusteredParticles_wrapper::* )( ::std::string const &,double ) )(&IClusteredParticles_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/ICompositeSample.pypp.cpp b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
index 59ab5d2c99f2058151d71c194e3c1ecd13377f3d..b4ae2f96a2d7e2133e080b577bd89a5c575798e7 100644
--- a/Core/PythonAPI/src/ICompositeSample.pypp.cpp
+++ b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -146,6 +149,18 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -182,6 +197,37 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< ICompositeSample_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -201,10 +247,10 @@ void register_ICompositeSample_class(){
bp::class_< ICompositeSample_wrapper, bp::bases< ISample >, boost::noncopyable >( "ICompositeSample", bp::init< >() )
.def(
"begin_shallow"
- , (::std::_List_iterator< ISample* > ( ::ICompositeSample::* )( ) )(& ::ICompositeSample::begin_shallow ) )
+ , (::std::_List_iterator< ISample* > ( ::ICompositeSample::* )( ) )( &::ICompositeSample::begin_shallow ) )
.def(
"begin_shallow"
- , (::std::_List_const_iterator< ISample* > ( ::ICompositeSample::* )( ) const)(& ::ICompositeSample::begin_shallow ) )
+ , (::std::_List_const_iterator< ISample* > ( ::ICompositeSample::* )( ) const)( &::ICompositeSample::begin_shallow ) )
.def(
"clone"
, (::ICompositeSample * ( ::ICompositeSample::* )( ) const)(&::ICompositeSample::clone)
@@ -212,10 +258,10 @@ void register_ICompositeSample_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"end_shallow"
- , (::std::_List_iterator< ISample* > ( ::ICompositeSample::* )( ) )(& ::ICompositeSample::end_shallow ) )
+ , (::std::_List_iterator< ISample* > ( ::ICompositeSample::* )( ) )( &::ICompositeSample::end_shallow ) )
.def(
"end_shallow"
- , (::std::_List_const_iterator< ISample* > ( ::ICompositeSample::* )( ) const)(& ::ICompositeSample::end_shallow ) )
+ , (::std::_List_const_iterator< ISample* > ( ::ICompositeSample::* )( ) const)( &::ICompositeSample::end_shallow ) )
.def(
"getCompositeSample"
, (::ICompositeSample * ( ::ICompositeSample::* )( ) )(&::ICompositeSample::getCompositeSample)
@@ -234,6 +280,10 @@ void register_ICompositeSample_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( ICompositeSample_wrapper::* )( ) )(&ICompositeSample_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( ICompositeSample_wrapper::* )( ) )(&ICompositeSample_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -247,6 +297,15 @@ void register_ICompositeSample_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( ICompositeSample_wrapper::* )( ) )(&ICompositeSample_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &ICompositeSample_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( ICompositeSample_wrapper::* )( ::std::string const &,double ) )(&ICompositeSample_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/IDecoration.pypp.cpp b/Core/PythonAPI/src/IDecoration.pypp.cpp
index 257784c132a4584928e7da13fa47a519f179f591..be6f28de01746779b83871ca2de4f92dfceb1fe5 100644
--- a/Core/PythonAPI/src/IDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/IDecoration.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -135,6 +138,18 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -195,6 +210,37 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IDecoration_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -249,15 +295,19 @@ void register_IDecoration_class(){
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getTotalParticleSurfaceDensity"
- , (double ( ::IDecoration::* )( ) const)(& ::IDecoration::getTotalParticleSurfaceDensity ) )
+ , (double ( ::IDecoration::* )( ) const)( &::IDecoration::getTotalParticleSurfaceDensity ) )
.def(
"setTotalParticleSurfaceDensity"
- , (void ( ::IDecoration::* )( double ) )(& ::IDecoration::setTotalParticleSurfaceDensity )
+ , (void ( ::IDecoration::* )( double ) )( &::IDecoration::setTotalParticleSurfaceDensity )
, ( bp::arg("surface_density") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( IDecoration_wrapper::* )( ) )(&IDecoration_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( IDecoration_wrapper::* )( ) )(&IDecoration_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -281,6 +331,15 @@ void register_IDecoration_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( IDecoration_wrapper::* )( ) )(&IDecoration_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &IDecoration_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( IDecoration_wrapper::* )( ::std::string const &,double ) )(&IDecoration_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/IFTDistribution1D.pypp.cpp b/Core/PythonAPI/src/IFTDistribution1D.pypp.cpp
index 0c2a1ff6a33792d3ff120a8d26c483d483d5899c..ae33a4dc10bd11a0b80266f80e610818314af735 100644
--- a/Core/PythonAPI/src/IFTDistribution1D.pypp.cpp
+++ b/Core/PythonAPI/src/IFTDistribution1D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
index cb81f6de6f025a8e44eeec68ee9a33b11bde4f15..3ec21faa5504c875bb1f8218324182f532ce689c 100644
--- a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
+++ b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -96,7 +99,7 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
return func_evaluate( qx, qy );
}
- virtual void transformToStarBasis( double qX, double qY, double alpha, double a, double b, double& qa, double& qb ) const {
+ virtual void transformToStarBasis( double qX, double qY, double alpha, double a, double b, double & qa, double & qb ) const {
bp::override func_transformToStarBasis = this->get_override( "transformToStarBasis" );
func_transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
}
@@ -113,6 +116,18 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -137,6 +152,37 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
IParameterized::printParameters( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IFTDistribution2D_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -164,22 +210,26 @@ void register_IFTDistribution2D_class(){
, ( bp::arg("qx"), bp::arg("qy") ) )
.def(
"getDelta"
- , (double ( ::IFTDistribution2D::* )( ) const)(& ::IFTDistribution2D::getDelta ) )
+ , (double ( ::IFTDistribution2D::* )( ) const)( &::IFTDistribution2D::getDelta ) )
.def(
"getGamma"
- , (double ( ::IFTDistribution2D::* )( ) const)(& ::IFTDistribution2D::getGamma ) )
+ , (double ( ::IFTDistribution2D::* )( ) const)( &::IFTDistribution2D::getGamma ) )
.def(
"setGamma"
- , (void ( ::IFTDistribution2D::* )( double ) )(& ::IFTDistribution2D::setGamma )
+ , (void ( ::IFTDistribution2D::* )( double ) )( &::IFTDistribution2D::setGamma )
, ( bp::arg("gamma") ) )
.def(
"transformToStarBasis"
- , bp::pure_virtual( (void ( ::IFTDistribution2D::* )( double,double,double,double,double,double& ,double& ) const)(&::IFTDistribution2D::transformToStarBasis) )
+ , bp::pure_virtual( (void ( ::IFTDistribution2D::* )( double,double,double,double,double,double &,double & ) const)(&::IFTDistribution2D::transformToStarBasis) )
, ( bp::arg("qX"), bp::arg("qY"), bp::arg("alpha"), bp::arg("a"), bp::arg("b"), bp::arg("qa"), bp::arg("qb") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( IFTDistribution2D_wrapper::* )( ) )(&IFTDistribution2D_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( IFTDistribution2D_wrapper::* )( ) )(&IFTDistribution2D_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -189,6 +239,15 @@ void register_IFTDistribution2D_class(){
"printParameters"
, (void ( ::IParameterized::* )( ) const)(&::IParameterized::printParameters)
, (void ( IFTDistribution2D_wrapper::* )( ) const)(&IFTDistribution2D_wrapper::default_printParameters) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &IFTDistribution2D_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( IFTDistribution2D_wrapper::* )( ::std::string const &,double ) )(&IFTDistribution2D_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index debeac22cbb7b906e42c330041493bb95bed3a0e..5a67acf4be431dacd1e96e00a6bbb02b6da395d4 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -91,7 +94,7 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
return func_clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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{
@@ -99,11 +102,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
bp::override func_evaluate = this->get_override( "evaluate" );
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -168,7 +171,7 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
return IFormFactor::isDistributedFormFactor( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -176,7 +179,7 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -192,6 +195,18 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -228,6 +243,37 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IFormFactor_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -251,13 +297,13 @@ void register_IFormFactor_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( IFormFactor_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&IFormFactor_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( IFormFactor_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&IFormFactor_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , bp::pure_virtual( (::complex_t ( ::IFormFactor::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactor::evaluate) )
+ , bp::pure_virtual( (::complex_t ( ::IFormFactor::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactor::evaluate) )
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getHeight"
@@ -281,13 +327,17 @@ void register_IFormFactor_class(){
, (bool ( IFormFactor_wrapper::* )( ) const)(&IFormFactor_wrapper::default_isDistributedFormFactor) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( IFormFactor_wrapper::* )( ::complex_t const& ) )(&IFormFactor_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( IFormFactor_wrapper::* )( ::complex_t const & ) )(&IFormFactor_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( IFormFactor_wrapper::* )( ) )(&IFormFactor_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( IFormFactor_wrapper::* )( ) )(&IFormFactor_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -301,6 +351,15 @@ void register_IFormFactor_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( IFormFactor_wrapper::* )( ) )(&IFormFactor_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &IFormFactor_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( IFormFactor_wrapper::* )( ::std::string const &,double ) )(&IFormFactor_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index e697dfa53c5fb9eb4b836d4607ab42a9a6c50429..5175359a094ebfc35bc3469686453b5720167a50 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -91,7 +94,7 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
return func_clone( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
else{
@@ -99,11 +102,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
}
}
- ::complex_t default_evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ ::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
- virtual ::complex_t evaluate_for_q( ::cvector_t const& q ) const {
+ virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" );
return func_evaluate_for_q( boost::ref(q) );
}
@@ -132,7 +135,19 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -140,7 +155,7 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -228,7 +243,26 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
ISample::print_structure( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IFormFactorBorn_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -236,10 +270,22 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -263,12 +309,12 @@ void register_IFormFactorBorn_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactorBorn::evaluate)
- , (::complex_t ( IFormFactorBorn_wrapper::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&IFormFactorBorn_wrapper::default_evaluate)
+ , (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactorBorn::evaluate)
+ , (::complex_t ( IFormFactorBorn_wrapper::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&IFormFactorBorn_wrapper::default_evaluate)
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"evaluate_for_q"
- , bp::pure_virtual( (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const& ) const)(&::IFormFactorBorn::evaluate_for_q) )
+ , bp::pure_virtual( (::complex_t ( ::IFormFactorBorn::* )( ::cvector_t const & ) const)(&::IFormFactorBorn::evaluate_for_q) )
, ( bp::arg("q") ) )
.def(
"getVolume"
@@ -278,10 +324,14 @@ void register_IFormFactorBorn_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( IFormFactorBorn_wrapper::* )( ) )(&IFormFactorBorn_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( IFormFactorBorn_wrapper::* )( ) )(&IFormFactorBorn_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( IFormFactorBorn_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&IFormFactorBorn_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( IFormFactorBorn_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&IFormFactorBorn_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -313,11 +363,20 @@ void register_IFormFactorBorn_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( IFormFactorBorn_wrapper::* )( ) )(&IFormFactorBorn_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &IFormFactorBorn_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactor::* )( ::complex_t const& ) )(&::IFormFactor::setAmbientRefractiveIndex)
- , (void ( IFormFactorBorn_wrapper::* )( ::complex_t const& ) )(&IFormFactorBorn_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactor::* )( ::complex_t const & ) )(&::IFormFactor::setAmbientRefractiveIndex)
+ , (void ( IFormFactorBorn_wrapper::* )( ::complex_t const & ) )(&IFormFactorBorn_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( IFormFactorBorn_wrapper::* )( ::std::string const &,double ) )(&IFormFactorBorn_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
index db4a56044bbd97a9351777c96818cd00f0880566..dc6a5dbdcd4296f3f12e1e8d7c9ce68ffc2640e1 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -120,7 +123,7 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
return IFormFactorDecorator::getVolume( );
}
- virtual void setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
else{
@@ -128,7 +131,7 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
}
}
- void default_setAmbientRefractiveIndex( ::complex_t const& refractive_index ) {
+ void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactorDecorator::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -144,7 +147,19 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
return IParameterized::areParametersChanged( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::size_t nbr_samples ) const {
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
+ 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{
@@ -152,7 +167,7 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
}
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* >& form_factors, ::std::vector< double >& probabilities, ::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 );
}
@@ -168,7 +183,7 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
return IParameterized::createParameterTree( );
}
- virtual ::complex_t evaluate( ::cvector_t const& k_i, ::Bin1DCVector const& k_f_bin, double alpha_i, double alpha_f ) const {
+ virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
bp::override func_evaluate = this->get_override( "evaluate" );
return func_evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -221,6 +236,37 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IFormFactorDecorator_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -256,17 +302,21 @@ void register_IFormFactorDecorator_class(){
, (double ( IFormFactorDecorator_wrapper::* )( ) const)(&IFormFactorDecorator_wrapper::default_getVolume) )
.def(
"setAmbientRefractiveIndex"
- , (void ( ::IFormFactorDecorator::* )( ::complex_t const& ) )(&::IFormFactorDecorator::setAmbientRefractiveIndex)
- , (void ( IFormFactorDecorator_wrapper::* )( ::complex_t const& ) )(&IFormFactorDecorator_wrapper::default_setAmbientRefractiveIndex)
+ , (void ( ::IFormFactorDecorator::* )( ::complex_t const & ) )(&::IFormFactorDecorator::setAmbientRefractiveIndex)
+ , (void ( IFormFactorDecorator_wrapper::* )( ::complex_t const & ) )(&IFormFactorDecorator_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( IFormFactorDecorator_wrapper::* )( ) )(&IFormFactorDecorator_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( IFormFactorDecorator_wrapper::* )( ) )(&IFormFactorDecorator_wrapper::default_clearParameterPool) )
.def(
"createDistributedFormFactors"
- , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
- , (void ( IFormFactorDecorator_wrapper::* )( ::std::vector< IFormFactor* >& ,::std::vector< double >& ,::size_t ) const)(&IFormFactorDecorator_wrapper::default_createDistributedFormFactors)
+ , (void ( ::IFormFactor::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&::IFormFactor::createDistributedFormFactors)
+ , (void ( IFormFactorDecorator_wrapper::* )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const)(&IFormFactorDecorator_wrapper::default_createDistributedFormFactors)
, ( bp::arg("form_factors"), bp::arg("probabilities"), bp::arg("nbr_samples") )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
@@ -276,7 +326,7 @@ void register_IFormFactorDecorator_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , bp::pure_virtual( (::complex_t ( ::IFormFactor::* )( ::cvector_t const& ,::Bin1DCVector const& ,double,double ) const)(&::IFormFactor::evaluate) )
+ , bp::pure_virtual( (::complex_t ( ::IFormFactor::* )( ::cvector_t const &,::Bin1DCVector const &,double,double ) const)(&::IFormFactor::evaluate) )
, ( bp::arg("k_i"), bp::arg("k_f_bin"), bp::arg("alpha_i"), bp::arg("alpha_f") ) )
.def(
"getNumberOfStochasticParameters"
@@ -294,6 +344,15 @@ void register_IFormFactorDecorator_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( IFormFactorDecorator_wrapper::* )( ) )(&IFormFactorDecorator_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &IFormFactorDecorator_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( IFormFactorDecorator_wrapper::* )( ::std::string const &,double ) )(&IFormFactorDecorator_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
index 0d66bde8e29216ff38f53b3c6d083b32c316130d..ca82818b6237fe89964a3050d839f5dcfdc536a8 100644
--- a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
+++ b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -91,7 +94,7 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
return func_clone( );
}
- virtual double evaluate( ::cvector_t const& q ) const {
+ virtual double evaluate( ::cvector_t const & q ) const {
bp::override func_evaluate = this->get_override( "evaluate" );
return func_evaluate( boost::ref(q) );
}
@@ -120,6 +123,18 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -156,6 +171,37 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IInterferenceFunction_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -179,7 +225,7 @@ void register_IInterferenceFunction_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , bp::pure_virtual( (double ( ::IInterferenceFunction::* )( ::cvector_t const& ) const)(&::IInterferenceFunction::evaluate) )
+ , bp::pure_virtual( (double ( ::IInterferenceFunction::* )( ::cvector_t const & ) const)(&::IInterferenceFunction::evaluate) )
, ( bp::arg("q") ) )
.def(
"getKappa"
@@ -189,6 +235,10 @@ void register_IInterferenceFunction_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( IInterferenceFunction_wrapper::* )( ) )(&IInterferenceFunction_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( IInterferenceFunction_wrapper::* )( ) )(&IInterferenceFunction_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -202,6 +252,15 @@ void register_IInterferenceFunction_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( IInterferenceFunction_wrapper::* )( ) )(&IInterferenceFunction_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &IInterferenceFunction_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( IInterferenceFunction_wrapper::* )( ::std::string const &,double ) )(&IInterferenceFunction_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/IMaterial.pypp.cpp b/Core/PythonAPI/src/IMaterial.pypp.cpp
index 169e5d53fa0d6963e8ea07ad293c36d1c36155ae..faca0f45d3dfc41bc9ba3e97300383534a190300 100644
--- a/Core/PythonAPI/src/IMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/IMaterial.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,24 +80,7 @@ namespace bp = boost::python;
void register_IMaterial_class(){
- { //::IMaterial
- typedef bp::class_< IMaterial > IMaterial_exposer_t;
- IMaterial_exposer_t IMaterial_exposer = IMaterial_exposer_t( "IMaterial", bp::init< >() );
- bp::scope IMaterial_scope( IMaterial_exposer );
- IMaterial_exposer.def( bp::init< std::string const& >(( bp::arg("name") )) );
- IMaterial_exposer.def( bp::init< IMaterial const& >(( bp::arg("other") )) );
- { //::IMaterial::operator=
-
- typedef ::IMaterial& ( ::IMaterial::*assign_function_type )( ::IMaterial const& ) ;
-
- IMaterial_exposer.def(
- "assign"
- , assign_function_type(& ::IMaterial::operator= )
- , ( bp::arg("other") )
- , bp::return_self< >() );
-
- }
- IMaterial_exposer.def( bp::self_ns::str( bp::self ) );
- }
+ bp::class_< IMaterial >( "IMaterial", bp::init< std::string const & >(( bp::arg("name") )) )
+ .def( bp::self_ns::str( bp::self ) );
}
diff --git a/Core/PythonAPI/src/IParameterized.pypp.cpp b/Core/PythonAPI/src/IParameterized.pypp.cpp
index b29858e11b69171cd7c2d76ace5d8f1da1aa5e46..0dea779dbcb38c399570466ee6469a75243d9d42 100644
--- a/Core/PythonAPI/src/IParameterized.pypp.cpp
+++ b/Core/PythonAPI/src/IParameterized.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -86,14 +89,14 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
}
- IParameterized_wrapper(::std::string const& name )
+ IParameterized_wrapper(::std::string const & name )
: IParameterized( name )
, bp::wrapper< IParameterized >(){
// constructor
}
- IParameterized_wrapper(::IParameterized const& other )
+ IParameterized_wrapper(::IParameterized const & other )
: IParameterized( boost::ref(other) )
, bp::wrapper< IParameterized >(){
// copy constructor
@@ -112,6 +115,18 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -136,6 +151,37 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
IParameterized::printParameters( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< IParameterized_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -156,8 +202,8 @@ void register_IParameterized_class(){
typedef bp::class_< IParameterized_wrapper > IParameterized_exposer_t;
IParameterized_exposer_t IParameterized_exposer = IParameterized_exposer_t( "IParameterized", bp::init< >() );
bp::scope IParameterized_scope( IParameterized_exposer );
- IParameterized_exposer.def( bp::init< std::string const& >(( bp::arg("name") )) );
- IParameterized_exposer.def( bp::init< IParameterized const& >(( bp::arg("other") )) );
+ IParameterized_exposer.def( bp::init< std::string const & >(( bp::arg("name") )) );
+ IParameterized_exposer.def( bp::init< IParameterized const & >(( bp::arg("other") )) );
{ //::IParameterized::areParametersChanged
typedef bool ( ::IParameterized::*areParametersChanged_function_type )( ) ;
@@ -168,6 +214,17 @@ void register_IParameterized_class(){
, areParametersChanged_function_type(&::IParameterized::areParametersChanged)
, default_areParametersChanged_function_type(&IParameterized_wrapper::default_areParametersChanged) );
+ }
+ { //::IParameterized::clearParameterPool
+
+ typedef void ( ::IParameterized::*clearParameterPool_function_type )( ) ;
+ typedef void ( IParameterized_wrapper::*default_clearParameterPool_function_type )( ) ;
+
+ IParameterized_exposer.def(
+ "clearParameterPool"
+ , clearParameterPool_function_type(&::IParameterized::clearParameterPool)
+ , default_clearParameterPool_function_type(&IParameterized_wrapper::default_clearParameterPool) );
+
}
{ //::IParameterized::createParameterTree
@@ -187,17 +244,17 @@ void register_IParameterized_class(){
IParameterized_exposer.def(
"getParameterPool"
- , getParameterPool_function_type(& ::IParameterized::getParameterPool )
+ , getParameterPool_function_type( &::IParameterized::getParameterPool )
, bp::return_value_policy< bp::reference_existing_object >() );
}
{ //::IParameterized::operator=
- typedef ::IParameterized& ( ::IParameterized::*assign_function_type )( ::IParameterized const& ) ;
+ typedef ::IParameterized & ( ::IParameterized::*assign_function_type )( ::IParameterized const & ) ;
IParameterized_exposer.def(
"assign"
- , assign_function_type(& ::IParameterized::operator= )
+ , assign_function_type( &::IParameterized::operator= )
, ( bp::arg("other") )
, bp::return_self< >() );
@@ -212,6 +269,28 @@ void register_IParameterized_class(){
, printParameters_function_type(&::IParameterized::printParameters)
, default_printParameters_function_type(&IParameterized_wrapper::default_printParameters) );
+ }
+ { //::IParameterized::registerParameter
+
+ typedef void ( *default_registerParameter_function_type )( ::IParameterized &,::std::string const &,long unsigned int );
+
+ IParameterized_exposer.def(
+ "registerParameter"
+ , default_registerParameter_function_type( &IParameterized_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
+
+ }
+ { //::IParameterized::setParameterValue
+
+ typedef bool ( ::IParameterized::*setParameterValue_function_type )( ::std::string const &,double ) ;
+ typedef bool ( IParameterized_wrapper::*default_setParameterValue_function_type )( ::std::string const &,double ) ;
+
+ IParameterized_exposer.def(
+ "setParameterValue"
+ , setParameterValue_function_type(&::IParameterized::setParameterValue)
+ , default_setParameterValue_function_type(&IParameterized_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) );
+
}
{ //::IParameterized::setParametersAreChanged
diff --git a/Core/PythonAPI/src/ISample.pypp.cpp b/Core/PythonAPI/src/ISample.pypp.cpp
index 48782068f3fa50cc50984778a8b0cb913635a079..fd1861ba77ce64719292c322cbc2426d738ce984 100644
--- a/Core/PythonAPI/src/ISample.pypp.cpp
+++ b/Core/PythonAPI/src/ISample.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -122,6 +125,18 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -146,6 +161,37 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
IParameterized::printParameters( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< ISample_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -176,6 +222,10 @@ void register_ISample_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( ISample_wrapper::* )( ) )(&ISample_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( ISample_wrapper::* )( ) )(&ISample_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -185,6 +235,15 @@ void register_ISample_class(){
"printParameters"
, (void ( ::IParameterized::* )( ) const)(&::IParameterized::printParameters)
, (void ( ISample_wrapper::* )( ) const)(&ISample_wrapper::default_printParameters) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &ISample_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( ISample_wrapper::* )( ::std::string const &,double ) )(&ISample_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
index ca62d98adce8e616dae342d848607b2edab88b08..bdc198728e30fea0d577e694025fba2694d96574 100644
--- a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
+++ b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
- ISampleBuilder_wrapper(ISampleBuilder const& arg )
+ ISampleBuilder_wrapper(ISampleBuilder const & arg )
: ISampleBuilder( arg )
, bp::wrapper< ISampleBuilder >(){
// copy constructor
@@ -117,6 +120,18 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -141,6 +156,37 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
IParameterized::printParameters( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< ISampleBuilder_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -167,6 +213,10 @@ void register_ISampleBuilder_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( ISampleBuilder_wrapper::* )( ) )(&ISampleBuilder_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( ISampleBuilder_wrapper::* )( ) )(&ISampleBuilder_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -176,6 +226,15 @@ void register_ISampleBuilder_class(){
"printParameters"
, (void ( ::IParameterized::* )( ) const)(&::IParameterized::printParameters)
, (void ( ISampleBuilder_wrapper::* )( ) const)(&ISampleBuilder_wrapper::default_printParameters) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &ISampleBuilder_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( ISampleBuilder_wrapper::* )( ::std::string const &,double ) )(&ISampleBuilder_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/ISelectionRule.pypp.cpp b/Core/PythonAPI/src/ISelectionRule.pypp.cpp
index 3b3df0cbf09dad90696ec9f1290820e02ddd9cd4..d951812153d602db3ca571cb3ca1e2f8b9ff2c10 100644
--- a/Core/PythonAPI/src/ISelectionRule.pypp.cpp
+++ b/Core/PythonAPI/src/ISelectionRule.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -91,7 +92,7 @@ struct ISelectionRule_wrapper : ISelectionRule, bp::wrapper< ISelectionRule > {
return func_clone( );
}
- virtual bool coordinateSelected( ::IndexVector3D const& coordinate ) const {
+ virtual bool coordinateSelected( ::IndexVector3D const & coordinate ) const {
bp::override func_coordinateSelected = this->get_override( "coordinateSelected" );
return func_coordinateSelected( boost::ref(coordinate) );
}
@@ -107,7 +108,7 @@ void register_ISelectionRule_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"coordinateSelected"
- , bp::pure_virtual( (bool ( ::ISelectionRule::* )( ::IndexVector3D const& ) const)(&::ISelectionRule::coordinateSelected) )
+ , bp::pure_virtual( (bool ( ::ISelectionRule::* )( ::IndexVector3D const & ) const)(&::ISelectionRule::coordinateSelected) )
, ( bp::arg("coordinate") ) );
}
diff --git a/Core/PythonAPI/src/ISimulation.pypp.cpp b/Core/PythonAPI/src/ISimulation.pypp.cpp
index eb5b9646f0d31613aad2aa5229fc640e81f4a49a..fd3c38a35da511aff0c42f4e983ced83f28439f3 100644
--- a/Core/PythonAPI/src/ISimulation.pypp.cpp
+++ b/Core/PythonAPI/src/ISimulation.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/IStochasticParameter.pypp.cpp b/Core/PythonAPI/src/IStochasticParameter.pypp.cpp
index 46d0196415044a1d188e2918fd92841c5bb26675..06be358f21cf32b0a6929a78852bfba32b756216 100644
--- a/Core/PythonAPI/src/IStochasticParameter.pypp.cpp
+++ b/Core/PythonAPI/src/IStochasticParameter.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/IndexVector3D.pypp.cpp b/Core/PythonAPI/src/IndexVector3D.pypp.cpp
index 37a2de1ad8e0fd5370a3afa40e8baea38cb090e0..f293a33bbcfeeb31926ffc6b26d02ebe18e1be34 100644
--- a/Core/PythonAPI/src/IndexVector3D.pypp.cpp
+++ b/Core/PythonAPI/src/IndexVector3D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -83,7 +84,7 @@ void register_IndexVector3D_class(){
typedef bp::class_< Geometry::BasicVector3D< int > > IndexVector3D_exposer_t;
IndexVector3D_exposer_t IndexVector3D_exposer = IndexVector3D_exposer_t( "IndexVector3D", bp::init< >() );
bp::scope IndexVector3D_scope( IndexVector3D_exposer );
- IndexVector3D_exposer.def( bp::init< int const& , int const& , int const& >(( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") )) );
+ IndexVector3D_exposer.def( bp::init< int const &, int const &, int const & >(( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") )) );
IndexVector3D_exposer.def( bp::self *= bp::other< double >() );
IndexVector3D_exposer.def( bp::self += bp::self );
IndexVector3D_exposer.def( bp::self -= bp::self );
@@ -91,11 +92,11 @@ void register_IndexVector3D_class(){
{ //::Geometry::BasicVector3D< int >::operator=
typedef Geometry::BasicVector3D< int > exported_class_t;
- typedef ::Geometry::BasicVector3D< int >& ( exported_class_t::*assign_function_type )( ::Geometry::BasicVector3D< int > const& ) ;
+ typedef ::Geometry::BasicVector3D< int > & ( exported_class_t::*assign_function_type )( ::Geometry::BasicVector3D< int > const & ) ;
IndexVector3D_exposer.def(
"assign"
- , assign_function_type(& ::Geometry::BasicVector3D< int >::operator= )
+ , assign_function_type( &::Geometry::BasicVector3D< int >::operator= )
, ( bp::arg("v") )
, bp::return_self< >() );
@@ -107,18 +108,18 @@ void register_IndexVector3D_class(){
IndexVector3D_exposer.def(
"__getitem__"
- , __getitem___function_type(& ::Geometry::BasicVector3D< int >::operator[] )
+ , __getitem___function_type( &::Geometry::BasicVector3D< int >::operator[] )
, ( bp::arg("i") ) );
}
{ //::Geometry::BasicVector3D< int >::operator[]
typedef Geometry::BasicVector3D< int > exported_class_t;
- typedef int& ( exported_class_t::*__getitem___function_type )( int ) ;
+ typedef int & ( exported_class_t::*__getitem___function_type )( int ) ;
IndexVector3D_exposer.def(
"__getitem__"
- , __getitem___function_type(& ::Geometry::BasicVector3D< int >::operator[] )
+ , __getitem___function_type( &::Geometry::BasicVector3D< int >::operator[] )
, ( bp::arg("i") )
, bp::return_value_policy< bp::copy_non_const_reference >() );
@@ -126,55 +127,55 @@ void register_IndexVector3D_class(){
{ //::Geometry::BasicVector3D< int >::setLambdaAlphaPhi
typedef Geometry::BasicVector3D< int > exported_class_t;
- typedef void ( exported_class_t::*setLambdaAlphaPhi_function_type )( int const& ,int const& ,int const& ) ;
+ typedef void ( exported_class_t::*setLambdaAlphaPhi_function_type )( int const &,int const &,int const & ) ;
IndexVector3D_exposer.def(
"setLambdaAlphaPhi"
- , setLambdaAlphaPhi_function_type(& ::Geometry::BasicVector3D< int >::setLambdaAlphaPhi )
+ , setLambdaAlphaPhi_function_type( &::Geometry::BasicVector3D< int >::setLambdaAlphaPhi )
, ( bp::arg("_lambda"), bp::arg("_alpha"), bp::arg("_phi") ) );
}
{ //::Geometry::BasicVector3D< int >::setX
typedef Geometry::BasicVector3D< int > exported_class_t;
- typedef void ( exported_class_t::*setX_function_type )( int const& ) ;
+ typedef void ( exported_class_t::*setX_function_type )( int const & ) ;
IndexVector3D_exposer.def(
"setX"
- , setX_function_type(& ::Geometry::BasicVector3D< int >::setX )
+ , setX_function_type( &::Geometry::BasicVector3D< int >::setX )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< int >::setXYZ
typedef Geometry::BasicVector3D< int > exported_class_t;
- typedef void ( exported_class_t::*setXYZ_function_type )( int const& ,int const& ,int const& ) ;
+ typedef void ( exported_class_t::*setXYZ_function_type )( int const &,int const &,int const & ) ;
IndexVector3D_exposer.def(
"setXYZ"
- , setXYZ_function_type(& ::Geometry::BasicVector3D< int >::setXYZ )
+ , setXYZ_function_type( &::Geometry::BasicVector3D< int >::setXYZ )
, ( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") ) );
}
{ //::Geometry::BasicVector3D< int >::setY
typedef Geometry::BasicVector3D< int > exported_class_t;
- typedef void ( exported_class_t::*setY_function_type )( int const& ) ;
+ typedef void ( exported_class_t::*setY_function_type )( int const & ) ;
IndexVector3D_exposer.def(
"setY"
- , setY_function_type(& ::Geometry::BasicVector3D< int >::setY )
+ , setY_function_type( &::Geometry::BasicVector3D< int >::setY )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< int >::setZ
typedef Geometry::BasicVector3D< int > exported_class_t;
- typedef void ( exported_class_t::*setZ_function_type )( int const& ) ;
+ typedef void ( exported_class_t::*setZ_function_type )( int const & ) ;
IndexVector3D_exposer.def(
"setZ"
- , setZ_function_type(& ::Geometry::BasicVector3D< int >::setZ )
+ , setZ_function_type( &::Geometry::BasicVector3D< int >::setZ )
, ( bp::arg("a") ) );
}
@@ -185,7 +186,7 @@ void register_IndexVector3D_class(){
IndexVector3D_exposer.def(
"x"
- , x_function_type(& ::Geometry::BasicVector3D< int >::x ) );
+ , x_function_type( &::Geometry::BasicVector3D< int >::x ) );
}
{ //::Geometry::BasicVector3D< int >::y
@@ -195,7 +196,7 @@ void register_IndexVector3D_class(){
IndexVector3D_exposer.def(
"y"
- , y_function_type(& ::Geometry::BasicVector3D< int >::y ) );
+ , y_function_type( &::Geometry::BasicVector3D< int >::y ) );
}
{ //::Geometry::BasicVector3D< int >::z
@@ -205,7 +206,7 @@ void register_IndexVector3D_class(){
IndexVector3D_exposer.def(
"z"
- , z_function_type(& ::Geometry::BasicVector3D< int >::z ) );
+ , z_function_type( &::Geometry::BasicVector3D< int >::z ) );
}
}
diff --git a/Core/PythonAPI/src/Instrument.pypp.cpp b/Core/PythonAPI/src/Instrument.pypp.cpp
index 9fc8b5051cddb3d8109ddfa873c92a484d8ac454..6764f55a2870bc86db565db754945d007c069f29 100644
--- a/Core/PythonAPI/src/Instrument.pypp.cpp
+++ b/Core/PythonAPI/src/Instrument.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -86,7 +89,7 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
}
- Instrument_wrapper(::Instrument const& other )
+ Instrument_wrapper(::Instrument const & other )
: Instrument( boost::ref(other) )
, bp::wrapper< Instrument >(){
// copy constructor
@@ -105,6 +108,18 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -129,6 +144,37 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
IParameterized::printParameters( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< Instrument_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -146,52 +192,56 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
void register_Instrument_class(){
bp::class_< Instrument_wrapper, bp::bases< IParameterized > >( "Instrument", bp::init< >() )
- .def( bp::init< Instrument const& >(( bp::arg("other") )) )
+ .def( bp::init< Instrument const & >(( bp::arg("other") )) )
.def(
"getBeam"
- , (::Beam ( ::Instrument::* )( ) const)(& ::Instrument::getBeam ) )
+ , (::Beam ( ::Instrument::* )( ) const)( &::Instrument::getBeam ) )
.def(
"getDetector"
- , (::Detector ( ::Instrument::* )( ) const)(& ::Instrument::getDetector ) )
+ , (::Detector ( ::Instrument::* )( ) const)( &::Instrument::getDetector ) )
.def(
"getDetectorAxis"
- , (::IAxis const& ( ::Instrument::* )( ::size_t ) const)(& ::Instrument::getDetectorAxis )
+ , (::IAxis const & ( ::Instrument::* )( ::size_t ) const)( &::Instrument::getDetectorAxis )
, ( bp::arg("index") )
, bp::return_value_policy< bp::copy_const_reference >() )
.def(
"getDetectorDimension"
- , (::size_t ( ::Instrument::* )( ) const)(& ::Instrument::getDetectorDimension ) )
+ , (::size_t ( ::Instrument::* )( ) const)( &::Instrument::getDetectorDimension ) )
.def(
"getIntensity"
- , (double ( ::Instrument::* )( ) const)(& ::Instrument::getIntensity ) )
+ , (double ( ::Instrument::* )( ) const)( &::Instrument::getIntensity ) )
.def(
"matchDetectorParameters"
- , (void ( ::Instrument::* )( ::OutputData< double > const& ) )(& ::Instrument::matchDetectorParameters )
+ , (void ( ::Instrument::* )( ::OutputData< double > const & ) )( &::Instrument::matchDetectorParameters )
, ( bp::arg("output_data") ) )
.def(
"setBeam"
- , (void ( ::Instrument::* )( ::Beam ) )(& ::Instrument::setBeam )
+ , (void ( ::Instrument::* )( ::Beam ) )( &::Instrument::setBeam )
, ( bp::arg("beam") ) )
.def(
"setBeamIntensity"
- , (void ( ::Instrument::* )( double ) )(& ::Instrument::setBeamIntensity )
+ , (void ( ::Instrument::* )( double ) )( &::Instrument::setBeamIntensity )
, ( bp::arg("intensity") ) )
.def(
"setBeamParameters"
- , (void ( ::Instrument::* )( double,double,double ) )(& ::Instrument::setBeamParameters )
+ , (void ( ::Instrument::* )( double,double,double ) )( &::Instrument::setBeamParameters )
, ( bp::arg("lambda"), bp::arg("alpha_i"), bp::arg("phi_i") ) )
.def(
"setDetectorParameters"
- , (void ( ::Instrument::* )( ::size_t,double,double,::size_t,double,double,bool ) )(& ::Instrument::setDetectorParameters )
+ , (void ( ::Instrument::* )( ::size_t,double,double,::size_t,double,double,bool ) )( &::Instrument::setDetectorParameters )
, ( bp::arg("n_phi"), bp::arg("phi_f_min"), bp::arg("phi_f_max"), bp::arg("n_alpha"), bp::arg("alpha_f_min"), bp::arg("alpha_f_max"), bp::arg("isgisaxs_style")=(bool)(false) ) )
.def(
"setDetectorParameters"
- , (void ( ::Instrument::* )( ::DetectorParameters const& ) )(& ::Instrument::setDetectorParameters )
+ , (void ( ::Instrument::* )( ::DetectorParameters const & ) )( &::Instrument::setDetectorParameters )
, ( bp::arg("params") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( Instrument_wrapper::* )( ) )(&Instrument_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( Instrument_wrapper::* )( ) )(&Instrument_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -201,6 +251,15 @@ void register_Instrument_class(){
"printParameters"
, (void ( ::IParameterized::* )( ) const)(&::IParameterized::printParameters)
, (void ( Instrument_wrapper::* )( ) const)(&Instrument_wrapper::default_printParameters) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &Instrument_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( Instrument_wrapper::* )( ::std::string const &,double ) )(&Instrument_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
index 839c714576116b2876b234d8a65447f8262de2de..96166a4b9cf185a32f0cc9bc2d1f498dbf79451b 100644
--- a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
return InterferenceFunction1DParaCrystal::clone( );
}
- virtual double evaluate( ::cvector_t const& q ) const {
+ virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
else{
@@ -106,7 +109,7 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
}
}
- double default_evaluate( ::cvector_t const& q ) const {
+ double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction1DParaCrystal::evaluate( boost::ref(q) );
}
@@ -134,6 +137,18 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -170,6 +185,37 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< InterferenceFunction1DParaCrystal_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -189,7 +235,7 @@ void register_InterferenceFunction1DParaCrystal_class(){
bp::class_< InterferenceFunction1DParaCrystal_wrapper, bp::bases< IInterferenceFunction >, boost::noncopyable >( "InterferenceFunction1DParaCrystal", bp::init< double, double, bp::optional< double > >(( bp::arg("peak_distance"), bp::arg("width"), bp::arg("corr_length")=0.0 )) )
.def(
"FTGaussianCorrLength"
- , (::complex_t ( ::InterferenceFunction1DParaCrystal::* )( double ) const)(& ::InterferenceFunction1DParaCrystal::FTGaussianCorrLength )
+ , (::complex_t ( ::InterferenceFunction1DParaCrystal::* )( double ) const)( &::InterferenceFunction1DParaCrystal::FTGaussianCorrLength )
, ( bp::arg("qpar") ) )
.def(
"clone"
@@ -198,8 +244,8 @@ void register_InterferenceFunction1DParaCrystal_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (double ( ::InterferenceFunction1DParaCrystal::* )( ::cvector_t const& ) const)(&::InterferenceFunction1DParaCrystal::evaluate)
- , (double ( InterferenceFunction1DParaCrystal_wrapper::* )( ::cvector_t const& ) const)(&InterferenceFunction1DParaCrystal_wrapper::default_evaluate)
+ , (double ( ::InterferenceFunction1DParaCrystal::* )( ::cvector_t const & ) const)(&::InterferenceFunction1DParaCrystal::evaluate)
+ , (double ( InterferenceFunction1DParaCrystal_wrapper::* )( ::cvector_t const & ) const)(&InterferenceFunction1DParaCrystal_wrapper::default_evaluate)
, ( bp::arg("q") ) )
.def(
"getKappa"
@@ -207,12 +253,16 @@ void register_InterferenceFunction1DParaCrystal_class(){
, (double ( InterferenceFunction1DParaCrystal_wrapper::* )( ) const)(&InterferenceFunction1DParaCrystal_wrapper::default_getKappa) )
.def(
"setKappa"
- , (void ( ::InterferenceFunction1DParaCrystal::* )( double ) )(& ::InterferenceFunction1DParaCrystal::setKappa )
+ , (void ( ::InterferenceFunction1DParaCrystal::* )( double ) )( &::InterferenceFunction1DParaCrystal::setKappa )
, ( bp::arg("kappa") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( InterferenceFunction1DParaCrystal_wrapper::* )( ) )(&InterferenceFunction1DParaCrystal_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( InterferenceFunction1DParaCrystal_wrapper::* )( ) )(&InterferenceFunction1DParaCrystal_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -226,6 +276,15 @@ void register_InterferenceFunction1DParaCrystal_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( InterferenceFunction1DParaCrystal_wrapper::* )( ) )(&InterferenceFunction1DParaCrystal_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &InterferenceFunction1DParaCrystal_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( InterferenceFunction1DParaCrystal_wrapper::* )( ::std::string const &,double ) )(&InterferenceFunction1DParaCrystal_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
index 34f276d8349f7f0ae4831bdd9797e4341b17c23c..6b03c465b42383998d763f4e678ad274af9f7c8d 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp::wrapper< InterferenceFunction2DLattice > {
- InterferenceFunction2DLattice_wrapper(::Lattice2DIFParameters const& lattice_params )
+ InterferenceFunction2DLattice_wrapper(::Lattice2DIFParameters const & lattice_params )
: InterferenceFunction2DLattice( boost::ref(lattice_params) )
, bp::wrapper< InterferenceFunction2DLattice >(){
// constructor
@@ -98,7 +101,7 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
return InterferenceFunction2DLattice::clone( );
}
- virtual double evaluate( ::cvector_t const& q ) const {
+ virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
else{
@@ -106,7 +109,7 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
}
}
- double default_evaluate( ::cvector_t const& q ) const {
+ double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DLattice::evaluate( boost::ref(q) );
}
@@ -122,6 +125,18 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -170,6 +185,37 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< InterferenceFunction2DLattice_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -186,7 +232,7 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
void register_InterferenceFunction2DLattice_class(){
- bp::class_< InterferenceFunction2DLattice_wrapper, bp::bases< IInterferenceFunction >, boost::noncopyable >( "InterferenceFunction2DLattice", bp::init< Lattice2DIFParameters const& >(( bp::arg("lattice_params") )) )
+ bp::class_< InterferenceFunction2DLattice_wrapper, bp::bases< IInterferenceFunction >, boost::noncopyable >( "InterferenceFunction2DLattice", bp::init< Lattice2DIFParameters const & >(( bp::arg("lattice_params") )) )
.def(
"clone"
, (::InterferenceFunction2DLattice * ( ::InterferenceFunction2DLattice::* )( ) const)(&::InterferenceFunction2DLattice::clone)
@@ -194,17 +240,21 @@ void register_InterferenceFunction2DLattice_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (double ( ::InterferenceFunction2DLattice::* )( ::cvector_t const& ) const)(&::InterferenceFunction2DLattice::evaluate)
- , (double ( InterferenceFunction2DLattice_wrapper::* )( ::cvector_t const& ) const)(&InterferenceFunction2DLattice_wrapper::default_evaluate)
+ , (double ( ::InterferenceFunction2DLattice::* )( ::cvector_t const & ) const)(&::InterferenceFunction2DLattice::evaluate)
+ , (double ( InterferenceFunction2DLattice_wrapper::* )( ::cvector_t const & ) const)(&InterferenceFunction2DLattice_wrapper::default_evaluate)
, ( bp::arg("q") ) )
.def(
"setProbabilityDistribution"
- , (void ( ::InterferenceFunction2DLattice::* )( ::IFTDistribution2D const& ) )(& ::InterferenceFunction2DLattice::setProbabilityDistribution )
+ , (void ( ::InterferenceFunction2DLattice::* )( ::IFTDistribution2D const & ) )( &::InterferenceFunction2DLattice::setProbabilityDistribution )
, ( bp::arg("pdf") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( InterferenceFunction2DLattice_wrapper::* )( ) )(&InterferenceFunction2DLattice_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( InterferenceFunction2DLattice_wrapper::* )( ) )(&InterferenceFunction2DLattice_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -222,6 +272,15 @@ void register_InterferenceFunction2DLattice_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( InterferenceFunction2DLattice_wrapper::* )( ) )(&InterferenceFunction2DLattice_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &InterferenceFunction2DLattice_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( InterferenceFunction2DLattice_wrapper::* )( ::std::string const &,double ) )(&InterferenceFunction2DLattice_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
index 5706f8d8a6bb60cf4f28eb33197bd19cfb1e10ca..bd40808ea45b2a374b807e880d03a21a85522ad5 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
return InterferenceFunction2DParaCrystal::clone( );
}
- virtual double evaluate( ::cvector_t const& q ) const {
+ virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
else{
@@ -106,7 +109,7 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
}
}
- double default_evaluate( ::cvector_t const& q ) const {
+ double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DParaCrystal::evaluate( boost::ref(q) );
}
@@ -122,6 +125,18 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -170,6 +185,37 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< InterferenceFunction2DParaCrystal_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -194,35 +240,39 @@ void register_InterferenceFunction2DParaCrystal_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createHexagonal"
- , (::InterferenceFunction2DParaCrystal * (*)( double,double,double,double ))(& ::InterferenceFunction2DParaCrystal::createHexagonal )
+ , (::InterferenceFunction2DParaCrystal * (*)( double,double,double,double ))( &::InterferenceFunction2DParaCrystal::createHexagonal )
, ( bp::arg("peak_distance"), bp::arg("corr_length")=0.0, bp::arg("domain_size_1")=0.0, bp::arg("domain_size_2")=0.0 )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"createSquare"
- , (::InterferenceFunction2DParaCrystal * (*)( double,double,double,double ))(& ::InterferenceFunction2DParaCrystal::createSquare )
+ , (::InterferenceFunction2DParaCrystal * (*)( double,double,double,double ))( &::InterferenceFunction2DParaCrystal::createSquare )
, ( bp::arg("peak_distance"), bp::arg("corr_length")=0.0, bp::arg("domain_size_1")=0.0, bp::arg("domain_size_2")=0.0 )
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (double ( ::InterferenceFunction2DParaCrystal::* )( ::cvector_t const& ) const)(&::InterferenceFunction2DParaCrystal::evaluate)
- , (double ( InterferenceFunction2DParaCrystal_wrapper::* )( ::cvector_t const& ) const)(&InterferenceFunction2DParaCrystal_wrapper::default_evaluate)
+ , (double ( ::InterferenceFunction2DParaCrystal::* )( ::cvector_t const & ) const)(&::InterferenceFunction2DParaCrystal::evaluate)
+ , (double ( InterferenceFunction2DParaCrystal_wrapper::* )( ::cvector_t const & ) const)(&InterferenceFunction2DParaCrystal_wrapper::default_evaluate)
, ( bp::arg("q") ) )
.def(
"setDomainSizes"
- , (void ( ::InterferenceFunction2DParaCrystal::* )( double,double ) )(& ::InterferenceFunction2DParaCrystal::setDomainSizes )
+ , (void ( ::InterferenceFunction2DParaCrystal::* )( double,double ) )( &::InterferenceFunction2DParaCrystal::setDomainSizes )
, ( bp::arg("size_1"), bp::arg("size_2") ) )
.def(
"setIntegrationOverXi"
- , (void ( ::InterferenceFunction2DParaCrystal::* )( bool ) )(& ::InterferenceFunction2DParaCrystal::setIntegrationOverXi )
+ , (void ( ::InterferenceFunction2DParaCrystal::* )( bool ) )( &::InterferenceFunction2DParaCrystal::setIntegrationOverXi )
, ( bp::arg("integrate_xi") ) )
.def(
"setProbabilityDistributions"
- , (void ( ::InterferenceFunction2DParaCrystal::* )( ::IFTDistribution2D const& ,::IFTDistribution2D const& ) )(& ::InterferenceFunction2DParaCrystal::setProbabilityDistributions )
+ , (void ( ::InterferenceFunction2DParaCrystal::* )( ::IFTDistribution2D const &,::IFTDistribution2D const & ) )( &::InterferenceFunction2DParaCrystal::setProbabilityDistributions )
, ( bp::arg("pdf_1"), bp::arg("pdf_2") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( InterferenceFunction2DParaCrystal_wrapper::* )( ) )(&InterferenceFunction2DParaCrystal_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( InterferenceFunction2DParaCrystal_wrapper::* )( ) )(&InterferenceFunction2DParaCrystal_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -240,6 +290,15 @@ void register_InterferenceFunction2DParaCrystal_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( InterferenceFunction2DParaCrystal_wrapper::* )( ) )(&InterferenceFunction2DParaCrystal_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &InterferenceFunction2DParaCrystal_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( InterferenceFunction2DParaCrystal_wrapper::* )( ::std::string const &,double ) )(&InterferenceFunction2DParaCrystal_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
index f71a88736e7607e9a01c06af22a75c2f9c731e06..a2f88888f3e30eb69402655b2f3ea91d080ea578 100644
--- a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,7 +101,7 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
return InterferenceFunctionNone::clone( );
}
- virtual double evaluate( ::cvector_t const& q ) const {
+ virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
else{
@@ -106,7 +109,7 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
}
}
- double default_evaluate( ::cvector_t const& q ) const {
+ double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunctionNone::evaluate( boost::ref(q) );
}
@@ -122,6 +125,18 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -170,6 +185,37 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< InterferenceFunctionNone_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -194,13 +240,17 @@ void register_InterferenceFunctionNone_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"evaluate"
- , (double ( ::InterferenceFunctionNone::* )( ::cvector_t const& ) const)(&::InterferenceFunctionNone::evaluate)
- , (double ( InterferenceFunctionNone_wrapper::* )( ::cvector_t const& ) const)(&InterferenceFunctionNone_wrapper::default_evaluate)
+ , (double ( ::InterferenceFunctionNone::* )( ::cvector_t const & ) const)(&::InterferenceFunctionNone::evaluate)
+ , (double ( InterferenceFunctionNone_wrapper::* )( ::cvector_t const & ) const)(&InterferenceFunctionNone_wrapper::default_evaluate)
, ( bp::arg("q") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( InterferenceFunctionNone_wrapper::* )( ) )(&InterferenceFunctionNone_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( InterferenceFunctionNone_wrapper::* )( ) )(&InterferenceFunctionNone_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -218,6 +268,15 @@ void register_InterferenceFunctionNone_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( InterferenceFunctionNone_wrapper::* )( ) )(&InterferenceFunctionNone_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &InterferenceFunctionNone_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( InterferenceFunctionNone_wrapper::* )( ::std::string const &,double ) )(&InterferenceFunctionNone_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/Lattice.pypp.cpp b/Core/PythonAPI/src/Lattice.pypp.cpp
index c21a7b4142fc0a89daf44333675be55fcf73c877..2123dbc505adbf5802a22c436713e89f76a62abc 100644
--- a/Core/PythonAPI/src/Lattice.pypp.cpp
+++ b/Core/PythonAPI/src/Lattice.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -80,25 +81,25 @@ namespace bp = boost::python;
void register_Lattice_class(){
bp::class_< Lattice >( "Lattice", bp::init< >() )
- .def( bp::init< kvector_t const& , kvector_t const& , kvector_t const& >(( bp::arg("a1"), bp::arg("a2"), bp::arg("a3") )) )
- .def( bp::init< Lattice const& >(( bp::arg("lattice") )) )
+ .def( bp::init< kvector_t const &, kvector_t const &, kvector_t const & >(( bp::arg("a1"), bp::arg("a2"), bp::arg("a3") )) )
+ .def( bp::init< Lattice const & >(( bp::arg("lattice") )) )
.def(
"createTrigonalLattice"
- , (::Lattice (*)( double,double ))(& ::Lattice::createTrigonalLattice )
+ , (::Lattice (*)( double,double ))( &::Lattice::createTrigonalLattice )
, ( bp::arg("a"), bp::arg("c") )
, bp::return_value_policy< bp::return_by_value >() )
.def(
"getBasisVectorA"
- , (::kvector_t ( ::Lattice::* )( ) const)(& ::Lattice::getBasisVectorA ) )
+ , (::kvector_t ( ::Lattice::* )( ) const)( &::Lattice::getBasisVectorA ) )
.def(
"getBasisVectorB"
- , (::kvector_t ( ::Lattice::* )( ) const)(& ::Lattice::getBasisVectorB ) )
+ , (::kvector_t ( ::Lattice::* )( ) const)( &::Lattice::getBasisVectorB ) )
.def(
"getBasisVectorC"
- , (::kvector_t ( ::Lattice::* )( ) const)(& ::Lattice::getBasisVectorC ) )
+ , (::kvector_t ( ::Lattice::* )( ) const)( &::Lattice::getBasisVectorC ) )
.def(
"setSelectionRule"
- , (void ( ::Lattice::* )( ::ISelectionRule const& ) )(& ::Lattice::setSelectionRule )
+ , (void ( ::Lattice::* )( ::ISelectionRule const & ) )( &::Lattice::setSelectionRule )
, ( bp::arg("p_selection_rule") ) )
.staticmethod( "createTrigonalLattice" );
diff --git a/Core/PythonAPI/src/Lattice2DIFParameters.pypp.cpp b/Core/PythonAPI/src/Lattice2DIFParameters.pypp.cpp
index adfd51f0cbcc89c39ae45d269de885749aacc523..a555b9b6be665b60235ab82424ab1875e511fe19 100644
--- a/Core/PythonAPI/src/Lattice2DIFParameters.pypp.cpp
+++ b/Core/PythonAPI/src/Lattice2DIFParameters.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -80,13 +81,13 @@ namespace bp = boost::python;
void register_Lattice2DIFParameters_class(){
bp::class_< Lattice2DIFParameters >( "Lattice2DIFParameters", bp::init< >() )
- .def_readwrite( "m_angle",& Lattice2DIFParameters::m_angle )
- .def_readwrite( "m_corr_length_1",& Lattice2DIFParameters::m_corr_length_1 )
- .def_readwrite( "m_corr_length_2",& Lattice2DIFParameters::m_corr_length_2 )
- .def_readwrite( "m_domain_size_1",& Lattice2DIFParameters::m_domain_size_1 )
- .def_readwrite( "m_domain_size_2",& Lattice2DIFParameters::m_domain_size_2 )
- .def_readwrite( "m_length_1",& Lattice2DIFParameters::m_length_1 )
- .def_readwrite( "m_length_2",& Lattice2DIFParameters::m_length_2 )
- .def_readwrite( "m_xi",& Lattice2DIFParameters::m_xi );
+ .def_readwrite( "m_angle", &Lattice2DIFParameters::m_angle )
+ .def_readwrite( "m_corr_length_1", &Lattice2DIFParameters::m_corr_length_1 )
+ .def_readwrite( "m_corr_length_2", &Lattice2DIFParameters::m_corr_length_2 )
+ .def_readwrite( "m_domain_size_1", &Lattice2DIFParameters::m_domain_size_1 )
+ .def_readwrite( "m_domain_size_2", &Lattice2DIFParameters::m_domain_size_2 )
+ .def_readwrite( "m_length_1", &Lattice2DIFParameters::m_length_1 )
+ .def_readwrite( "m_length_2", &Lattice2DIFParameters::m_length_2 )
+ .def_readwrite( "m_xi", &Lattice2DIFParameters::m_xi );
}
diff --git a/Core/PythonAPI/src/LatticeBasis.pypp.cpp b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
index e8703ea7209a1c07900a6960a9e356983d3e4a99..d80acdf8f261ce653b7ca5e08cacf845c6ad0767 100644
--- a/Core/PythonAPI/src/LatticeBasis.pypp.cpp
+++ b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,6 +101,18 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -194,6 +209,37 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< LatticeBasis_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -225,12 +271,16 @@ void register_LatticeBasis_class(){
bp::class_< LatticeBasis_wrapper, bp::bases< Particle >, boost::noncopyable >( "LatticeBasis", bp::init< >() )
.def(
"addParticle"
- , (void ( ::LatticeBasis::* )( ::Particle const& ,::std::vector< Geometry::BasicVector3D<double> > ) )(& ::LatticeBasis::addParticle )
+ , (void ( ::LatticeBasis::* )( ::Particle const &,::std::vector< Geometry::BasicVector3D<double> > ) )( &::LatticeBasis::addParticle )
, ( bp::arg("particle"), bp::arg("positions") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( LatticeBasis_wrapper::* )( ) )(&LatticeBasis_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( LatticeBasis_wrapper::* )( ) )(&LatticeBasis_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -267,6 +317,15 @@ void register_LatticeBasis_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( LatticeBasis_wrapper::* )( ) )(&LatticeBasis_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &LatticeBasis_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( LatticeBasis_wrapper::* )( ::std::string const &,double ) )(&LatticeBasis_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/Layer.pypp.cpp b/Core/PythonAPI/src/Layer.pypp.cpp
index dbc2f8adb07883b600383d96e5512905f18a727e..22e8f8c6826f5fbb2a448dbaff39a7b9d5a09fc5 100644
--- a/Core/PythonAPI/src/Layer.pypp.cpp
+++ b/Core/PythonAPI/src/Layer.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -93,7 +96,7 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
}
- Layer_wrapper(::Layer const& other )
+ Layer_wrapper(::Layer const & other )
: Layer( boost::ref(other) )
, bp::wrapper< Layer >(){
// copy constructor
@@ -208,6 +211,18 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -268,6 +283,37 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< Layer_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -298,7 +344,7 @@ void register_Layer_class(){
bp::class_< Layer_wrapper, bp::bases< ICompositeSample >, boost::noncopyable >( "Layer", bp::init< >() )
.def( bp::init< IMaterial const *, bp::optional< double > >(( bp::arg("p_material"), bp::arg("thickness")=0 )) )
- .def( bp::init< Layer const& >(( bp::arg("other") )) )
+ .def( bp::init< Layer const & >(( bp::arg("other") )) )
.def(
"clone"
, (::Layer * ( ::Layer::* )( ) const)(&::Layer::clone)
@@ -340,6 +386,10 @@ void register_Layer_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( Layer_wrapper::* )( ) )(&Layer_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( Layer_wrapper::* )( ) )(&Layer_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -363,6 +413,15 @@ void register_Layer_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( Layer_wrapper::* )( ) )(&Layer_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &Layer_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( Layer_wrapper::* )( ::std::string const &,double ) )(&Layer_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/LayerDWBASimulation.pypp.cpp b/Core/PythonAPI/src/LayerDWBASimulation.pypp.cpp
index b4980dbe39afc2f5d6ba6ac625007a39a8dca7e0..605acb7b3bbb4334cc214c9f0616e0cf15a9a8b7 100644
--- a/Core/PythonAPI/src/LayerDWBASimulation.pypp.cpp
+++ b/Core/PythonAPI/src/LayerDWBASimulation.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -122,15 +123,15 @@ void register_LayerDWBASimulation_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"setKzAndRTFunctions"
- , (void ( ::LayerDWBASimulation::* )( ::IDoubleToComplexMap const& ,::IDoubleToPairOfComplexMap const& ) )(& ::LayerDWBASimulation::setKzAndRTFunctions )
+ , (void ( ::LayerDWBASimulation::* )( ::IDoubleToComplexMap const &,::IDoubleToPairOfComplexMap const & ) )( &::LayerDWBASimulation::setKzAndRTFunctions )
, ( bp::arg("kz_function"), bp::arg("rt_map") ) )
.def(
"setKzFunction"
- , (void ( ::LayerDWBASimulation::* )( ::IDoubleToComplexMap const& ) )(& ::LayerDWBASimulation::setKzFunction )
+ , (void ( ::LayerDWBASimulation::* )( ::IDoubleToComplexMap const & ) )( &::LayerDWBASimulation::setKzFunction )
, ( bp::arg("kz_function") ) )
.def(
"setReflectionTransmissionFunction"
- , (void ( ::LayerDWBASimulation::* )( ::IDoubleToPairOfComplexMap const& ) )(& ::LayerDWBASimulation::setReflectionTransmissionFunction )
+ , (void ( ::LayerDWBASimulation::* )( ::IDoubleToPairOfComplexMap const & ) )( &::LayerDWBASimulation::setReflectionTransmissionFunction )
, ( bp::arg("rt_map") ) )
.def(
"run"
diff --git a/Core/PythonAPI/src/LayerDecorator.pypp.cpp b/Core/PythonAPI/src/LayerDecorator.pypp.cpp
index 6f9110872c3c570a2a71bc0bf61931998e18a86a..d1bfa68380c49a1dd3452ef62534a2ff00c2b511 100644
--- a/Core/PythonAPI/src/LayerDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/LayerDecorator.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct LayerDecorator_wrapper : LayerDecorator, bp::wrapper< LayerDecorator > {
- LayerDecorator_wrapper(::Layer const& layer, ::IDecoration const& decoration )
+ LayerDecorator_wrapper(::Layer const & layer, ::IDecoration const & decoration )
: LayerDecorator( boost::ref(layer), boost::ref(decoration) )
, bp::wrapper< LayerDecorator >(){
// constructor
@@ -98,6 +101,18 @@ struct LayerDecorator_wrapper : LayerDecorator, bp::wrapper< LayerDecorator > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -170,6 +185,37 @@ struct LayerDecorator_wrapper : LayerDecorator, bp::wrapper< LayerDecorator > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< LayerDecorator_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -198,11 +244,15 @@ struct LayerDecorator_wrapper : LayerDecorator, bp::wrapper< LayerDecorator > {
void register_LayerDecorator_class(){
- bp::class_< LayerDecorator_wrapper, bp::bases< Layer >, boost::noncopyable >( "LayerDecorator", bp::init< Layer const& , IDecoration const& >(( bp::arg("layer"), bp::arg("decoration") )) )
+ bp::class_< LayerDecorator_wrapper, bp::bases< Layer >, boost::noncopyable >( "LayerDecorator", bp::init< Layer const &, IDecoration const & >(( bp::arg("layer"), bp::arg("decoration") )) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( LayerDecorator_wrapper::* )( ) )(&LayerDecorator_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( LayerDecorator_wrapper::* )( ) )(&LayerDecorator_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -230,6 +280,15 @@ void register_LayerDecorator_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( LayerDecorator_wrapper::* )( ) )(&LayerDecorator_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &LayerDecorator_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( LayerDecorator_wrapper::* )( ::std::string const &,double ) )(&LayerDecorator_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/LayerDecoratorDWBASimulation.pypp.cpp b/Core/PythonAPI/src/LayerDecoratorDWBASimulation.pypp.cpp
index 0dab4e4f1b8752475315895e5dcbc9e8d31ecb52..b3ae1971e0103f5c40e974a1826df36b1d33311e 100644
--- a/Core/PythonAPI/src/LayerDecoratorDWBASimulation.pypp.cpp
+++ b/Core/PythonAPI/src/LayerDecoratorDWBASimulation.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -91,7 +92,7 @@ struct LayerDecoratorDWBASimulation_wrapper : LayerDecoratorDWBASimulation, bp::
return LayerDecoratorDWBASimulation::clone( );
}
- virtual void init( ::Simulation const& simulation ) {
+ virtual void init( ::Simulation const & simulation ) {
if( bp::override func_init = this->get_override( "init" ) )
func_init( boost::ref(simulation) );
else{
@@ -99,7 +100,7 @@ struct LayerDecoratorDWBASimulation_wrapper : LayerDecoratorDWBASimulation, bp::
}
}
- void default_init( ::Simulation const& simulation ) {
+ void default_init( ::Simulation const & simulation ) {
LayerDecoratorDWBASimulation::init( boost::ref(simulation) );
}
@@ -127,8 +128,8 @@ void register_LayerDecoratorDWBASimulation_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"init"
- , (void ( ::LayerDecoratorDWBASimulation::* )( ::Simulation const& ) )(&::LayerDecoratorDWBASimulation::init)
- , (void ( LayerDecoratorDWBASimulation_wrapper::* )( ::Simulation const& ) )(&LayerDecoratorDWBASimulation_wrapper::default_init)
+ , (void ( ::LayerDecoratorDWBASimulation::* )( ::Simulation const & ) )(&::LayerDecoratorDWBASimulation::init)
+ , (void ( LayerDecoratorDWBASimulation_wrapper::* )( ::Simulation const & ) )(&LayerDecoratorDWBASimulation_wrapper::default_init)
, ( bp::arg("simulation") ) )
.def(
"run"
diff --git a/Core/PythonAPI/src/LayerRoughness.pypp.cpp b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
index ed28051b7ccb2859f6dd603fd62764efd21b3e53..1cc418905517ceb8e881932b7a0abfc762cd4e48 100644
--- a/Core/PythonAPI/src/LayerRoughness.pypp.cpp
+++ b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -117,6 +120,18 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -153,6 +168,37 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< LayerRoughness_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -178,29 +224,33 @@ void register_LayerRoughness_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"getHurstParameter"
- , (double ( ::LayerRoughness::* )( ) const)(& ::LayerRoughness::getHurstParameter ) )
+ , (double ( ::LayerRoughness::* )( ) const)( &::LayerRoughness::getHurstParameter ) )
.def(
"getLatteralCorrLength"
- , (double ( ::LayerRoughness::* )( ) const)(& ::LayerRoughness::getLatteralCorrLength ) )
+ , (double ( ::LayerRoughness::* )( ) const)( &::LayerRoughness::getLatteralCorrLength ) )
.def(
"getSigma"
- , (double ( ::LayerRoughness::* )( ) const)(& ::LayerRoughness::getSigma ) )
+ , (double ( ::LayerRoughness::* )( ) const)( &::LayerRoughness::getSigma ) )
.def(
"setHurstParameter"
- , (void ( ::LayerRoughness::* )( double ) )(& ::LayerRoughness::setHurstParameter )
+ , (void ( ::LayerRoughness::* )( double ) )( &::LayerRoughness::setHurstParameter )
, ( bp::arg("hurstParameter") ) )
.def(
"setLatteralCorrLength"
- , (void ( ::LayerRoughness::* )( double ) )(& ::LayerRoughness::setLatteralCorrLength )
+ , (void ( ::LayerRoughness::* )( double ) )( &::LayerRoughness::setLatteralCorrLength )
, ( bp::arg("latteralCorrLength") ) )
.def(
"setSigma"
- , (void ( ::LayerRoughness::* )( double ) )(& ::LayerRoughness::setSigma )
+ , (void ( ::LayerRoughness::* )( double ) )( &::LayerRoughness::setSigma )
, ( bp::arg("sigma") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( LayerRoughness_wrapper::* )( ) )(&LayerRoughness_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( LayerRoughness_wrapper::* )( ) )(&LayerRoughness_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -214,6 +264,15 @@ void register_LayerRoughness_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( LayerRoughness_wrapper::* )( ) )(&LayerRoughness_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &LayerRoughness_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( LayerRoughness_wrapper::* )( ::std::string const &,double ) )(&LayerRoughness_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/MaterialManager.pypp.cpp b/Core/PythonAPI/src/MaterialManager.pypp.cpp
index 16abc76de058a46f7d3d8d26c36fbcf3bd9bb733..47a5bbf0f0e5ed994c8a13f05faef847694f2ac9 100644
--- a/Core/PythonAPI/src/MaterialManager.pypp.cpp
+++ b/Core/PythonAPI/src/MaterialManager.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -82,17 +83,17 @@ void register_MaterialManager_class(){
bp::class_< MaterialManager, bp::bases< ISingleton< MaterialManager > >, boost::noncopyable >( "MaterialManager", bp::no_init )
.def(
"getHomogeneousMaterial"
- , (::IMaterial const * (*)( ::std::string const& ,::complex_t const& ))(& ::MaterialManager::getHomogeneousMaterial )
+ , (::IMaterial const * (*)( ::std::string const &,::complex_t const & ))( &::MaterialManager::getHomogeneousMaterial )
, ( bp::arg("name"), bp::arg("refractive_index") )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getHomogeneousMaterial"
- , (::IMaterial const * (*)( ::std::string const& ,double,double ))(& ::MaterialManager::getHomogeneousMaterial )
+ , (::IMaterial const * (*)( ::std::string const &,double,double ))( &::MaterialManager::getHomogeneousMaterial )
, ( bp::arg("name"), bp::arg("refractive_index_real"), bp::arg("refractive_index_imag") )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getMaterial"
- , (::IMaterial const * (*)( ::std::string const& ))(& ::MaterialManager::getMaterial )
+ , (::IMaterial const * (*)( ::std::string const & ))( &::MaterialManager::getMaterial )
, ( bp::arg("name") )
, bp::return_value_policy< bp::reference_existing_object >() )
.staticmethod( "getHomogeneousMaterial" )
diff --git a/Core/PythonAPI/src/MaterialManagerSingleton_t.pypp.cpp b/Core/PythonAPI/src/MaterialManagerSingleton_t.pypp.cpp
index 6a8ed0adbabfa48a3a804580718d7514dcc2555c..f69436fdf006a8b45ab34c667f9f0f706097e482 100644
--- a/Core/PythonAPI/src/MaterialManagerSingleton_t.pypp.cpp
+++ b/Core/PythonAPI/src/MaterialManagerSingleton_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -82,7 +83,7 @@ void register_MaterialManagerSingleton_t_class(){
bp::class_< ISingleton< MaterialManager >, boost::noncopyable >( "MaterialManagerSingleton_t", bp::no_init )
.def(
"instance"
- , (::MaterialManager& (*)( ))(& ::ISingleton< MaterialManager >::instance )
+ , (::MaterialManager & (*)( ))( &::ISingleton< MaterialManager >::instance )
, bp::return_value_policy< bp::reference_existing_object >() )
.staticmethod( "instance" );
diff --git a/Core/PythonAPI/src/MesoCrystal.pypp.cpp b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
index d56ee924c508a98ad15593bdc65c94b3b1ab6d27..828a638ff30737b0979dece13de444837bc121c2 100644
--- a/Core/PythonAPI/src/MesoCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
- MesoCrystal_wrapper(::IClusteredParticles const& particle_structure, ::IFormFactor& form_factor )
+ MesoCrystal_wrapper(::IClusteredParticles const & particle_structure, ::IFormFactor & form_factor )
: MesoCrystal( boost::ref(particle_structure), boost::ref(form_factor) )
, bp::wrapper< MesoCrystal >(){
// constructor
@@ -98,6 +101,18 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::IFormFactor * createFormFactor( ) const {
if( bp::override func_createFormFactor = this->get_override( "createFormFactor" ) )
return func_createFormFactor( );
@@ -194,6 +209,25 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< MesoCrystal_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
virtual void setAmbientRefractiveIndex( ::complex_t refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( refractive_index );
@@ -206,6 +240,18 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
Particle::setAmbientRefractiveIndex( refractive_index );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -234,11 +280,15 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
void register_MesoCrystal_class(){
- bp::class_< MesoCrystal_wrapper, bp::bases< Particle >, boost::noncopyable >( "MesoCrystal", bp::init< IClusteredParticles const& , IFormFactor& >(( bp::arg("particle_structure"), bp::arg("form_factor") )) )
+ bp::class_< MesoCrystal_wrapper, bp::bases< Particle >, boost::noncopyable >( "MesoCrystal", bp::init< IClusteredParticles const &, IFormFactor & >(( bp::arg("particle_structure"), bp::arg("form_factor") )) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( MesoCrystal_wrapper::* )( ) )(&MesoCrystal_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( MesoCrystal_wrapper::* )( ) )(&MesoCrystal_wrapper::default_clearParameterPool) )
.def(
"createFormFactor"
, (::IFormFactor * ( ::Particle::* )( ) const)(&::Particle::createFormFactor)
@@ -275,11 +325,20 @@ void register_MesoCrystal_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( MesoCrystal_wrapper::* )( ) )(&MesoCrystal_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &MesoCrystal_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
, (void ( ::Particle::* )( ::complex_t ) )(&::Particle::setAmbientRefractiveIndex)
, (void ( MesoCrystal_wrapper::* )( ::complex_t ) )(&MesoCrystal_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( MesoCrystal_wrapper::* )( ::std::string const &,double ) )(&MesoCrystal_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/MultiLayer.pypp.cpp b/Core/PythonAPI/src/MultiLayer.pypp.cpp
index b5e16bad0f171e33e6b658e37b8b45d0b17e319b..c8a409d94c027adf99131d8f6b534d07d064306d 100644
--- a/Core/PythonAPI/src/MultiLayer.pypp.cpp
+++ b/Core/PythonAPI/src/MultiLayer.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -98,6 +101,18 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -158,6 +173,37 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< MultiLayer_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -189,16 +235,20 @@ void register_MultiLayer_class(){
bp::class_< MultiLayer_wrapper, bp::bases< ICompositeSample >, boost::noncopyable >( "MultiLayer", bp::init< >() )
.def(
"addLayer"
- , (void ( ::MultiLayer::* )( ::Layer const& ) )(& ::MultiLayer::addLayer )
+ , (void ( ::MultiLayer::* )( ::Layer const & ) )( &::MultiLayer::addLayer )
, ( bp::arg("p_child") ) )
.def(
"addLayerWithTopRoughness"
- , (void ( ::MultiLayer::* )( ::Layer const& ,::LayerRoughness const& ) )(& ::MultiLayer::addLayerWithTopRoughness )
+ , (void ( ::MultiLayer::* )( ::Layer const &,::LayerRoughness const & ) )( &::MultiLayer::addLayerWithTopRoughness )
, ( bp::arg("layer"), bp::arg("roughness") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( MultiLayer_wrapper::* )( ) )(&MultiLayer_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( MultiLayer_wrapper::* )( ) )(&MultiLayer_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -222,6 +272,15 @@ void register_MultiLayer_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( MultiLayer_wrapper::* )( ) )(&MultiLayer_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &MultiLayer_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( MultiLayer_wrapper::* )( ::std::string const &,double ) )(&MultiLayer_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/MultiLayerDWBASimulation.pypp.cpp b/Core/PythonAPI/src/MultiLayerDWBASimulation.pypp.cpp
index 59ed7cdc6b9a4a7b29c17c63802a7246ac706244..195c03b8410adfddbc58f586e48dabd25ffd6e3f 100644
--- a/Core/PythonAPI/src/MultiLayerDWBASimulation.pypp.cpp
+++ b/Core/PythonAPI/src/MultiLayerDWBASimulation.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -91,7 +92,7 @@ struct MultiLayerDWBASimulation_wrapper : MultiLayerDWBASimulation, bp::wrapper<
return MultiLayerDWBASimulation::clone( );
}
- virtual void init( ::Simulation const& simulation ) {
+ virtual void init( ::Simulation const & simulation ) {
if( bp::override func_init = this->get_override( "init" ) )
func_init( boost::ref(simulation) );
else{
@@ -99,7 +100,7 @@ struct MultiLayerDWBASimulation_wrapper : MultiLayerDWBASimulation, bp::wrapper<
}
}
- void default_init( ::Simulation const& simulation ) {
+ void default_init( ::Simulation const & simulation ) {
MultiLayerDWBASimulation::init( boost::ref(simulation) );
}
@@ -115,7 +116,7 @@ struct MultiLayerDWBASimulation_wrapper : MultiLayerDWBASimulation, bp::wrapper<
MultiLayerDWBASimulation::run( );
}
- virtual void setThreadInfo( ::ThreadInfo const& thread_info ) {
+ virtual void setThreadInfo( ::ThreadInfo const & thread_info ) {
if( bp::override func_setThreadInfo = this->get_override( "setThreadInfo" ) )
func_setThreadInfo( boost::ref(thread_info) );
else{
@@ -123,7 +124,7 @@ struct MultiLayerDWBASimulation_wrapper : MultiLayerDWBASimulation, bp::wrapper<
}
}
- void default_setThreadInfo( ::ThreadInfo const& thread_info ) {
+ void default_setThreadInfo( ::ThreadInfo const & thread_info ) {
MultiLayerDWBASimulation::setThreadInfo( boost::ref(thread_info) );
}
@@ -139,8 +140,8 @@ void register_MultiLayerDWBASimulation_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"init"
- , (void ( ::MultiLayerDWBASimulation::* )( ::Simulation const& ) )(&::MultiLayerDWBASimulation::init)
- , (void ( MultiLayerDWBASimulation_wrapper::* )( ::Simulation const& ) )(&MultiLayerDWBASimulation_wrapper::default_init)
+ , (void ( ::MultiLayerDWBASimulation::* )( ::Simulation const & ) )(&::MultiLayerDWBASimulation::init)
+ , (void ( MultiLayerDWBASimulation_wrapper::* )( ::Simulation const & ) )(&MultiLayerDWBASimulation_wrapper::default_init)
, ( bp::arg("simulation") ) )
.def(
"run"
@@ -148,8 +149,8 @@ void register_MultiLayerDWBASimulation_class(){
, (void ( MultiLayerDWBASimulation_wrapper::* )( ) )(&MultiLayerDWBASimulation_wrapper::default_run) )
.def(
"setThreadInfo"
- , (void ( ::MultiLayerDWBASimulation::* )( ::ThreadInfo const& ) )(&::MultiLayerDWBASimulation::setThreadInfo)
- , (void ( MultiLayerDWBASimulation_wrapper::* )( ::ThreadInfo const& ) )(&MultiLayerDWBASimulation_wrapper::default_setThreadInfo)
+ , (void ( ::MultiLayerDWBASimulation::* )( ::ThreadInfo const & ) )(&::MultiLayerDWBASimulation::setThreadInfo)
+ , (void ( MultiLayerDWBASimulation_wrapper::* )( ::ThreadInfo const & ) )(&MultiLayerDWBASimulation_wrapper::default_setThreadInfo)
, ( bp::arg("thread_info") ) );
}
diff --git a/Core/PythonAPI/src/OpticalFresnel.pypp.cpp b/Core/PythonAPI/src/OpticalFresnel.pypp.cpp
index 41bd2aa1e0da927566db8cae74c2d647d416d4a4..10da17b6a8af361b10335a1624703a4983bceb55 100644
--- a/Core/PythonAPI/src/OpticalFresnel.pypp.cpp
+++ b/Core/PythonAPI/src/OpticalFresnel.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -120,42 +121,42 @@ void register_OpticalFresnel_class(){
bp::scope OpticalFresnel_scope( OpticalFresnel_exposer );
bp::class_< OpticalFresnel::FresnelCoeff >( "FresnelCoeff", bp::init< >() )
.def( bp::self == bp::self )
- .def_readwrite( "R",& OpticalFresnel::FresnelCoeff::R )
- .def_readwrite( "T",& OpticalFresnel::FresnelCoeff::T )
- .def_readwrite( "X",& OpticalFresnel::FresnelCoeff::X )
- .def_readwrite( "kz",& OpticalFresnel::FresnelCoeff::kz )
- .def_readwrite( "r",& OpticalFresnel::FresnelCoeff::r )
- .def_readwrite( "rb",& OpticalFresnel::FresnelCoeff::rb )
- .def_readwrite( "t",& OpticalFresnel::FresnelCoeff::t )
- .def_readwrite( "tb",& OpticalFresnel::FresnelCoeff::tb );
+ .def_readwrite( "R", &OpticalFresnel::FresnelCoeff::R )
+ .def_readwrite( "T", &OpticalFresnel::FresnelCoeff::T )
+ .def_readwrite( "X", &OpticalFresnel::FresnelCoeff::X )
+ .def_readwrite( "kz", &OpticalFresnel::FresnelCoeff::kz )
+ .def_readwrite( "r", &OpticalFresnel::FresnelCoeff::r )
+ .def_readwrite( "rb", &OpticalFresnel::FresnelCoeff::rb )
+ .def_readwrite( "t", &OpticalFresnel::FresnelCoeff::t )
+ .def_readwrite( "tb", &OpticalFresnel::FresnelCoeff::tb );
bp::class_< OpticalFresnel::MultiLayerCoeff >( "MultiLayerCoeff" )
.def(
"clear"
- , (void ( ::OpticalFresnel::MultiLayerCoeff::* )( ) )(& ::OpticalFresnel::MultiLayerCoeff::clear ) )
+ , (void ( ::OpticalFresnel::MultiLayerCoeff::* )( ) )( &::OpticalFresnel::MultiLayerCoeff::clear ) )
.def(
"__getitem__"
- , (::OpticalFresnel::FresnelCoeff& ( ::OpticalFresnel::MultiLayerCoeff::* )( ::size_t ) )(& ::OpticalFresnel::MultiLayerCoeff::operator[] )
+ , (::OpticalFresnel::FresnelCoeff & ( ::OpticalFresnel::MultiLayerCoeff::* )( ::size_t ) )( &::OpticalFresnel::MultiLayerCoeff::operator[] )
, ( bp::arg("i") )
, bp::return_internal_reference< >() )
.def(
"__getitem__"
- , (::OpticalFresnel::FresnelCoeff const& ( ::OpticalFresnel::MultiLayerCoeff::* )( ::size_t ) const)(& ::OpticalFresnel::MultiLayerCoeff::operator[] )
+ , (::OpticalFresnel::FresnelCoeff const & ( ::OpticalFresnel::MultiLayerCoeff::* )( ::size_t ) const)( &::OpticalFresnel::MultiLayerCoeff::operator[] )
, ( bp::arg("i") )
, bp::return_value_policy< bp::copy_const_reference >() )
.def(
"resize"
- , (void ( ::OpticalFresnel::MultiLayerCoeff::* )( ::size_t ) )(& ::OpticalFresnel::MultiLayerCoeff::resize )
+ , (void ( ::OpticalFresnel::MultiLayerCoeff::* )( ::size_t ) )( &::OpticalFresnel::MultiLayerCoeff::resize )
, ( bp::arg("size") ) )
.def(
"size"
- , (::size_t ( ::OpticalFresnel::MultiLayerCoeff::* )( ) const)(& ::OpticalFresnel::MultiLayerCoeff::size ) );
+ , (::size_t ( ::OpticalFresnel::MultiLayerCoeff::* )( ) const)( &::OpticalFresnel::MultiLayerCoeff::size ) );
{ //::OpticalFresnel::execute
- typedef void ( ::OpticalFresnel::*execute_function_type )( ::MultiLayer const& ,::kvector_t const& ,::OpticalFresnel::MultiLayerCoeff& ) ;
+ typedef void ( ::OpticalFresnel::*execute_function_type )( ::MultiLayer const &,::kvector_t const &,::OpticalFresnel::MultiLayerCoeff & ) ;
OpticalFresnel_exposer.def(
"execute"
- , execute_function_type(& ::OpticalFresnel::execute )
+ , execute_function_type( &::OpticalFresnel::execute )
, ( bp::arg("sample"), bp::arg("k"), bp::arg("coeff") ) );
}
diff --git a/Core/PythonAPI/src/ParameterPool.pypp.cpp b/Core/PythonAPI/src/ParameterPool.pypp.cpp
index c7b537f21b5ce71e9e5c49c65f754c64d2a79521..1e880dcebda6616d174cc7e3fdf286329db29be6 100644
--- a/Core/PythonAPI/src/ParameterPool.pypp.cpp
+++ b/Core/PythonAPI/src/ParameterPool.pypp.cpp
@@ -7,7 +7,6 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
-#include "__call_policies.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -60,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -99,10 +99,6 @@ struct ParameterPool_wrapper : ParameterPool, bp::wrapper< ParameterPool > {
return ParameterPool::clone( );
}
- static void registerParameter( ::ParameterPool& inst, ::std::string const& name, unsigned int parpointer ){
- inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
- }
-
};
void register_ParameterPool_class(){
@@ -110,11 +106,11 @@ void register_ParameterPool_class(){
bp::class_< ParameterPool_wrapper, bp::bases< ICloneable >, boost::noncopyable >( "ParameterPool", bp::init< >() )
.def(
"addParameter"
- , (bool ( ::ParameterPool::* )( ::std::string const& ,::RealParameterWrapper ) )(& ::ParameterPool::addParameter )
+ , (bool ( ::ParameterPool::* )( ::std::string const &,::RealParameterWrapper ) )( &::ParameterPool::addParameter )
, ( bp::arg("name"), bp::arg("par") ) )
.def(
"clear"
- , (void ( ::ParameterPool::* )( ) )(& ::ParameterPool::clear ) )
+ , (void ( ::ParameterPool::* )( ) )( &::ParameterPool::clear ) )
.def(
"clone"
, (::ParameterPool * ( ::ParameterPool::* )( ) const)(&::ParameterPool::clone)
@@ -122,32 +118,28 @@ void register_ParameterPool_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"cloneWithPrefix"
- , (::ParameterPool * ( ::ParameterPool::* )( ::std::string const& ) const)(& ::ParameterPool::cloneWithPrefix )
+ , (::ParameterPool * ( ::ParameterPool::* )( ::std::string const & ) const)( &::ParameterPool::cloneWithPrefix )
, ( bp::arg("prefix") )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"fixRatioBetweenParameters"
- , (int ( ::ParameterPool::* )( ::std::string const& ,::std::string const& ,double ) )(& ::ParameterPool::fixRatioBetweenParameters )
+ , (int ( ::ParameterPool::* )( ::std::string const &,::std::string const &,double ) )( &::ParameterPool::fixRatioBetweenParameters )
, ( bp::arg("to_change"), bp::arg("source"), bp::arg("ratio") ) )
.def(
"getParameter"
- , (::RealParameterWrapper ( ::ParameterPool::* )( ::std::string const& ) const)(& ::ParameterPool::getParameter )
+ , (::RealParameterWrapper ( ::ParameterPool::* )( ::std::string const & ) const)( &::ParameterPool::getParameter )
, ( bp::arg("name") ) )
- .def(
- "registerParameter"
- , (void (*)( ::ParameterPool& ,::std::string const& ,unsigned int ))(& ParameterPool_wrapper::registerParameter )
- , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setMatchedParametersValue"
- , (int ( ::ParameterPool::* )( ::std::string const& ,double ) )(& ::ParameterPool::setMatchedParametersValue )
+ , (int ( ::ParameterPool::* )( ::std::string const &,double ) )( &::ParameterPool::setMatchedParametersValue )
, ( bp::arg("wildcards"), bp::arg("value") ) )
.def(
"setParameterValue"
- , (bool ( ::ParameterPool::* )( ::std::string const& ,double ) )(& ::ParameterPool::setParameterValue )
+ , (bool ( ::ParameterPool::* )( ::std::string const &,double ) )( &::ParameterPool::setParameterValue )
, ( bp::arg("name"), bp::arg("value") ) )
.def(
"size"
- , (::size_t ( ::ParameterPool::* )( ) const)(& ::ParameterPool::size ) )
+ , (::size_t ( ::ParameterPool::* )( ) const)( &::ParameterPool::size ) )
.def( bp::self_ns::str( bp::self ) );
}
diff --git a/Core/PythonAPI/src/Particle.pypp.cpp b/Core/PythonAPI/src/Particle.pypp.cpp
index 118690af3b60e4e399d2acb64552ad77eb13bd6b..e391aad3ff9ba2b1305923bff7d4093cacca9964 100644
--- a/Core/PythonAPI/src/Particle.pypp.cpp
+++ b/Core/PythonAPI/src/Particle.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct Particle_wrapper : Particle, bp::wrapper< Particle > {
- Particle_wrapper(::complex_t const& refractive_index, ::IFormFactor const& form_factor )
+ Particle_wrapper(::complex_t const & refractive_index, ::IFormFactor const & form_factor )
: Particle( boost::ref(refractive_index), boost::ref(form_factor) )
, bp::wrapper< Particle >(){
// constructor
@@ -170,6 +173,18 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -230,6 +245,37 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< Particle_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -258,7 +304,7 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
void register_Particle_class(){
- bp::class_< Particle_wrapper, bp::bases< ICompositeSample >, boost::noncopyable >( "Particle", bp::init< complex_t const& , IFormFactor const& >(( bp::arg("refractive_index"), bp::arg("form_factor") )) )
+ bp::class_< Particle_wrapper, bp::bases< ICompositeSample >, boost::noncopyable >( "Particle", bp::init< complex_t const &, IFormFactor const & >(( bp::arg("refractive_index"), bp::arg("form_factor") )) )
.def(
"clone"
, (::Particle * ( ::Particle::* )( ) const)(&::Particle::clone)
@@ -291,6 +337,10 @@ void register_Particle_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( Particle_wrapper::* )( ) )(&Particle_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( Particle_wrapper::* )( ) )(&Particle_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -314,6 +364,15 @@ void register_Particle_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( Particle_wrapper::* )( ) )(&Particle_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &Particle_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( Particle_wrapper::* )( ::std::string const &,double ) )(&Particle_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/ParticleBuilder.pypp.cpp b/Core/PythonAPI/src/ParticleBuilder.pypp.cpp
index 0023d4e72cb20db77f403809706e1cc50a8cbfb1..417b5d0b1c7623ad0a3326aa7e49ae5b687a93bc 100644
--- a/Core/PythonAPI/src/ParticleBuilder.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleBuilder.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -82,11 +83,11 @@ void register_ParticleBuilder_class(){
bp::class_< ParticleBuilder >( "ParticleBuilder", bp::init< >() )
.def(
"plantParticles"
- , (void ( ::ParticleBuilder::* )( ::ParticleDecoration& ) )(& ::ParticleBuilder::plantParticles )
+ , (void ( ::ParticleBuilder::* )( ::ParticleDecoration & ) )( &::ParticleBuilder::plantParticles )
, ( bp::arg("decor") ) )
.def(
"setPrototype"
- , (void ( ::ParticleBuilder::* )( ::Particle const& ,::std::string,::StochasticParameter< double > const& ,double ) )(& ::ParticleBuilder::setPrototype )
+ , (void ( ::ParticleBuilder::* )( ::Particle const &,::std::string,::StochasticParameter< double > const &,double ) )( &::ParticleBuilder::setPrototype )
, ( bp::arg("particle"), bp::arg("name"), bp::arg("param"), bp::arg("scale")=1.0e+0 ) );
}
diff --git a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
index 0af1d3c0c0c0af00e83660a14e9c05ab1bdb1a26..2d6616b4d79c9e49d7f3bdc76d784db9586fd25f 100644
--- a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreShell > {
- ParticleCoreShell_wrapper(::Particle const& shell, ::Particle const& core, ::kvector_t relative_core_position )
+ ParticleCoreShell_wrapper(::Particle const & shell, ::Particle const & core, ::kvector_t relative_core_position )
: ParticleCoreShell( boost::ref(shell), boost::ref(core), relative_core_position )
, bp::wrapper< ParticleCoreShell >(){
// constructor
@@ -98,6 +101,18 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::IFormFactor * createFormFactor( ) const {
if( bp::override func_createFormFactor = this->get_override( "createFormFactor" ) )
return func_createFormFactor( );
@@ -194,6 +209,25 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< ParticleCoreShell_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
virtual void setAmbientRefractiveIndex( ::complex_t refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( refractive_index );
@@ -206,6 +240,18 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
Particle::setAmbientRefractiveIndex( refractive_index );
}
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -234,11 +280,15 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
void register_ParticleCoreShell_class(){
- bp::class_< ParticleCoreShell_wrapper, bp::bases< Particle >, boost::noncopyable >( "ParticleCoreShell", bp::init< Particle const& , Particle const& , kvector_t >(( bp::arg("shell"), bp::arg("core"), bp::arg("relative_core_position") )) )
+ bp::class_< ParticleCoreShell_wrapper, bp::bases< Particle >, boost::noncopyable >( "ParticleCoreShell", bp::init< Particle const &, Particle const &, kvector_t >(( bp::arg("shell"), bp::arg("core"), bp::arg("relative_core_position") )) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( ParticleCoreShell_wrapper::* )( ) )(&ParticleCoreShell_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( ParticleCoreShell_wrapper::* )( ) )(&ParticleCoreShell_wrapper::default_clearParameterPool) )
.def(
"createFormFactor"
, (::IFormFactor * ( ::Particle::* )( ) const)(&::Particle::createFormFactor)
@@ -275,11 +325,20 @@ void register_ParticleCoreShell_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( ParticleCoreShell_wrapper::* )( ) )(&ParticleCoreShell_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &ParticleCoreShell_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
.def(
"setAmbientRefractiveIndex"
, (void ( ::Particle::* )( ::complex_t ) )(&::Particle::setAmbientRefractiveIndex)
, (void ( ParticleCoreShell_wrapper::* )( ::complex_t ) )(&ParticleCoreShell_wrapper::default_setAmbientRefractiveIndex)
, ( bp::arg("refractive_index") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( ParticleCoreShell_wrapper::* )( ::std::string const &,double ) )(&ParticleCoreShell_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
index 0bad8edc61026bd8cd4c4b8017a7f52c4bdd1ece..46bd3e5711b387d795bc0a786cd5da69d4e057a5 100644
--- a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -170,6 +173,18 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -230,6 +245,37 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< ParticleDecoration_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -261,19 +307,19 @@ void register_ParticleDecoration_class(){
bp::class_< ParticleDecoration_wrapper, bp::bases< IDecoration >, boost::noncopyable >( "ParticleDecoration", bp::init< >() )
.def(
"addInterferenceFunction"
- , (void ( ::ParticleDecoration::* )( ::IInterferenceFunction const& ) )(& ::ParticleDecoration::addInterferenceFunction )
+ , (void ( ::ParticleDecoration::* )( ::IInterferenceFunction const & ) )( &::ParticleDecoration::addInterferenceFunction )
, ( bp::arg("interference_function") ) )
.def(
"addParticle"
- , (void ( ::ParticleDecoration::* )( ::Particle const& ,::Geometry::Transform3D const& ,double,double ) )(& ::ParticleDecoration::addParticle )
+ , (void ( ::ParticleDecoration::* )( ::Particle const &,::Geometry::Transform3D const &,double,double ) )( &::ParticleDecoration::addParticle )
, ( bp::arg("particle"), bp::arg("transform"), bp::arg("depth")=0, bp::arg("abundance")=1.0e+0 ) )
.def(
"addParticle"
- , (void ( ::ParticleDecoration::* )( ::Particle const& ,double,double ) )(& ::ParticleDecoration::addParticle )
+ , (void ( ::ParticleDecoration::* )( ::Particle const &,double,double ) )( &::ParticleDecoration::addParticle )
, ( bp::arg("particle"), bp::arg("depth")=0.0, bp::arg("abundance")=1.0e+0 ) )
.def(
"addParticleInfo"
- , (void ( ::ParticleDecoration::* )( ::ParticleInfo const& ) )(& ::ParticleDecoration::addParticleInfo )
+ , (void ( ::ParticleDecoration::* )( ::ParticleInfo const & ) )( &::ParticleDecoration::addParticleInfo )
, ( bp::arg("info") ) )
.def(
"clone"
@@ -287,7 +333,7 @@ void register_ParticleDecoration_class(){
, ( bp::arg("index") ) )
.def(
"getInterferenceFunction"
- , (::IInterferenceFunction const * ( ::ParticleDecoration::* )( ::size_t ) const)(& ::ParticleDecoration::getInterferenceFunction )
+ , (::IInterferenceFunction const * ( ::ParticleDecoration::* )( ::size_t ) const)( &::ParticleDecoration::getInterferenceFunction )
, ( bp::arg("index") )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
@@ -312,6 +358,10 @@ void register_ParticleDecoration_class(){
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( ParticleDecoration_wrapper::* )( ) )(&ParticleDecoration_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( ParticleDecoration_wrapper::* )( ) )(&ParticleDecoration_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -335,6 +385,15 @@ void register_ParticleDecoration_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( ParticleDecoration_wrapper::* )( ) )(&ParticleDecoration_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &ParticleDecoration_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( ParticleDecoration_wrapper::* )( ::std::string const &,double ) )(&ParticleDecoration_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/ParticleInfo.pypp.cpp b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
index a45cb983574eec43c49a9a92d0160d2987126e6d..e8ca0053e6567d5bc7c4a5eae86c744854f0eab0 100644
--- a/Core/PythonAPI/src/ParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +82,7 @@ namespace bp = boost::python;
struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
- ParticleInfo_wrapper(::Particle const& p_particle, ::Geometry::Transform3D const& transform, double depth=0, double abundance=0 )
+ ParticleInfo_wrapper(::Particle const & p_particle, ::Geometry::Transform3D const & transform, double depth=0, double abundance=0 )
: ParticleInfo( boost::ref(p_particle), boost::ref(transform), depth, abundance )
, bp::wrapper< ParticleInfo >(){
// constructor
@@ -110,6 +113,18 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -170,6 +185,37 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< ParticleInfo_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -198,7 +244,7 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
void register_ParticleInfo_class(){
- bp::class_< ParticleInfo_wrapper, bp::bases< ICompositeSample >, boost::noncopyable >( "ParticleInfo", bp::init< Particle const& , Geometry::Transform3D const& , bp::optional< double, double > >(( bp::arg("p_particle"), bp::arg("transform"), bp::arg("depth")=0, bp::arg("abundance")=0 )) )
+ bp::class_< ParticleInfo_wrapper, bp::bases< ICompositeSample >, boost::noncopyable >( "ParticleInfo", bp::init< Particle const &, Geometry::Transform3D const &, bp::optional< double, double > >(( bp::arg("p_particle"), bp::arg("transform"), bp::arg("depth")=0, bp::arg("abundance")=0 )) )
.def(
"clone"
, (::ParticleInfo * ( ::ParticleInfo::* )( ) const)(&::ParticleInfo::clone)
@@ -206,34 +252,38 @@ void register_ParticleInfo_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"getAbundance"
- , (double ( ::ParticleInfo::* )( ) const)(& ::ParticleInfo::getAbundance ) )
+ , (double ( ::ParticleInfo::* )( ) const)( &::ParticleInfo::getAbundance ) )
.def(
"getDepth"
- , (double ( ::ParticleInfo::* )( ) const)(& ::ParticleInfo::getDepth ) )
+ , (double ( ::ParticleInfo::* )( ) const)( &::ParticleInfo::getDepth ) )
.def(
"getParticle"
- , (::Particle const * ( ::ParticleInfo::* )( ) const)(& ::ParticleInfo::getParticle )
+ , (::Particle const * ( ::ParticleInfo::* )( ) const)( &::ParticleInfo::getParticle )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getTransform3D"
- , (::Geometry::Transform3D const * ( ::ParticleInfo::* )( ) const)(& ::ParticleInfo::getTransform3D )
+ , (::Geometry::Transform3D const * ( ::ParticleInfo::* )( ) const)( &::ParticleInfo::getTransform3D )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"setAbundance"
- , (void ( ::ParticleInfo::* )( double ) )(& ::ParticleInfo::setAbundance )
+ , (void ( ::ParticleInfo::* )( double ) )( &::ParticleInfo::setAbundance )
, ( bp::arg("abundance") ) )
.def(
"setDepth"
- , (void ( ::ParticleInfo::* )( double ) )(& ::ParticleInfo::setDepth )
+ , (void ( ::ParticleInfo::* )( double ) )( &::ParticleInfo::setDepth )
, ( bp::arg("depth") ) )
.def(
"setTransform"
- , (void ( ::ParticleInfo::* )( ::Geometry::Transform3D const& ) )(& ::ParticleInfo::setTransform )
+ , (void ( ::ParticleInfo::* )( ::Geometry::Transform3D const & ) )( &::ParticleInfo::setTransform )
, ( bp::arg("transform") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( ParticleInfo_wrapper::* )( ) )(&ParticleInfo_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( ParticleInfo_wrapper::* )( ) )(&ParticleInfo_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -257,6 +307,15 @@ void register_ParticleInfo_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( ParticleInfo_wrapper::* )( ) )(&ParticleInfo_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &ParticleInfo_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( ParticleInfo_wrapper::* )( ::std::string const &,double ) )(&ParticleInfo_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
index aeef9d4912f580e1f6b1c8b48e25348a41ee8a1c..1f0a53eda70109a424cb016e2420e31d339382ba 100644
--- a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,14 +82,14 @@ namespace bp = boost::python;
struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< PositionParticleInfo > {
- PositionParticleInfo_wrapper(::Particle const& particle, ::Geometry::Transform3D const& transform, ::kvector_t position, double abundance=0 )
+ PositionParticleInfo_wrapper(::Particle const & particle, ::Geometry::Transform3D const & transform, ::kvector_t position, double abundance=0 )
: PositionParticleInfo( boost::ref(particle), boost::ref(transform), position, abundance )
, bp::wrapper< PositionParticleInfo >(){
// constructor
}
- PositionParticleInfo_wrapper(::Particle const& particle, ::kvector_t position, double abundance=0 )
+ PositionParticleInfo_wrapper(::Particle const & particle, ::kvector_t position, double abundance=0 )
: PositionParticleInfo( boost::ref(particle), position, abundance )
, bp::wrapper< PositionParticleInfo >(){
// constructor
@@ -117,6 +120,18 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -177,6 +192,37 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
ISample::print_structure( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< PositionParticleInfo_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -205,8 +251,8 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
void register_PositionParticleInfo_class(){
- bp::class_< PositionParticleInfo_wrapper, bp::bases< ParticleInfo >, boost::noncopyable >( "PositionParticleInfo", bp::init< Particle const& , Geometry::Transform3D const& , kvector_t, bp::optional< double > >(( bp::arg("particle"), bp::arg("transform"), bp::arg("position"), bp::arg("abundance")=0 )) )
- .def( bp::init< Particle const& , kvector_t, bp::optional< double > >(( bp::arg("particle"), bp::arg("position"), bp::arg("abundance")=0 )) )
+ bp::class_< PositionParticleInfo_wrapper, bp::bases< ParticleInfo >, boost::noncopyable >( "PositionParticleInfo", bp::init< Particle const &, Geometry::Transform3D const &, kvector_t, bp::optional< double > >(( bp::arg("particle"), bp::arg("transform"), bp::arg("position"), bp::arg("abundance")=0 )) )
+ .def( bp::init< Particle const &, kvector_t, bp::optional< double > >(( bp::arg("particle"), bp::arg("position"), bp::arg("abundance")=0 )) )
.def(
"clone"
, (::PositionParticleInfo * ( ::PositionParticleInfo::* )( ) const)(&::PositionParticleInfo::clone)
@@ -214,19 +260,23 @@ void register_PositionParticleInfo_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"getParticle"
- , (::Particle const * ( ::PositionParticleInfo::* )( ) const)(& ::PositionParticleInfo::getParticle )
+ , (::Particle const * ( ::PositionParticleInfo::* )( ) const)( &::PositionParticleInfo::getParticle )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getPosition"
- , (::kvector_t ( ::PositionParticleInfo::* )( ) const)(& ::PositionParticleInfo::getPosition ) )
+ , (::kvector_t ( ::PositionParticleInfo::* )( ) const)( &::PositionParticleInfo::getPosition ) )
.def(
"setPosition"
- , (void ( ::PositionParticleInfo::* )( ::kvector_t ) )(& ::PositionParticleInfo::setPosition )
+ , (void ( ::PositionParticleInfo::* )( ::kvector_t ) )( &::PositionParticleInfo::setPosition )
, ( bp::arg("position") ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( PositionParticleInfo_wrapper::* )( ) )(&PositionParticleInfo_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( PositionParticleInfo_wrapper::* )( ) )(&PositionParticleInfo_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -250,6 +300,15 @@ void register_PositionParticleInfo_class(){
"print_structure"
, (void ( ::ISample::* )( ) )(&::ISample::print_structure)
, (void ( PositionParticleInfo_wrapper::* )( ) )(&PositionParticleInfo_wrapper::default_print_structure) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &PositionParticleInfo_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( PositionParticleInfo_wrapper::* )( ::std::string const &,double ) )(&PositionParticleInfo_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp b/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp
index c5e7d3c48254e07f7abd10cc83c43beaf6660eb8..e309df25b94ebb48d9f41629f887aa2d65e0b4fc 100644
--- a/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp
+++ b/Core/PythonAPI/src/PythonInterface_free_functions.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -81,33 +82,33 @@ void register_free_functions(){
{ //::GetOutputData
- typedef ::PyObject * ( *GetOutputData_function_type )( ::Simulation const& );
+ typedef ::PyObject * ( *GetOutputData_function_type )( ::Simulation const & );
bp::def(
"GetOutputData"
- , GetOutputData_function_type(& ::GetOutputData )
+ , GetOutputData_function_type( &::GetOutputData )
, ( bp::arg("simulation") ) );
}
{ //::GetOutputDataAxis
- typedef ::PyObject * ( *GetOutputDataAxis_function_type )( ::Simulation const& ,int );
+ typedef ::PyObject * ( *GetOutputDataAxis_function_type )( ::Simulation const &,int );
bp::def(
"GetOutputDataAxis"
- , GetOutputDataAxis_function_type(& ::GetOutputDataAxis )
+ , GetOutputDataAxis_function_type( &::GetOutputDataAxis )
, ( bp::arg("simulation"), bp::arg("naxis") ) );
}
{ //::GetOutputDataNdimensions
- typedef int ( *GetOutputDataNdimensions_function_type )( ::Simulation const& );
+ typedef int ( *GetOutputDataNdimensions_function_type )( ::Simulation const & );
bp::def(
"GetOutputDataNdimensions"
- , GetOutputDataNdimensions_function_type(& ::GetOutputDataNdimensions )
+ , GetOutputDataNdimensions_function_type( &::GetOutputDataNdimensions )
, ( bp::arg("simulation") ) );
}
@@ -118,7 +119,7 @@ void register_free_functions(){
bp::def(
"deg2rad"
- , deg2rad_function_type(& ::Units::deg2rad )
+ , deg2rad_function_type( &::Units::deg2rad )
, ( bp::arg("angle") ) );
}
@@ -129,7 +130,7 @@ void register_free_functions(){
bp::def(
"rad2deg"
- , rad2deg_function_type(& ::Units::rad2deg )
+ , rad2deg_function_type( &::Units::rad2deg )
, ( bp::arg("angle") ) );
}
diff --git a/Core/PythonAPI/src/PythonInterface_global_variables.pypp.cpp b/Core/PythonAPI/src/PythonInterface_global_variables.pypp.cpp
index 2cf0a1550aafd89e30a8c9f81294dcf627222d41..88751139b12a6a96e7df1cf61a8c418edb3c541f 100644
--- a/Core/PythonAPI/src/PythonInterface_global_variables.pypp.cpp
+++ b/Core/PythonAPI/src/PythonInterface_global_variables.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index 5b6622e081fddc0ab46c71a1e902318aea4e0e3d..06fff0c3947ac2bd4859fe7128d9b2f2e9bad3be 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -59,6 +59,7 @@
#include "MesoCrystal.pypp.h"
#include "MultiLayer.pypp.h"
#include "MultiLayerDWBASimulation.pypp.h"
+#include "ndimdata_t.pypp.h"
#include "OpticalFresnel.pypp.h"
#include "ParameterPool.pypp.h"
#include "Particle.pypp.h"
@@ -85,13 +86,18 @@
#include "vdouble1d_t.pypp.h"
#include "vector_DiffuseParticleInfoPtr_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"
#include "PythonListConverter.h"
BOOST_PYTHON_MODULE(libBornAgainCore){
+ register_vector_longinteger_t_class();
+ register_vector_integer_t_class();
register_vdouble1d_t_class();
register_vector_IFormFactorPtr_t_class();
register_vector_kvector_t_class();
@@ -160,6 +166,7 @@ BOOST_PYTHON_MODULE(libBornAgainCore){
register_MultiLayer_class();
register_MultiLayerDWBASimulation_class();
register_OpticalFresnel_class();
+ register_ndimdata_t_class();
register_ParameterPool_class();
register_ParticleBuilder_class();
register_ParticleCoreShell_class();
diff --git a/Core/PythonAPI/src/RealParameterWrapper.pypp.cpp b/Core/PythonAPI/src/RealParameterWrapper.pypp.cpp
index c27be0f45b8faab8424290a8c6d93aa4a8558adb..f72148fcd4a1786004ec4ce42061b355543ab9a3 100644
--- a/Core/PythonAPI/src/RealParameterWrapper.pypp.cpp
+++ b/Core/PythonAPI/src/RealParameterWrapper.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -83,14 +84,14 @@ void register_RealParameterWrapper_class(){
typedef bp::class_< RealParameterWrapper > RealParameterWrapper_exposer_t;
RealParameterWrapper_exposer_t RealParameterWrapper_exposer = RealParameterWrapper_exposer_t( "RealParameterWrapper", bp::no_init );
bp::scope RealParameterWrapper_scope( RealParameterWrapper_exposer );
- RealParameterWrapper_exposer.def( bp::init< RealParameterWrapper const& >(( bp::arg("other") )) );
+ RealParameterWrapper_exposer.def( bp::init< RealParameterWrapper const & >(( bp::arg("other") )) );
{ //::RealParameterWrapper::getValue
typedef double ( ::RealParameterWrapper::*getValue_function_type )( ) const;
RealParameterWrapper_exposer.def(
"getValue"
- , getValue_function_type(& ::RealParameterWrapper::getValue ) );
+ , getValue_function_type( &::RealParameterWrapper::getValue ) );
}
{ //::RealParameterWrapper::isNull
@@ -99,16 +100,16 @@ void register_RealParameterWrapper_class(){
RealParameterWrapper_exposer.def(
"isNull"
- , isNull_function_type(& ::RealParameterWrapper::isNull ) );
+ , isNull_function_type( &::RealParameterWrapper::isNull ) );
}
{ //::RealParameterWrapper::operator=
- typedef ::RealParameterWrapper& ( ::RealParameterWrapper::*assign_function_type )( ::RealParameterWrapper const& ) ;
+ typedef ::RealParameterWrapper & ( ::RealParameterWrapper::*assign_function_type )( ::RealParameterWrapper const & ) ;
RealParameterWrapper_exposer.def(
"assign"
- , assign_function_type(& ::RealParameterWrapper::operator= )
+ , assign_function_type( &::RealParameterWrapper::operator= )
, ( bp::arg("other") )
, bp::return_self< >() );
@@ -119,7 +120,7 @@ void register_RealParameterWrapper_class(){
RealParameterWrapper_exposer.def(
"setValue"
- , setValue_function_type(& ::RealParameterWrapper::setValue )
+ , setValue_function_type( &::RealParameterWrapper::setValue )
, ( bp::arg("value") ) );
}
diff --git a/Core/PythonAPI/src/Rotate3D.pypp.cpp b/Core/PythonAPI/src/Rotate3D.pypp.cpp
index 462004dcfae120b33d796e485538fbe5bab7ec7e..e6f16cf21963a641b859c78400cc6d2356481026 100644
--- a/Core/PythonAPI/src/Rotate3D.pypp.cpp
+++ b/Core/PythonAPI/src/Rotate3D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/RotateX3D.pypp.cpp b/Core/PythonAPI/src/RotateX3D.pypp.cpp
index e9c39c71cd0cd70ec7581865ffcaf76217641f2f..94b8401e1bd5121124875ffef398e9281d679d8b 100644
--- a/Core/PythonAPI/src/RotateX3D.pypp.cpp
+++ b/Core/PythonAPI/src/RotateX3D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/RotateY3D.pypp.cpp b/Core/PythonAPI/src/RotateY3D.pypp.cpp
index ef7cd013a1d289c1b7a44ae75479601d5ea91006..41c1a1bfc6ecf4610179f18cffdae1e8e6b16fc8 100644
--- a/Core/PythonAPI/src/RotateY3D.pypp.cpp
+++ b/Core/PythonAPI/src/RotateY3D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/RotateZ3D.pypp.cpp b/Core/PythonAPI/src/RotateZ3D.pypp.cpp
index f4aef3aaeac4d7018352b58f7180d0e63a382ddf..adbd5e3fd38a62418519c73a353e980f15d92d90 100644
--- a/Core/PythonAPI/src/RotateZ3D.pypp.cpp
+++ b/Core/PythonAPI/src/RotateZ3D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
index 6012114da47ca211ab1fc454757dccf6356792d5..80b83db696ff42b9656012a42bce9b28f373aefc 100644
--- a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
+++ b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,7 +80,7 @@ namespace bp = boost::python;
struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSelectionRule > {
- SimpleSelectionRule_wrapper(SimpleSelectionRule const& arg )
+ SimpleSelectionRule_wrapper(SimpleSelectionRule const & arg )
: SimpleSelectionRule( arg )
, bp::wrapper< SimpleSelectionRule >(){
// copy constructor
@@ -105,7 +106,7 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
return SimpleSelectionRule::clone( );
}
- virtual bool coordinateSelected( ::IndexVector3D const& coordinate ) const {
+ virtual bool coordinateSelected( ::IndexVector3D const & coordinate ) const {
if( bp::override func_coordinateSelected = this->get_override( "coordinateSelected" ) )
return func_coordinateSelected( boost::ref(coordinate) );
else{
@@ -113,7 +114,7 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
}
}
- bool default_coordinateSelected( ::IndexVector3D const& coordinate ) const {
+ bool default_coordinateSelected( ::IndexVector3D const & coordinate ) const {
return SimpleSelectionRule::coordinateSelected( boost::ref(coordinate) );
}
@@ -129,8 +130,8 @@ void register_SimpleSelectionRule_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"coordinateSelected"
- , (bool ( ::SimpleSelectionRule::* )( ::IndexVector3D const& ) const)(&::SimpleSelectionRule::coordinateSelected)
- , (bool ( SimpleSelectionRule_wrapper::* )( ::IndexVector3D const& ) const)(&SimpleSelectionRule_wrapper::default_coordinateSelected)
+ , (bool ( ::SimpleSelectionRule::* )( ::IndexVector3D const & ) const)(&::SimpleSelectionRule::coordinateSelected)
+ , (bool ( SimpleSelectionRule_wrapper::* )( ::IndexVector3D const & ) const)(&SimpleSelectionRule_wrapper::default_coordinateSelected)
, ( bp::arg("coordinate") ) );
}
diff --git a/Core/PythonAPI/src/Simulation.pypp.cpp b/Core/PythonAPI/src/Simulation.pypp.cpp
index 19e991b8e60f2e7ade472b02f59d58380a77c6de..0f59343514b8812690747a2aacfaecfabc4474c4 100644
--- a/Core/PythonAPI/src/Simulation.pypp.cpp
+++ b/Core/PythonAPI/src/Simulation.pypp.cpp
@@ -7,6 +7,8 @@ GCC_DIAG_OFF(missing-field-initializers);
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
GCC_DIAG_ON(unused-parameter);
GCC_DIAG_ON(missing-field-initializers);
+#include "__call_policies.pypp.hpp"
+#include "__convenience.pypp.hpp"
#include "BasicVector3D.h"
#include "Bin.h"
#include "Crystal.h"
@@ -59,6 +61,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -110,6 +113,18 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
return IParameterized::areParametersChanged( );
}
+ virtual void clearParameterPool( ) {
+ if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
+ func_clearParameterPool( );
+ else{
+ this->IParameterized::clearParameterPool( );
+ }
+ }
+
+ void default_clearParameterPool( ) {
+ IParameterized::clearParameterPool( );
+ }
+
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
@@ -134,6 +149,37 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
IParameterized::printParameters( );
}
+ virtual void registerParameter( ::std::string const & name, double * parpointer ) {
+ namespace bpl = boost::python;
+ if( bpl::override func_registerParameter = this->get_override( "registerParameter" ) ){
+ bpl::object py_result = bpl::call<bpl::object>( func_registerParameter.ptr(), name, parpointer );
+ }
+ else{
+ IParameterized::registerParameter( name, parpointer );
+ }
+ }
+
+ static void default_registerParameter( ::IParameterized & inst, ::std::string const & name, long unsigned int parpointer ){
+ if( dynamic_cast< Simulation_wrapper * >( boost::addressof( inst ) ) ){
+ inst.::IParameterized::registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ else{
+ inst.registerParameter(name, reinterpret_cast< double * >( parpointer ));
+ }
+ }
+
+ virtual bool setParameterValue( ::std::string const & name, double value ) {
+ if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
+ return func_setParameterValue( name, value );
+ else{
+ return this->IParameterized::setParameterValue( name, value );
+ }
+ }
+
+ bool default_setParameterValue( ::std::string const & name, double value ) {
+ return IParameterized::setParameterValue( name, value );
+ }
+
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
@@ -162,11 +208,11 @@ void register_Simulation_class(){
, bp::return_value_policy< bp::copy_const_reference >() )
.def(
"getOutputData"
- , (::OutputData< double > const * ( ::Simulation::* )( ) const)(& ::Simulation::getOutputData )
+ , (::OutputData< double > const * ( ::Simulation::* )( ) const)( &::Simulation::getOutputData )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getOutputDataClone"
- , (::OutputData< double > * ( ::Simulation::* )( ) const)(& ::Simulation::getOutputDataClone )
+ , (::OutputData< double > * ( ::Simulation::* )( ) const)( &::Simulation::getOutputDataClone )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getSample"
@@ -174,59 +220,67 @@ void register_Simulation_class(){
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getSimulationParameters"
- , (::SimulationParameters ( ::Simulation::* )( ) const)(& ::Simulation::getSimulationParameters ) )
+ , (::SimulationParameters ( ::Simulation::* )( ) const)( &::Simulation::getSimulationParameters ) )
.def(
"normalize"
- , (void ( ::Simulation::* )( ) )(& ::Simulation::normalize ) )
+ , (void ( ::Simulation::* )( ) )( &::Simulation::normalize ) )
.def(
"prepareSimulation"
- , (void ( ::Simulation::* )( ) )(& ::Simulation::prepareSimulation ) )
+ , (void ( ::Simulation::* )( ) )( &::Simulation::prepareSimulation ) )
.def(
"runSimulation"
- , (void ( ::Simulation::* )( ) )(& ::Simulation::runSimulation ) )
+ , (void ( ::Simulation::* )( ) )( &::Simulation::runSimulation ) )
.def(
"runSimulationElement"
- , (void ( ::Simulation::* )( ::size_t ) )(& ::Simulation::runSimulationElement )
+ , (void ( ::Simulation::* )( ::size_t ) )( &::Simulation::runSimulationElement )
, ( bp::arg("index") ) )
.def(
"setBeamIntensity"
- , (void ( ::Simulation::* )( double ) )(& ::Simulation::setBeamIntensity )
+ , (void ( ::Simulation::* )( double ) )( &::Simulation::setBeamIntensity )
, ( bp::arg("intensity") ) )
.def(
"setBeamParameters"
- , (void ( ::Simulation::* )( double,double,double ) )(& ::Simulation::setBeamParameters )
+ , (void ( ::Simulation::* )( double,double,double ) )( &::Simulation::setBeamParameters )
, ( bp::arg("lambda"), bp::arg("alpha_i"), bp::arg("phi_i") ) )
.def(
"setDetectorParameters"
- , (void ( ::Simulation::* )( ::OutputData< double > const& ) )(& ::Simulation::setDetectorParameters )
+ , (void ( ::Simulation::* )( ::OutputData< double > const & ) )( &::Simulation::setDetectorParameters )
, ( bp::arg("output_data") ) )
.def(
"setDetectorParameters"
- , (void ( ::Simulation::* )( ::size_t,double,double,::size_t,double,double,bool ) )(& ::Simulation::setDetectorParameters )
+ , (void ( ::Simulation::* )( ::size_t,double,double,::size_t,double,double,bool ) )( &::Simulation::setDetectorParameters )
, ( bp::arg("n_phi"), bp::arg("phi_f_min"), bp::arg("phi_f_max"), bp::arg("n_alpha"), bp::arg("alpha_f_min"), bp::arg("alpha_f_max"), bp::arg("isgisaxs_style")=(bool)(false) ) )
.def(
"setDetectorParameters"
- , (void ( ::Simulation::* )( ::DetectorParameters const& ) )(& ::Simulation::setDetectorParameters )
+ , (void ( ::Simulation::* )( ::DetectorParameters const & ) )( &::Simulation::setDetectorParameters )
, ( bp::arg("params") ) )
.def(
"setInstrument"
- , (void ( ::Simulation::* )( ::Instrument const& ) )(& ::Simulation::setInstrument )
+ , (void ( ::Simulation::* )( ::Instrument const & ) )( &::Simulation::setInstrument )
, ( bp::arg("instrument") ) )
.def(
"setSample"
- , (void ( ::Simulation::* )( ::ISample const& ) )(& ::Simulation::setSample )
+ , (void ( ::Simulation::* )( ::ISample const & ) )( &::Simulation::setSample )
, ( bp::arg("sample") ) )
+ .def(
+ "setSampleBuilder"
+ , (void ( ::Simulation::* )( ::ISampleBuilder const * ) )( &::Simulation::setSampleBuilder )
+ , ( bp::arg("p_sample_builder") ) )
.def(
"setSimulationParameters"
- , (void ( ::Simulation::* )( ::SimulationParameters const& ) )(& ::Simulation::setSimulationParameters )
+ , (void ( ::Simulation::* )( ::SimulationParameters const & ) )( &::Simulation::setSimulationParameters )
, ( bp::arg("sim_params") ) )
.def(
"smearIntensityFromZAxisTilting"
- , (void ( ::Simulation::* )( ) )(& ::Simulation::smearIntensityFromZAxisTilting ) )
+ , (void ( ::Simulation::* )( ) )( &::Simulation::smearIntensityFromZAxisTilting ) )
.def(
"areParametersChanged"
, (bool ( ::IParameterized::* )( ) )(&::IParameterized::areParametersChanged)
, (bool ( Simulation_wrapper::* )( ) )(&Simulation_wrapper::default_areParametersChanged) )
+ .def(
+ "clearParameterPool"
+ , (void ( ::IParameterized::* )( ) )(&::IParameterized::clearParameterPool)
+ , (void ( Simulation_wrapper::* )( ) )(&Simulation_wrapper::default_clearParameterPool) )
.def(
"createParameterTree"
, (::ParameterPool * ( ::IParameterized::* )( ) const)(&::IParameterized::createParameterTree)
@@ -236,6 +290,15 @@ void register_Simulation_class(){
"printParameters"
, (void ( ::IParameterized::* )( ) const)(&::IParameterized::printParameters)
, (void ( Simulation_wrapper::* )( ) const)(&Simulation_wrapper::default_printParameters) )
+ .def(
+ "registerParameter"
+ , (void (*)( ::IParameterized &,::std::string const &,long unsigned int ))( &Simulation_wrapper::default_registerParameter )
+ , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) )
+ .def(
+ "setParameterValue"
+ , (bool ( ::IParameterized::* )( ::std::string const &,double ) )(&::IParameterized::setParameterValue)
+ , (bool ( Simulation_wrapper::* )( ::std::string const &,double ) )(&Simulation_wrapper::default_setParameterValue)
+ , ( bp::arg("name"), bp::arg("value") ) )
.def(
"setParametersAreChanged"
, (void ( ::IParameterized::* )( ) )(&::IParameterized::setParametersAreChanged)
diff --git a/Core/PythonAPI/src/SimulationParameters.pypp.cpp b/Core/PythonAPI/src/SimulationParameters.pypp.cpp
index d2e898ba7fdbad0973a3f37f54aa05acbafd9f33..07f6b1629f3b40958f8d0fc18188fa12aa71b3df 100644
--- a/Core/PythonAPI/src/SimulationParameters.pypp.cpp
+++ b/Core/PythonAPI/src/SimulationParameters.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -102,9 +103,9 @@ void register_SimulationParameters_class(){
.value("PARA1DFINITE", SimulationParameters::PARA1DFINITE)
.export_values()
;
- SimulationParameters_exposer.def_readwrite( "me_framework",& SimulationParameters::me_framework );
- SimulationParameters_exposer.def_readwrite( "me_if_approx",& SimulationParameters::me_if_approx );
- SimulationParameters_exposer.def_readwrite( "me_lattice_type",& SimulationParameters::me_lattice_type );
+ SimulationParameters_exposer.def_readwrite( "me_framework", &SimulationParameters::me_framework );
+ SimulationParameters_exposer.def_readwrite( "me_if_approx", &SimulationParameters::me_if_approx );
+ SimulationParameters_exposer.def_readwrite( "me_lattice_type", &SimulationParameters::me_lattice_type );
}
}
diff --git a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
index 110299cdc8d5b3e75ce4b4a25fddfc602ec3d5d4..8fc2d4d0aa20f5015b5c993c267de8593f16a5dc 100644
--- a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -174,7 +175,7 @@ void register_StochasticDoubleGate_class(){
, (double ( StochasticDoubleGate_wrapper::* )( ) const)(&StochasticDoubleGate_wrapper::default_getFWHM) )
.def(
"getStdDev"
- , (double ( ::StochasticDoubleGate::* )( ) const)(& ::StochasticDoubleGate::getStdDev ) )
+ , (double ( ::StochasticDoubleGate::* )( ) const)( &::StochasticDoubleGate::getStdDev ) )
.def(
"probabilityDensity"
, (double ( ::StochasticDoubleGate::* )( double ) const)(&::StochasticDoubleGate::probabilityDensity)
diff --git a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
index 9457576f6d5fc91814a1d81d793b01a80918dcdd..33d9567b6576df98f5d3ccf96eb6abde67e2c1ea 100644
--- a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -174,7 +175,7 @@ void register_StochasticDoubleGaussian_class(){
, (double ( StochasticDoubleGaussian_wrapper::* )( ) const)(&StochasticDoubleGaussian_wrapper::default_getFWHM) )
.def(
"getStdDev"
- , (double ( ::StochasticDoubleGaussian::* )( ) const)(& ::StochasticDoubleGaussian::getStdDev ) )
+ , (double ( ::StochasticDoubleGaussian::* )( ) const)( &::StochasticDoubleGaussian::getStdDev ) )
.def(
"probabilityDensity"
, (double ( ::StochasticDoubleGaussian::* )( double ) const)(&::StochasticDoubleGaussian::probabilityDensity)
diff --git a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
index 07887096da11fbd423b9f896da63523e545646e4..4246ef8815cfb55bb47a710cd121ca91566e5f9a 100644
--- a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -148,10 +149,10 @@ void register_StochasticParameter_t_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"getAverage"
- , (double ( ::StochasticParameter<double>::* )( ) )(& ::StochasticParameter< double >::getAverage ) )
+ , (double ( ::StochasticParameter<double>::* )( ) )( &::StochasticParameter< double >::getAverage ) )
.def(
"getCurrent"
- , (double ( ::StochasticParameter<double>::* )( ) const)(& ::StochasticParameter< double >::getCurrent ) )
+ , (double ( ::StochasticParameter<double>::* )( ) const)( &::StochasticParameter< double >::getCurrent ) )
.def(
"getFWHM"
, (double ( ::StochasticParameter<double>::* )( ) const)(&::StochasticParameter< double >::getFWHM)
diff --git a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
index 1d7ba9364c02fc0f22edb7acf15a643c9828855e..3baabd36d491d1bcfb07fcd7d15e5565426ba87e 100644
--- a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -79,14 +80,14 @@ namespace bp = boost::python;
struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrapper< StochasticSampledParameter > {
- StochasticSampledParameter_wrapper(::StochasticParameter< double > const& par, ::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, ::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
@@ -169,8 +170,8 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
void register_StochasticSampledParameter_class(){
- bp::class_< StochasticSampledParameter_wrapper, bp::bases< StochasticParameter< double > >, boost::noncopyable >( "StochasticSampledParameter", bp::init< StochasticParameter< double > const& , size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) )
- .def( bp::init< StochasticParameter< double > const& , size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) )
+ bp::class_< StochasticSampledParameter_wrapper, bp::bases< StochasticParameter< double > >, boost::noncopyable >( "StochasticSampledParameter", bp::init< StochasticParameter< double > const &, size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) )
+ .def( bp::init< StochasticParameter< double > const &, size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) )
.def(
"clone"
, (::StochasticSampledParameter * ( ::StochasticSampledParameter::* )( ) const)(&::StochasticSampledParameter::clone)
@@ -178,18 +179,18 @@ void register_StochasticSampledParameter_class(){
, bp::return_value_policy< bp::manage_new_object >() )
.def(
"getBinValue"
- , (double ( ::StochasticSampledParameter::* )( ::size_t ) const)(& ::StochasticSampledParameter::getBinValue )
+ , (double ( ::StochasticSampledParameter::* )( ::size_t ) const)( &::StochasticSampledParameter::getBinValue )
, ( bp::arg("ibin") ) )
.def(
"getNbins"
- , (::size_t ( ::StochasticSampledParameter::* )( ) const)(& ::StochasticSampledParameter::getNbins ) )
+ , (::size_t ( ::StochasticSampledParameter::* )( ) const)( &::StochasticSampledParameter::getNbins ) )
.def(
"getNormalizedProbability"
- , (double ( ::StochasticSampledParameter::* )( ::size_t ) const)(& ::StochasticSampledParameter::getNormalizedProbability )
+ , (double ( ::StochasticSampledParameter::* )( ::size_t ) const)( &::StochasticSampledParameter::getNormalizedProbability )
, ( bp::arg("ibin") ) )
.def(
"probabilityBinDensity"
- , (double ( ::StochasticSampledParameter::* )( ::size_t ) const)(& ::StochasticSampledParameter::probabilityBinDensity )
+ , (double ( ::StochasticSampledParameter::* )( ::size_t ) const)( &::StochasticSampledParameter::probabilityBinDensity )
, ( bp::arg("ibin") ) )
.def(
"probabilityDensity"
diff --git a/Core/PythonAPI/src/Transform3D.pypp.cpp b/Core/PythonAPI/src/Transform3D.pypp.cpp
index 45ab63636176af41431052a085b305fd0883cf54..1ef08c40875c9e05dd6f73de864638a76fcd0c53 100644
--- a/Core/PythonAPI/src/Transform3D.pypp.cpp
+++ b/Core/PythonAPI/src/Transform3D.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/cvector_t.pypp.cpp b/Core/PythonAPI/src/cvector_t.pypp.cpp
index f5f36de144925fd20518e9921a84d875c3576436..2bfb89029ab98f8cfaa9f2dc817e153dd5f1a596 100644
--- a/Core/PythonAPI/src/cvector_t.pypp.cpp
+++ b/Core/PythonAPI/src/cvector_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -83,26 +84,26 @@ void register_cvector_t_class(){
typedef bp::class_< Geometry::BasicVector3D< std::complex< double > > > cvector_t_exposer_t;
cvector_t_exposer_t cvector_t_exposer = cvector_t_exposer_t( "cvector_t", bp::init< >() );
bp::scope cvector_t_scope( cvector_t_exposer );
- cvector_t_exposer.def( bp::init< std::complex< double > const& , std::complex< double > const& , std::complex< double > const& >(( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") )) );
+ cvector_t_exposer.def( bp::init< std::complex< double > const &, std::complex< double > const &, std::complex< double > const & >(( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") )) );
{ //::Geometry::BasicVector3D< std::complex< double > >::cross
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef ::Geometry::BasicVector3D< std::complex< double > > ( exported_class_t::*cross_function_type )( ::Geometry::BasicVector3D< std::complex< double > > const& ) const;
+ typedef ::Geometry::BasicVector3D< std::complex< double > > ( exported_class_t::*cross_function_type )( ::Geometry::BasicVector3D< std::complex< double > > const & ) const;
cvector_t_exposer.def(
"cross"
- , cross_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::cross )
+ , cross_function_type( &::Geometry::BasicVector3D< std::complex< double > >::cross )
, ( bp::arg("v") ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::dot
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef ::std::complex< double > ( exported_class_t::*dot_function_type )( ::Geometry::BasicVector3D< std::complex< double > > const& ) const;
+ typedef ::std::complex< double > ( exported_class_t::*dot_function_type )( ::Geometry::BasicVector3D< std::complex< double > > const & ) const;
cvector_t_exposer.def(
"dot"
- , dot_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::dot )
+ , dot_function_type( &::Geometry::BasicVector3D< std::complex< double > >::dot )
, ( bp::arg("v") ) );
}
@@ -113,7 +114,7 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"mag"
- , mag_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::mag ) );
+ , mag_function_type( &::Geometry::BasicVector3D< std::complex< double > >::mag ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::mag2
@@ -123,7 +124,7 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"mag2"
- , mag2_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::mag2 ) );
+ , mag2_function_type( &::Geometry::BasicVector3D< std::complex< double > >::mag2 ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::magxy
@@ -133,7 +134,7 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"magxy"
- , magxy_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::magxy ) );
+ , magxy_function_type( &::Geometry::BasicVector3D< std::complex< double > >::magxy ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::magxy2
@@ -143,7 +144,7 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"magxy2"
- , magxy2_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::magxy2 ) );
+ , magxy2_function_type( &::Geometry::BasicVector3D< std::complex< double > >::magxy2 ) );
}
cvector_t_exposer.def( bp::self *= bp::other< double >() );
@@ -153,11 +154,11 @@ void register_cvector_t_class(){
{ //::Geometry::BasicVector3D< std::complex< double > >::operator=
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef ::Geometry::BasicVector3D< std::complex< double > >& ( exported_class_t::*assign_function_type )( ::Geometry::BasicVector3D< std::complex< double > > const& ) ;
+ typedef ::Geometry::BasicVector3D< std::complex< double > > & ( exported_class_t::*assign_function_type )( ::Geometry::BasicVector3D< std::complex< double > > const & ) ;
cvector_t_exposer.def(
"assign"
- , assign_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::operator= )
+ , assign_function_type( &::Geometry::BasicVector3D< std::complex< double > >::operator= )
, ( bp::arg("v") )
, bp::return_self< >() );
@@ -169,18 +170,18 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"__getitem__"
- , __getitem___function_type(& ::Geometry::BasicVector3D< std::complex< double > >::operator[] )
+ , __getitem___function_type( &::Geometry::BasicVector3D< std::complex< double > >::operator[] )
, ( bp::arg("i") ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::operator[]
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef ::std::complex< double >& ( exported_class_t::*__getitem___function_type )( int ) ;
+ typedef ::std::complex< double > & ( exported_class_t::*__getitem___function_type )( int ) ;
cvector_t_exposer.def(
"__getitem__"
- , __getitem___function_type(& ::Geometry::BasicVector3D< std::complex< double > >::operator[] )
+ , __getitem___function_type( &::Geometry::BasicVector3D< std::complex< double > >::operator[] )
, ( bp::arg("i") )
, bp::return_internal_reference< >() );
@@ -188,66 +189,66 @@ void register_cvector_t_class(){
{ //::Geometry::BasicVector3D< std::complex< double > >::setLambdaAlphaPhi
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef void ( exported_class_t::*setLambdaAlphaPhi_function_type )( ::std::complex< double > const& ,::std::complex< double > const& ,::std::complex< double > const& ) ;
+ typedef void ( exported_class_t::*setLambdaAlphaPhi_function_type )( ::std::complex< double > const &,::std::complex< double > const &,::std::complex< double > const & ) ;
cvector_t_exposer.def(
"setLambdaAlphaPhi"
- , setLambdaAlphaPhi_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::setLambdaAlphaPhi )
+ , setLambdaAlphaPhi_function_type( &::Geometry::BasicVector3D< std::complex< double > >::setLambdaAlphaPhi )
, ( bp::arg("_lambda"), bp::arg("_alpha"), bp::arg("_phi") ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::setX
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef void ( exported_class_t::*setX_function_type )( ::std::complex< double > const& ) ;
+ typedef void ( exported_class_t::*setX_function_type )( ::std::complex< double > const & ) ;
cvector_t_exposer.def(
"setX"
- , setX_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::setX )
+ , setX_function_type( &::Geometry::BasicVector3D< std::complex< double > >::setX )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::setXYZ
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef void ( exported_class_t::*setXYZ_function_type )( ::std::complex< double > const& ,::std::complex< double > const& ,::std::complex< double > const& ) ;
+ typedef void ( exported_class_t::*setXYZ_function_type )( ::std::complex< double > const &,::std::complex< double > const &,::std::complex< double > const & ) ;
cvector_t_exposer.def(
"setXYZ"
- , setXYZ_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::setXYZ )
+ , setXYZ_function_type( &::Geometry::BasicVector3D< std::complex< double > >::setXYZ )
, ( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::setY
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef void ( exported_class_t::*setY_function_type )( ::std::complex< double > const& ) ;
+ typedef void ( exported_class_t::*setY_function_type )( ::std::complex< double > const & ) ;
cvector_t_exposer.def(
"setY"
- , setY_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::setY )
+ , setY_function_type( &::Geometry::BasicVector3D< std::complex< double > >::setY )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::setZ
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef void ( exported_class_t::*setZ_function_type )( ::std::complex< double > const& ) ;
+ typedef void ( exported_class_t::*setZ_function_type )( ::std::complex< double > const & ) ;
cvector_t_exposer.def(
"setZ"
- , setZ_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::setZ )
+ , setZ_function_type( &::Geometry::BasicVector3D< std::complex< double > >::setZ )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::transform
typedef Geometry::BasicVector3D< std::complex< double > > exported_class_t;
- typedef ::Geometry::BasicVector3D< std::complex< double > >& ( exported_class_t::*transform_function_type )( ::Geometry::Transform3D const& ) ;
+ typedef ::Geometry::BasicVector3D< std::complex< double > > & ( exported_class_t::*transform_function_type )( ::Geometry::Transform3D const & ) ;
cvector_t_exposer.def(
"transform"
- , transform_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::transform )
+ , transform_function_type( &::Geometry::BasicVector3D< std::complex< double > >::transform )
, ( bp::arg("m") )
, bp::return_value_policy< bp::reference_existing_object >() );
@@ -259,7 +260,7 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"x"
- , x_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::x ) );
+ , x_function_type( &::Geometry::BasicVector3D< std::complex< double > >::x ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::y
@@ -269,7 +270,7 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"y"
- , y_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::y ) );
+ , y_function_type( &::Geometry::BasicVector3D< std::complex< double > >::y ) );
}
{ //::Geometry::BasicVector3D< std::complex< double > >::z
@@ -279,7 +280,7 @@ void register_cvector_t_class(){
cvector_t_exposer.def(
"z"
- , z_function_type(& ::Geometry::BasicVector3D< std::complex< double > >::z ) );
+ , z_function_type( &::Geometry::BasicVector3D< std::complex< double > >::z ) );
}
cvector_t_exposer.def( bp::self + bp::self );
diff --git a/Core/PythonAPI/src/kvector_t.pypp.cpp b/Core/PythonAPI/src/kvector_t.pypp.cpp
index 7b7a3d7ae1a91c9304d2b4d7d8c1210068048e8a..3275132cb29fb1e4cb890e9acc6a2eafb9bf3459 100644
--- a/Core/PythonAPI/src/kvector_t.pypp.cpp
+++ b/Core/PythonAPI/src/kvector_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
@@ -83,26 +84,26 @@ void register_kvector_t_class(){
typedef bp::class_< Geometry::BasicVector3D< double > > kvector_t_exposer_t;
kvector_t_exposer_t kvector_t_exposer = kvector_t_exposer_t( "kvector_t", bp::init< >() );
bp::scope kvector_t_scope( kvector_t_exposer );
- kvector_t_exposer.def( bp::init< double const& , double const& , double const& >(( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") )) );
+ kvector_t_exposer.def( bp::init< double const &, double const &, double const & >(( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") )) );
{ //::Geometry::BasicVector3D< double >::cross
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef ::Geometry::BasicVector3D< double > ( exported_class_t::*cross_function_type )( ::Geometry::BasicVector3D< double > const& ) const;
+ typedef ::Geometry::BasicVector3D< double > ( exported_class_t::*cross_function_type )( ::Geometry::BasicVector3D< double > const & ) const;
kvector_t_exposer.def(
"cross"
- , cross_function_type(& ::Geometry::BasicVector3D< double >::cross )
+ , cross_function_type( &::Geometry::BasicVector3D< double >::cross )
, ( bp::arg("v") ) );
}
{ //::Geometry::BasicVector3D< double >::dot
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef double ( exported_class_t::*dot_function_type )( ::Geometry::BasicVector3D< double > const& ) const;
+ typedef double ( exported_class_t::*dot_function_type )( ::Geometry::BasicVector3D< double > const & ) const;
kvector_t_exposer.def(
"dot"
- , dot_function_type(& ::Geometry::BasicVector3D< double >::dot )
+ , dot_function_type( &::Geometry::BasicVector3D< double >::dot )
, ( bp::arg("v") ) );
}
@@ -113,7 +114,7 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"mag"
- , mag_function_type(& ::Geometry::BasicVector3D< double >::mag ) );
+ , mag_function_type( &::Geometry::BasicVector3D< double >::mag ) );
}
{ //::Geometry::BasicVector3D< double >::mag2
@@ -123,7 +124,7 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"mag2"
- , mag2_function_type(& ::Geometry::BasicVector3D< double >::mag2 ) );
+ , mag2_function_type( &::Geometry::BasicVector3D< double >::mag2 ) );
}
{ //::Geometry::BasicVector3D< double >::magxy
@@ -133,7 +134,7 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"magxy"
- , magxy_function_type(& ::Geometry::BasicVector3D< double >::magxy ) );
+ , magxy_function_type( &::Geometry::BasicVector3D< double >::magxy ) );
}
{ //::Geometry::BasicVector3D< double >::magxy2
@@ -143,7 +144,7 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"magxy2"
- , magxy2_function_type(& ::Geometry::BasicVector3D< double >::magxy2 ) );
+ , magxy2_function_type( &::Geometry::BasicVector3D< double >::magxy2 ) );
}
kvector_t_exposer.def( bp::self *= bp::other< double >() );
@@ -153,11 +154,11 @@ void register_kvector_t_class(){
{ //::Geometry::BasicVector3D< double >::operator=
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef ::Geometry::BasicVector3D< double >& ( exported_class_t::*assign_function_type )( ::Geometry::BasicVector3D< double > const& ) ;
+ typedef ::Geometry::BasicVector3D< double > & ( exported_class_t::*assign_function_type )( ::Geometry::BasicVector3D< double > const & ) ;
kvector_t_exposer.def(
"assign"
- , assign_function_type(& ::Geometry::BasicVector3D< double >::operator= )
+ , assign_function_type( &::Geometry::BasicVector3D< double >::operator= )
, ( bp::arg("v") )
, bp::return_self< >() );
@@ -169,18 +170,18 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"__getitem__"
- , __getitem___function_type(& ::Geometry::BasicVector3D< double >::operator[] )
+ , __getitem___function_type( &::Geometry::BasicVector3D< double >::operator[] )
, ( bp::arg("i") ) );
}
{ //::Geometry::BasicVector3D< double >::operator[]
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef double& ( exported_class_t::*__getitem___function_type )( int ) ;
+ typedef double & ( exported_class_t::*__getitem___function_type )( int ) ;
kvector_t_exposer.def(
"__getitem__"
- , __getitem___function_type(& ::Geometry::BasicVector3D< double >::operator[] )
+ , __getitem___function_type( &::Geometry::BasicVector3D< double >::operator[] )
, ( bp::arg("i") )
, bp::return_value_policy< bp::copy_non_const_reference >() );
@@ -188,66 +189,66 @@ void register_kvector_t_class(){
{ //::Geometry::BasicVector3D< double >::setLambdaAlphaPhi
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef void ( exported_class_t::*setLambdaAlphaPhi_function_type )( double const& ,double const& ,double const& ) ;
+ typedef void ( exported_class_t::*setLambdaAlphaPhi_function_type )( double const &,double const &,double const & ) ;
kvector_t_exposer.def(
"setLambdaAlphaPhi"
- , setLambdaAlphaPhi_function_type(& ::Geometry::BasicVector3D< double >::setLambdaAlphaPhi )
+ , setLambdaAlphaPhi_function_type( &::Geometry::BasicVector3D< double >::setLambdaAlphaPhi )
, ( bp::arg("_lambda"), bp::arg("_alpha"), bp::arg("_phi") ) );
}
{ //::Geometry::BasicVector3D< double >::setX
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef void ( exported_class_t::*setX_function_type )( double const& ) ;
+ typedef void ( exported_class_t::*setX_function_type )( double const & ) ;
kvector_t_exposer.def(
"setX"
- , setX_function_type(& ::Geometry::BasicVector3D< double >::setX )
+ , setX_function_type( &::Geometry::BasicVector3D< double >::setX )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< double >::setXYZ
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef void ( exported_class_t::*setXYZ_function_type )( double const& ,double const& ,double const& ) ;
+ typedef void ( exported_class_t::*setXYZ_function_type )( double const &,double const &,double const & ) ;
kvector_t_exposer.def(
"setXYZ"
- , setXYZ_function_type(& ::Geometry::BasicVector3D< double >::setXYZ )
+ , setXYZ_function_type( &::Geometry::BasicVector3D< double >::setXYZ )
, ( bp::arg("x1"), bp::arg("y1"), bp::arg("z1") ) );
}
{ //::Geometry::BasicVector3D< double >::setY
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef void ( exported_class_t::*setY_function_type )( double const& ) ;
+ typedef void ( exported_class_t::*setY_function_type )( double const & ) ;
kvector_t_exposer.def(
"setY"
- , setY_function_type(& ::Geometry::BasicVector3D< double >::setY )
+ , setY_function_type( &::Geometry::BasicVector3D< double >::setY )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< double >::setZ
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef void ( exported_class_t::*setZ_function_type )( double const& ) ;
+ typedef void ( exported_class_t::*setZ_function_type )( double const & ) ;
kvector_t_exposer.def(
"setZ"
- , setZ_function_type(& ::Geometry::BasicVector3D< double >::setZ )
+ , setZ_function_type( &::Geometry::BasicVector3D< double >::setZ )
, ( bp::arg("a") ) );
}
{ //::Geometry::BasicVector3D< double >::transform
typedef Geometry::BasicVector3D< double > exported_class_t;
- typedef ::Geometry::BasicVector3D< double >& ( exported_class_t::*transform_function_type )( ::Geometry::Transform3D const& ) ;
+ typedef ::Geometry::BasicVector3D< double > & ( exported_class_t::*transform_function_type )( ::Geometry::Transform3D const & ) ;
kvector_t_exposer.def(
"transform"
- , transform_function_type(& ::Geometry::BasicVector3D< double >::transform )
+ , transform_function_type( &::Geometry::BasicVector3D< double >::transform )
, ( bp::arg("m") )
, bp::return_value_policy< bp::reference_existing_object >() );
@@ -259,7 +260,7 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"x"
- , x_function_type(& ::Geometry::BasicVector3D< double >::x ) );
+ , x_function_type( &::Geometry::BasicVector3D< double >::x ) );
}
{ //::Geometry::BasicVector3D< double >::y
@@ -269,7 +270,7 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"y"
- , y_function_type(& ::Geometry::BasicVector3D< double >::y ) );
+ , y_function_type( &::Geometry::BasicVector3D< double >::y ) );
}
{ //::Geometry::BasicVector3D< double >::z
@@ -279,7 +280,7 @@ void register_kvector_t_class(){
kvector_t_exposer.def(
"z"
- , z_function_type(& ::Geometry::BasicVector3D< double >::z ) );
+ , z_function_type( &::Geometry::BasicVector3D< double >::z ) );
}
kvector_t_exposer.def( bp::self_ns::str( bp::self ) );
diff --git a/Core/PythonAPI/src/ndimdata_t.pypp.cpp b/Core/PythonAPI/src/ndimdata_t.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6b98b1b3f6558e8c06aac39b1c333e5394af529d
--- /dev/null
+++ b/Core/PythonAPI/src/ndimdata_t.pypp.cpp
@@ -0,0 +1,207 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "BasicVector3D.h"
+#include "Bin.h"
+#include "Crystal.h"
+#include "DiffuseParticleInfo.h"
+#include "FTDistributions.h"
+#include "FormFactorBox.h"
+#include "FormFactorCrystal.h"
+#include "FormFactorCylinder.h"
+#include "FormFactorDecoratorDebyeWaller.h"
+#include "FormFactorFullSphere.h"
+#include "FormFactorGauss.h"
+#include "FormFactorLorentz.h"
+#include "FormFactorParallelepiped.h"
+#include "FormFactorPrism3.h"
+#include "FormFactorPyramid.h"
+#include "FormFactorSphereGaussianRadius.h"
+#include "HomogeneousMaterial.h"
+#include "ICloneable.h"
+#include "IClusteredParticles.h"
+#include "ICompositeSample.h"
+#include "IDecoration.h"
+#include "IFormFactor.h"
+#include "IFormFactorBorn.h"
+#include "IFormFactorDecorator.h"
+#include "IInterferenceFunction.h"
+#include "IMaterial.h"
+#include "IParameterized.h"
+#include "ISample.h"
+#include "ISampleBuilder.h"
+#include "ISelectionRule.h"
+#include "ISingleton.h"
+#include "Instrument.h"
+#include "InterferenceFunction1DParaCrystal.h"
+#include "InterferenceFunction2DLattice.h"
+#include "InterferenceFunction2DParaCrystal.h"
+#include "InterferenceFunctionNone.h"
+#include "Lattice.h"
+#include "Lattice2DIFParameters.h"
+#include "LatticeBasis.h"
+#include "Layer.h"
+#include "LayerDecorator.h"
+#include "LayerRoughness.h"
+#include "Lattice2DIFParameters.h"
+#include "MaterialManager.h"
+#include "MesoCrystal.h"
+#include "MultiLayer.h"
+#include "OpticalFresnel.h"
+#include "ParameterPool.h"
+#include "Particle.h"
+#include "ParticleBuilder.h"
+#include "ParticleCoreShell.h"
+#include "ParticleDecoration.h"
+#include "OutputData.h"
+#include "ParticleInfo.h"
+#include "PositionParticleInfo.h"
+#include "PythonOutputData.h"
+#include "PythonPlusplusHelper.h"
+#include "RealParameterWrapper.h"
+#include "Simulation.h"
+#include "SimulationParameters.h"
+#include "IStochasticParameter.h"
+#include "StochasticGaussian.h"
+#include "StochasticSampledParameter.h"
+#include "StochasticDoubleGate.h"
+#include "Transform3D.h"
+#include "Types.h"
+#include "Units.h"
+#include "ndimdata_t.pypp.h"
+
+namespace bp = boost::python;
+
+void register_ndimdata_t_class(){
+
+ bp::class_< OutputData< double >, boost::noncopyable >( "ndimdata_t", bp::init< >() )
+ .def(
+ "addAxis"
+ , (void ( ::OutputData<double>::* )( ::IAxis const & ) )( &::OutputData< double >::addAxis )
+ , ( bp::arg("new_axis") ) )
+ .def(
+ "addAxis"
+ , (void ( ::OutputData<double>::* )( ::std::string const &,::size_t,double,double ) )( &::OutputData< double >::addAxis )
+ , ( bp::arg("name"), bp::arg("size"), bp::arg("start"), bp::arg("end") ) )
+ .def(
+ "addMask"
+ , (void ( ::OutputData<double>::* )( ::Mask const & ) )( &::OutputData< double >::addMask )
+ , ( bp::arg("mask") ) )
+ .def(
+ "clear"
+ , (void ( ::OutputData<double>::* )( ) )( &::OutputData< double >::clear ) )
+ .def(
+ "clone"
+ , (::OutputData< double > * ( ::OutputData<double>::* )( ) const)( &::OutputData< double >::clone )
+ , bp::return_value_policy< bp::manage_new_object >() )
+ .def(
+ "copyFrom"
+ , (void ( ::OutputData<double>::* )( ::OutputData< double > const & ) )( &::OutputData< double >::copyFrom )
+ , ( bp::arg("other") ) )
+ .def(
+ "getAllSizes"
+ , (::std::vector< unsigned long > ( ::OutputData<double>::* )( ) const)( &::OutputData< double >::getAllSizes ) )
+ .def(
+ "getAllocatedSize"
+ , (::size_t ( ::OutputData<double>::* )( ) const)( &::OutputData< double >::getAllocatedSize ) )
+ .def(
+ "getAxis"
+ , (::IAxis const * ( ::OutputData<double>::* )( ::size_t ) const)( &::OutputData< double >::getAxis )
+ , ( bp::arg("index") )
+ , bp::return_value_policy< bp::reference_existing_object >() )
+ .def(
+ "getAxis"
+ , (::IAxis const * ( ::OutputData<double>::* )( ::std::string const & ) const)( &::OutputData< double >::getAxis )
+ , ( bp::arg("label") )
+ , bp::return_value_policy< bp::reference_existing_object >() )
+ .def(
+ "getAxisIndex"
+ , (::size_t ( ::OutputData<double>::* )( ::std::string const & ) const)( &::OutputData< double >::getAxisIndex )
+ , ( bp::arg("label") ) )
+ .def(
+ "getBinOfAxis"
+ , (::Bin1D ( ::OutputData<double>::* )( ::std::string const &,::size_t ) const)( &::OutputData< double >::getBinOfAxis )
+ , ( bp::arg("axis_name"), bp::arg("index") ) )
+ .def(
+ "getIndexOfAxis"
+ , (::size_t ( ::OutputData<double>::* )( ::std::string const &,::size_t ) const)( &::OutputData< double >::getIndexOfAxis )
+ , ( bp::arg("axis_name"), bp::arg("total_index") ) )
+ .def(
+ "getMask"
+ , (::Mask * ( ::OutputData<double>::* )( ) const)( &::OutputData< double >::getMask )
+ , bp::return_value_policy< bp::reference_existing_object >() )
+ .def(
+ "getRank"
+ , (::size_t ( ::OutputData<double>::* )( ) const)( &::OutputData< double >::getRank ) )
+ .def(
+ "getRawDataVector"
+ , (::std::vector< double > ( ::OutputData<double>::* )( ) const)( &::OutputData< double >::getRawDataVector ) )
+ .def(
+ "getValueOfAxis"
+ , (double ( ::OutputData<double>::* )( ::std::string const &,::size_t ) const)( &::OutputData< double >::getValueOfAxis )
+ , ( bp::arg("axis_name"), bp::arg("index") ) )
+ .def(
+ "hasSameDimensions"
+ , (bool ( ::OutputData<double>::* )( ::OutputData< double > const & ) const)( &::OutputData< double >::hasSameDimensions )
+ , ( bp::arg("right") ) )
+ .def(
+ "hasSameShape"
+ , (bool ( ::OutputData<double>::* )( ::OutputData< double > const & ) const)( &::OutputData< double >::hasSameShape )
+ , ( bp::arg("right") ) )
+ .def( bp::self *= bp::self )
+ .def( bp::self += bp::self )
+ .def( bp::self -= bp::self )
+ .def( bp::self /= bp::self )
+ .def(
+ "__getitem__"
+ , (double & ( ::OutputData<double>::* )( ::size_t ) )( &::OutputData< double >::operator[] )
+ , ( bp::arg("index") )
+ , bp::return_value_policy< bp::copy_non_const_reference >() )
+ .def(
+ "__getitem__"
+ , (double const & ( ::OutputData<double>::* )( ::size_t ) const)( &::OutputData< double >::operator[] )
+ , ( bp::arg("index") )
+ , bp::return_value_policy< bp::copy_const_reference >() )
+ .def(
+ "removeAllMasks"
+ , (void ( ::OutputData<double>::* )( ) )( &::OutputData< double >::removeAllMasks ) )
+ .def(
+ "scaleAll"
+ , (void ( ::OutputData<double>::* )( double const & ) )( &::OutputData< double >::scaleAll )
+ , ( bp::arg("factor") ) )
+ .def(
+ "setAllTo"
+ , (void ( ::OutputData<double>::* )( double const & ) )( &::OutputData< double >::setAllTo )
+ , ( bp::arg("value") ) )
+ .def(
+ "setMask"
+ , (void ( ::OutputData<double>::* )( ::Mask const & ) )( &::OutputData< double >::setMask )
+ , ( bp::arg("mask") ) )
+ .def(
+ "setRawDataVector"
+ , (void ( ::OutputData<double>::* )( ::std::vector< double > const & ) )( &::OutputData< double >::setRawDataVector )
+ , ( bp::arg("data_vector") ) )
+ .def(
+ "toCoordinate"
+ , (int ( ::OutputData<double>::* )( ::size_t,::size_t ) const)( &::OutputData< double >::toCoordinate )
+ , ( bp::arg("index"), bp::arg("i_selected_axis") ) )
+ .def(
+ "toCoordinates"
+ , (::std::vector< int > ( ::OutputData<double>::* )( ::size_t ) const)( &::OutputData< double >::toCoordinates )
+ , ( bp::arg("index") ) )
+ .def(
+ "toIndex"
+ , (::size_t ( ::OutputData<double>::* )( ::std::vector< int > ) const)( &::OutputData< double >::toIndex )
+ , ( bp::arg("coordinates") ) )
+ .def(
+ "totalSum"
+ , (double ( ::OutputData<double>::* )( ) const)( &::OutputData< double >::totalSum ) )
+ .def("__setitem__", &pyplusplus_setitem<OutputData<double >,int,double> );
+
+}
diff --git a/Core/PythonAPI/src/vdouble1d_t.pypp.cpp b/Core/PythonAPI/src/vdouble1d_t.pypp.cpp
index 7a9e45dc0f01e684291a214998524c1aee038a27..e5be5ef650367c213cfb5b1ce8e5c9eaae20a23d 100644
--- a/Core/PythonAPI/src/vdouble1d_t.pypp.cpp
+++ b/Core/PythonAPI/src/vdouble1d_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/vector_DiffuseParticleInfoPtr_t.pypp.cpp b/Core/PythonAPI/src/vector_DiffuseParticleInfoPtr_t.pypp.cpp
index 7b915a041567f8790515c92aae197df301e83135..572b3c347738eb395a24940d65cc9608a1ffb5ee 100644
--- a/Core/PythonAPI/src/vector_DiffuseParticleInfoPtr_t.pypp.cpp
+++ b/Core/PythonAPI/src/vector_DiffuseParticleInfoPtr_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp b/Core/PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp
index b1fbc3ef18ce187168b3b538d9f74ae6e4c2343a..a18abc066ddc30907bd669daea06351ed55b1390 100644
--- a/Core/PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp
+++ b/Core/PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/vector_integer_t.pypp.cpp b/Core/PythonAPI/src/vector_integer_t.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f9982d66732d020269781609d0e180cc05847cee
--- /dev/null
+++ b/Core/PythonAPI/src/vector_integer_t.pypp.cpp
@@ -0,0 +1,90 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "BasicVector3D.h"
+#include "Bin.h"
+#include "Crystal.h"
+#include "DiffuseParticleInfo.h"
+#include "FTDistributions.h"
+#include "FormFactorBox.h"
+#include "FormFactorCrystal.h"
+#include "FormFactorCylinder.h"
+#include "FormFactorDecoratorDebyeWaller.h"
+#include "FormFactorFullSphere.h"
+#include "FormFactorGauss.h"
+#include "FormFactorLorentz.h"
+#include "FormFactorParallelepiped.h"
+#include "FormFactorPrism3.h"
+#include "FormFactorPyramid.h"
+#include "FormFactorSphereGaussianRadius.h"
+#include "HomogeneousMaterial.h"
+#include "ICloneable.h"
+#include "IClusteredParticles.h"
+#include "ICompositeSample.h"
+#include "IDecoration.h"
+#include "IFormFactor.h"
+#include "IFormFactorBorn.h"
+#include "IFormFactorDecorator.h"
+#include "IInterferenceFunction.h"
+#include "IMaterial.h"
+#include "IParameterized.h"
+#include "ISample.h"
+#include "ISampleBuilder.h"
+#include "ISelectionRule.h"
+#include "ISingleton.h"
+#include "Instrument.h"
+#include "InterferenceFunction1DParaCrystal.h"
+#include "InterferenceFunction2DLattice.h"
+#include "InterferenceFunction2DParaCrystal.h"
+#include "InterferenceFunctionNone.h"
+#include "Lattice.h"
+#include "Lattice2DIFParameters.h"
+#include "LatticeBasis.h"
+#include "Layer.h"
+#include "LayerDecorator.h"
+#include "LayerRoughness.h"
+#include "Lattice2DIFParameters.h"
+#include "MaterialManager.h"
+#include "MesoCrystal.h"
+#include "MultiLayer.h"
+#include "OpticalFresnel.h"
+#include "ParameterPool.h"
+#include "Particle.h"
+#include "ParticleBuilder.h"
+#include "ParticleCoreShell.h"
+#include "ParticleDecoration.h"
+#include "OutputData.h"
+#include "ParticleInfo.h"
+#include "PositionParticleInfo.h"
+#include "PythonOutputData.h"
+#include "PythonPlusplusHelper.h"
+#include "RealParameterWrapper.h"
+#include "Simulation.h"
+#include "SimulationParameters.h"
+#include "IStochasticParameter.h"
+#include "StochasticGaussian.h"
+#include "StochasticSampledParameter.h"
+#include "StochasticDoubleGate.h"
+#include "Transform3D.h"
+#include "Types.h"
+#include "Units.h"
+#include "vector_integer_t.pypp.h"
+
+namespace bp = boost::python;
+
+void register_vector_integer_t_class(){
+
+ { //::std::vector< int >
+ typedef bp::class_< std::vector< int > > vector_integer_t_exposer_t;
+ vector_integer_t_exposer_t vector_integer_t_exposer = vector_integer_t_exposer_t( "vector_integer_t" );
+ bp::scope vector_integer_t_scope( vector_integer_t_exposer );
+ vector_integer_t_exposer.def( bp::vector_indexing_suite< ::std::vector< int >, true >() );
+ }
+
+}
diff --git a/Core/PythonAPI/src/vector_kvector_t.pypp.cpp b/Core/PythonAPI/src/vector_kvector_t.pypp.cpp
index a2f98448a2bd83504065241fb590ee38dd96cc6e..e2616cbfa3d505f5eca3731aa157a91cd192fbbe 100644
--- a/Core/PythonAPI/src/vector_kvector_t.pypp.cpp
+++ b/Core/PythonAPI/src/vector_kvector_t.pypp.cpp
@@ -59,6 +59,7 @@ GCC_DIAG_ON(missing-field-initializers);
#include "ParticleBuilder.h"
#include "ParticleCoreShell.h"
#include "ParticleDecoration.h"
+#include "OutputData.h"
#include "ParticleInfo.h"
#include "PositionParticleInfo.h"
#include "PythonOutputData.h"
diff --git a/Core/PythonAPI/src/vector_longinteger_t.pypp.cpp b/Core/PythonAPI/src/vector_longinteger_t.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bdfe597fcb6bd6e48073949646ff0c22ff6e7e6c
--- /dev/null
+++ b/Core/PythonAPI/src/vector_longinteger_t.pypp.cpp
@@ -0,0 +1,90 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "BasicVector3D.h"
+#include "Bin.h"
+#include "Crystal.h"
+#include "DiffuseParticleInfo.h"
+#include "FTDistributions.h"
+#include "FormFactorBox.h"
+#include "FormFactorCrystal.h"
+#include "FormFactorCylinder.h"
+#include "FormFactorDecoratorDebyeWaller.h"
+#include "FormFactorFullSphere.h"
+#include "FormFactorGauss.h"
+#include "FormFactorLorentz.h"
+#include "FormFactorParallelepiped.h"
+#include "FormFactorPrism3.h"
+#include "FormFactorPyramid.h"
+#include "FormFactorSphereGaussianRadius.h"
+#include "HomogeneousMaterial.h"
+#include "ICloneable.h"
+#include "IClusteredParticles.h"
+#include "ICompositeSample.h"
+#include "IDecoration.h"
+#include "IFormFactor.h"
+#include "IFormFactorBorn.h"
+#include "IFormFactorDecorator.h"
+#include "IInterferenceFunction.h"
+#include "IMaterial.h"
+#include "IParameterized.h"
+#include "ISample.h"
+#include "ISampleBuilder.h"
+#include "ISelectionRule.h"
+#include "ISingleton.h"
+#include "Instrument.h"
+#include "InterferenceFunction1DParaCrystal.h"
+#include "InterferenceFunction2DLattice.h"
+#include "InterferenceFunction2DParaCrystal.h"
+#include "InterferenceFunctionNone.h"
+#include "Lattice.h"
+#include "Lattice2DIFParameters.h"
+#include "LatticeBasis.h"
+#include "Layer.h"
+#include "LayerDecorator.h"
+#include "LayerRoughness.h"
+#include "Lattice2DIFParameters.h"
+#include "MaterialManager.h"
+#include "MesoCrystal.h"
+#include "MultiLayer.h"
+#include "OpticalFresnel.h"
+#include "ParameterPool.h"
+#include "Particle.h"
+#include "ParticleBuilder.h"
+#include "ParticleCoreShell.h"
+#include "ParticleDecoration.h"
+#include "OutputData.h"
+#include "ParticleInfo.h"
+#include "PositionParticleInfo.h"
+#include "PythonOutputData.h"
+#include "PythonPlusplusHelper.h"
+#include "RealParameterWrapper.h"
+#include "Simulation.h"
+#include "SimulationParameters.h"
+#include "IStochasticParameter.h"
+#include "StochasticGaussian.h"
+#include "StochasticSampledParameter.h"
+#include "StochasticDoubleGate.h"
+#include "Transform3D.h"
+#include "Types.h"
+#include "Units.h"
+#include "vector_longinteger_t.pypp.h"
+
+namespace bp = boost::python;
+
+void register_vector_longinteger_t_class(){
+
+ { //::std::vector< unsigned long >
+ typedef bp::class_< std::vector< unsigned long > > vector_longinteger_t_exposer_t;
+ vector_longinteger_t_exposer_t vector_longinteger_t_exposer = vector_longinteger_t_exposer_t( "vector_longinteger_t" );
+ bp::scope vector_longinteger_t_scope( vector_longinteger_t_exposer );
+ vector_longinteger_t_exposer.def( bp::vector_indexing_suite< ::std::vector< unsigned long >, true >() );
+ }
+
+}
diff --git a/Core/Samples/inc/HomogeneousMaterial.h b/Core/Samples/inc/HomogeneousMaterial.h
index 7816e817f7eec5aef9bba7bb16fc92d2b39d1da3..e2015a00adf60ea1735db2f162d5c4bfc46df04e 100644
--- a/Core/Samples/inc/HomogeneousMaterial.h
+++ b/Core/Samples/inc/HomogeneousMaterial.h
@@ -24,37 +24,38 @@
class HomogeneousMaterial : public IMaterial
{
public:
- HomogeneousMaterial() {}
- HomogeneousMaterial(const complex_t& refractive_index)
+ //HomogeneousMaterial() {}
+ HomogeneousMaterial(const complex_t &refractive_index)
: IMaterial("noname"), m_refractive_index(refractive_index) {}
- HomogeneousMaterial(const std::string& name,
- const complex_t& refractive_index)
+ HomogeneousMaterial(const std::string &name,
+ const complex_t &refractive_index)
: IMaterial(name), m_refractive_index(refractive_index) {}
- HomogeneousMaterial(const std::string& name,
+ HomogeneousMaterial(const std::string &name,
double refractive_index_real,
double refractive_index_imag )
: IMaterial(name),
m_refractive_index(complex_t(refractive_index_real,
refractive_index_imag)) {}
// Copy constructor.
- HomogeneousMaterial(const HomogeneousMaterial& other)
- : IMaterial(other), m_refractive_index(other.m_refractive_index) {}
+// HomogeneousMaterial(const HomogeneousMaterial &other)
+// : IMaterial(other), m_refractive_index(other.m_refractive_index) {}
virtual ~HomogeneousMaterial() {}
- //! Returns refractive index.
+ //! Return refractive index.
complex_t getRefractiveIndex() const { return m_refractive_index; }
- //! Sets refractive index.
- void setRefractiveIndex(complex_t refractive_index)
- { m_refractive_index = refractive_index; }
+ //! Set refractive index.
+ void setRefractiveIndex(const complex_t &refractive_index)
+ { m_refractive_index = refractive_index; }
protected:
- //! Dumps contents to stream.
- virtual void print(std::ostream& ostr) const
- {
+
+ //! Dump contents to stream.
+ virtual void print(std::ostream &ostr) const
+ {
ostr << " " << getName() << " " << this <<
" R" << m_refractive_index;
- }
+ }
complex_t m_refractive_index; //!< complex index of refraction
};
diff --git a/Core/Samples/inc/IMaterial.h b/Core/Samples/inc/IMaterial.h
index 3da96e7fe7a5ce082bebba7a86af40ca6fe3e203..8d6c409d2778de0d7a22831c96d2ef0851cb6ec4 100644
--- a/Core/Samples/inc/IMaterial.h
+++ b/Core/Samples/inc/IMaterial.h
@@ -18,7 +18,7 @@
#include <string>
#include <iostream>
-#include <typeinfo>
+//#include <typeinfo>
#include "INamed.h"
//! Interface to a named material.
@@ -26,17 +26,17 @@
class IMaterial : public INamed
{
public:
- IMaterial() {}
- IMaterial(const std::string& name) : INamed(name) {}
- IMaterial(const IMaterial& other);
- IMaterial& operator=(const IMaterial& other);
+// IMaterial() {}
+ IMaterial(const std::string &name) : INamed(name) {}
+// IMaterial(const IMaterial &other);
+// IMaterial &operator=(const IMaterial &other);
virtual ~IMaterial() {}
- friend std::ostream& operator<<(std::ostream& ostr, const IMaterial& m)
+ friend std::ostream &operator<<(std::ostream &ostr, const IMaterial &m)
{ m.print(ostr); return ostr; }
protected:
- virtual void print(std::ostream& ostr) const {
+ virtual void print(std::ostream &ostr) const {
//ostr << typeid(*this).name() << " " << this;
ostr << getName() << " " << this;
}
diff --git a/Core/Samples/inc/MaterialManager.h b/Core/Samples/inc/MaterialManager.h
index 7bb69e289bb6db27808774d1141100e7395faff0..1d284f25a31c4c52a29ddec999d5267073e67d34 100644
--- a/Core/Samples/inc/MaterialManager.h
+++ b/Core/Samples/inc/MaterialManager.h
@@ -73,6 +73,7 @@ class MaterialManager: public ISingleton<MaterialManager>
const IMaterial *this_getHomogeneousMaterial(
const std::string& name,
double refractive_index_real, double refractive_index_imag);
+ void check_refractive_index(const complex_t &index);
};
#endif /* MATERIALMANAGER_H */
diff --git a/Core/Samples/src/IMaterial.cpp b/Core/Samples/src/IMaterial.cpp
index 25ed2f373175a767e79f472086f8307cc8d43572..8eccae32921991db75b9b473286b729c9b3ec9c8 100644
--- a/Core/Samples/src/IMaterial.cpp
+++ b/Core/Samples/src/IMaterial.cpp
@@ -15,15 +15,15 @@
#include "IMaterial.h"
-IMaterial::IMaterial(const IMaterial& other) : INamed(other)
-{
-}
+//IMaterial::IMaterial(const IMaterial &other) : INamed(other)
+//{
+//}
-IMaterial& IMaterial::operator=(const IMaterial& other)
-{
- if( this !=& other) {
- INamed::operator=(other);
- m_name = other.m_name;
- }
- return *this;
-}
+//IMaterial &IMaterial::operator=(const IMaterial &other)
+//{
+// if( this != &other) {
+// INamed::operator=(other);
+// m_name = other.m_name;
+// }
+// return *this;
+//}
diff --git a/Core/Samples/src/MaterialManager.cpp b/Core/Samples/src/MaterialManager.cpp
index 2c7b844b9a8be70e14f5c1f2ff9005cda52e9d97..84208856e07449b7daf827530323427181883986 100644
--- a/Core/Samples/src/MaterialManager.cpp
+++ b/Core/Samples/src/MaterialManager.cpp
@@ -54,6 +54,8 @@ const IMaterial *MaterialManager::this_getMaterial(const std::string& name)
const IMaterial *MaterialManager::this_getHomogeneousMaterial(
const std::string& name, const complex_t& refractive_index)
{
+ check_refractive_index(refractive_index);
+
static boost::mutex single_mutex;
boost::unique_lock<boost::mutex> single_lock( single_mutex );
const IMaterial *mat = getMaterial(name);
@@ -100,3 +102,19 @@ void MaterialManager::print(std::ostream& ostr) const
ostr << *mat << std::endl;
}
}
+
+//! Checks refractive index for consistency
+// FIXME what are allowed values for refractive index ?
+void MaterialManager::check_refractive_index(const complex_t &index)
+{
+ bool isConsistent(true);
+ if( (index.imag() == 0.0) && (index.real() == 0.0) ) isConsistent = false;
+ if( (index.imag() < 0.0) || (index.real() < 0.0) ) isConsistent = false;
+ if( (index.imag() > 1.0) || (index.real() > 1.0) ) isConsistent = false;
+ if( (index.imag() == 1.0) ) isConsistent = false;
+
+ if( !isConsistent ) {
+ msglog(MSG::ERROR) << "MaterialManager::check_refractive_index() -> "
+ << "Suspicious refractive index " << index;
+ }
+}
diff --git a/Core/Tools/inc/IParameterized.h b/Core/Tools/inc/IParameterized.h
index 6779146a7a0a2852d491fa4b21a65dbe882cf8a1..f6f503ca6c5056282145c4a35553825a63fa5f4a 100644
--- a/Core/Tools/inc/IParameterized.h
+++ b/Core/Tools/inc/IParameterized.h
@@ -52,6 +52,17 @@ class IParameterized : public INamed
virtual void setParametersAreChanged() { m_status.setIsChanged(true); }
+ //! main method to register data address in the pool
+ virtual void registerParameter(const std::string &name, double *parpointer)
+ { getParameterPool()->registerParameter(name, parpointer); }
+
+ //! set parameter value, return true in the case of success
+ virtual bool setParameterValue(const std::string &name, double value)
+ { return getParameterPool()->setParameterValue(name, value); }
+
+ //! clear parameter pool
+ virtual void clearParameterPool() { getParameterPool()->clear(); }
+
protected:
//! Throw non-implemented exception (needed for Python).
virtual void init_parameters();
diff --git a/Core/Tools/inc/MathFunctions.h b/Core/Tools/inc/MathFunctions.h
index 06b24a3ef2a0324012628ed61613a7bb78ab46fa..515931e876a91d6df62bca2bfba232fc869da3bb 100644
--- a/Core/Tools/inc/MathFunctions.h
+++ b/Core/Tools/inc/MathFunctions.h
@@ -59,16 +59,16 @@ double Si(double value);
double Sinc(double value);
//! Complex Sinc function: \f$Sinc(x)\equiv\sin(x)/x\f$
-complex_t Sinc(const complex_t& value);
+complex_t Sinc(const complex_t &value);
-complex_t Laue(const complex_t& value, size_t N);
+complex_t Laue(const complex_t &value, size_t N);
enum TransformCase { ForwardFFT, BackwardFFT };
-std::vector<complex_t > FastFourierTransform(const std::vector<complex_t >& data, TransformCase tcase);
+std::vector<complex_t > FastFourierTransform(const std::vector<complex_t > &data, TransformCase tcase);
-std::vector<complex_t > FastFourierTransform(const std::vector<double >& data, TransformCase tcase);
+std::vector<complex_t > FastFourierTransform(const std::vector<double > &data, TransformCase tcase);
-std::vector<complex_t> ConvolveFFT(const std::vector<double>& signal, const std::vector<double>& resfunc);
+std::vector<complex_t> ConvolveFFT(const std::vector<double> &signal, const std::vector<double> &resfunc);
//! fast sine calculations (not actually fast)
double FastSin(const double& x);
@@ -77,13 +77,13 @@ double FastSin(const double& x);
double FastCos(const double& x);
//! fast complex sine calculation
-complex_t FastSin(const complex_t& x);
+complex_t FastSin(const complex_t &x);
//! fast complex cosine calculation
-complex_t FastCos(const complex_t& x);
+complex_t FastCos(const complex_t &x);
//! simultaneous complex sine and cosine calculations
-void FastSinCos(const complex_t& x, complex_t& xsin, complex_t& xcos);
+void FastSinCos(const complex_t &x, complex_t &xsin, complex_t &xcos);
} // Namespace MathFunctions
@@ -118,14 +118,15 @@ inline double MathFunctions::Sinc(double value) // Sin(x)/x
return gsl_sf_sinc(value/M_PI);
}
-inline complex_t MathFunctions::Sinc(const complex_t& value) // Sin(x)/x
+// TODO: protection against complex number like (-246.977,-399.616)
+inline complex_t MathFunctions::Sinc(const complex_t &value) // Sin(x)/x
{
if(std::abs(value)<Numeric::double_epsilon)
return complex_t(1.0, 0.0);
return std::sin(value)/value;
}
-inline complex_t MathFunctions::Laue(const complex_t& value, size_t N) // Exp(iNx/2)*Sin((N+1)x)/Sin(x)
+inline complex_t MathFunctions::Laue(const complex_t &value, size_t N) // Exp(iNx/2)*Sin((N+1)x)/Sin(x)
{
if (N==0)
return complex_t(1.0, 0.0);
@@ -157,22 +158,22 @@ inline double MathFunctions::FastCos(const double& x) {
}
//! fast complex sine calculation
-inline complex_t MathFunctions::FastSin(const complex_t& x) {
+inline complex_t MathFunctions::FastSin(const complex_t &x) {
// sin(a+bi) = sin(a)cosh(b) + i*cos(a)*sinh(b);
//return complex_t( FastSin(x.real())*std::cosh(x.imag()), FastCos(x.real())*std::sinh(x.imag()));
return complex_t( std::sin(x.real())*std::cosh(x.imag()), std::cos(x.real())*std::sinh(x.imag()));
}
//! fast complex cosine calculation
-inline complex_t MathFunctions::FastCos(const complex_t& x) {
+inline complex_t MathFunctions::FastCos(const complex_t &x) {
// cos(a+bi) = cos(a)cosh(b) - i*sin(a)*sinh(b);
//return complex_t( FastCos(x.real())*std::cosh(x.imag()), -1*FastSin(x.real())*std::sinh(x.imag()));
return complex_t( std::cos(x.real())*std::cosh(x.imag()), -1*std::sin(x.real())*std::sinh(x.imag()));
}
//! simultaneous complex sine and cosine calculations
-inline void MathFunctions::FastSinCos(const complex_t& x,
- complex_t& xsin, complex_t& xcos)
+inline void MathFunctions::FastSinCos(const complex_t &x,
+ complex_t &xsin, complex_t &xcos)
{
double sina = FastSin(x.real());
double cosa = std::sqrt(1-sina*sina);
diff --git a/Core/Tools/inc/Utils.h b/Core/Tools/inc/Utils.h
index d2494a0d31ad5a71ece8dc8f15be36342c622167..2a524c946fee0b2573e66430277fb8e9ef6a5ab6 100644
--- a/Core/Tools/inc/Utils.h
+++ b/Core/Tools/inc/Utils.h
@@ -20,6 +20,7 @@
#include "Exceptions.h"
#include <boost/unordered_map.hpp>
+
namespace Utils {
//! Collection of utilities for std::string.
@@ -152,6 +153,11 @@ class UnorderedMap
container_t m_value_map;
};
+
+//! enables exception throw in the case of NaN, Inf
+void EnableFloatingPointExceptions();
+
+
}
#endif // UTILS_H
diff --git a/App/inc/fp_exception_glibc_extension.h b/Core/Tools/inc/fp_exception_glibc_extension.h
similarity index 100%
rename from App/inc/fp_exception_glibc_extension.h
rename to Core/Tools/inc/fp_exception_glibc_extension.h
diff --git a/Core/Tools/src/Utils.cpp b/Core/Tools/src/Utils.cpp
index 4269442291c28957fd08b72beb977d70196621e9..5ff3800bdf851b8f9b5b0b78cca12755eb4c40bd 100644
--- a/Core/Tools/src/Utils.cpp
+++ b/Core/Tools/src/Utils.cpp
@@ -21,6 +21,14 @@
#include <iomanip>
#include <boost/algorithm/string.hpp>
+#ifdef DEBUG_FPE
+#include <fenv.h>
+#ifdef Q_OS_MAC
+#include "fp_exception_glibc_extension.h"
+#endif
+#endif
+
+
std::string Utils::FileSystem::m_relative_path = "relative path is undefined";
//! Parse double values from string to vector of double
@@ -169,3 +177,19 @@ std::string Utils::FileSystem::GetFileMainExtension(const std::string& name)
return Utils::FileSystem::GetFileExtension(stripped_name);
}
}
+
+
+//! enables exception throw in the case of NaN, Inf
+void Utils::EnableFloatingPointExceptions()
+{
+#ifdef DEBUG_FPE
+ std::cout << "Utils::EnableFloatingPointExceptions() -> Enabling floating point exception debugging"
+ << std::endl;
+ feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
+// feenableexcept(-1);
+#else
+ std::cout << "Utils::EnableFloatingPointExceptions() -> Can't enable floating point exceptions. Available in debug mode only."
+ << std::endl;
+#endif
+}
+
diff --git a/App/src/fp_exception_glibc_extension.c b/Core/Tools/src/fp_exception_glibc_extension.c
similarity index 100%
rename from App/src/fp_exception_glibc_extension.c
rename to Core/Tools/src/fp_exception_glibc_extension.c
diff --git a/Core/python_module.pri b/Core/python_module.pri
index 6d070cc4d410966672a05a2190d70b881a649842..e62304b71b7ab0257710a47c5362418f69927b63 100644
--- a/Core/python_module.pri
+++ b/Core/python_module.pri
@@ -59,6 +59,7 @@ HEADERS += \
PythonAPI/inc/MesoCrystal.pypp.h \
PythonAPI/inc/MultiLayer.pypp.h \
PythonAPI/inc/MultiLayerDWBASimulation.pypp.h \
+ PythonAPI/inc/ndimdata_t.pypp.h \
PythonAPI/inc/OpticalFresnel.pypp.h \
PythonAPI/inc/ParameterPool.pypp.h \
PythonAPI/inc/Particle.pypp.h \
@@ -85,8 +86,11 @@ HEADERS += \
PythonAPI/inc/vdouble1d_t.pypp.h \
PythonAPI/inc/vector_DiffuseParticleInfoPtr_t.pypp.h \
PythonAPI/inc/vector_IFormFactorPtr_t.pypp.h \
+ PythonAPI/inc/vector_integer_t.pypp.h \
PythonAPI/inc/vector_kvector_t.pypp.h \
- PythonAPI/inc/__call_policies.pypp.hpp
+ PythonAPI/inc/vector_longinteger_t.pypp.h \
+ PythonAPI/inc/__call_policies.pypp.hpp \
+ PythonAPI/inc/__convenience.pypp.hpp
SOURCES += \
PythonAPI/src/PythonModule.cpp \
@@ -149,6 +153,7 @@ SOURCES += \
PythonAPI/src/MesoCrystal.pypp.cpp \
PythonAPI/src/MultiLayer.pypp.cpp \
PythonAPI/src/MultiLayerDWBASimulation.pypp.cpp \
+ PythonAPI/src/ndimdata_t.pypp.cpp \
PythonAPI/src/OpticalFresnel.pypp.cpp \
PythonAPI/src/ParameterPool.pypp.cpp \
PythonAPI/src/Particle.pypp.cpp \
@@ -175,7 +180,9 @@ SOURCES += \
PythonAPI/src/vdouble1d_t.pypp.cpp \
PythonAPI/src/vector_DiffuseParticleInfoPtr_t.pypp.cpp \
PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp \
- PythonAPI/src/vector_kvector_t.pypp.cpp
+ PythonAPI/src/vector_integer_t.pypp.cpp \
+ PythonAPI/src/vector_kvector_t.pypp.cpp \
+ PythonAPI/src/vector_longinteger_t.pypp.cpp
INCLUDEPATH += ./PythonAPI/inc
DEPENDPATH += ./PythonAPI/inc
diff --git a/Fit/Fit.pro b/Fit/Fit.pro
index 0319d0b9eaaceb5b032696b337e8627d32e2302f..36f668546c3a542b4da729016210aae62fd9a09d 100644
--- a/Fit/Fit.pro
+++ b/Fit/Fit.pro
@@ -6,9 +6,14 @@ TEMPLATE = lib
CONFIG += plugin # to remove versions from file name
QT -= core gui
QMAKE_EXTENSION_SHLIB = so # making standard *.so extension
-# CONFIG += BORNAGAIN_PYTHON
+#CONFIG += BORNAGAIN_PYTHON
CONFIG += BORNAGAIN_ROOT
+# -----------------------------------------------------------------------------
+# common project settings
+# -----------------------------------------------------------------------------
+include($$PWD/../shared.pri)
+
# -----------------------------------------------------------------------------
# source and headers
# -----------------------------------------------------------------------------
@@ -55,9 +60,5 @@ INSTALLS += target
QMAKE_DISTCLEAN += $$target.path/$(TARGET)
QMAKE_POST_LINK = (make install)
-# -----------------------------------------------------------------------------
-# common project settings
-# -----------------------------------------------------------------------------
-include($$PWD/../shared.pri)
diff --git a/Fit/PythonAPI/inc/FitSuiteParameters.pypp.h b/Fit/PythonAPI/inc/FitSuiteParameters.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..0cbc4c7700505c7f1d119e6bcdf57314a5de0cb2
--- /dev/null
+++ b/Fit/PythonAPI/inc/FitSuiteParameters.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef FitSuiteParameters_hpp__pyplusplus_wrapper
+#define FitSuiteParameters_hpp__pyplusplus_wrapper
+
+void register_FitSuiteParameters_class();
+
+#endif//FitSuiteParameters_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/IOutputDataNormalizer.pypp.h b/Fit/PythonAPI/inc/IOutputDataNormalizer.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..031b271dd52eac136eabdf0b9d078a6e72c9c6fe
--- /dev/null
+++ b/Fit/PythonAPI/inc/IOutputDataNormalizer.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef IOutputDataNormalizer_hpp__pyplusplus_wrapper
+#define IOutputDataNormalizer_hpp__pyplusplus_wrapper
+
+void register_IOutputDataNormalizer_class();
+
+#endif//IOutputDataNormalizer_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/ISquaredFunction.pypp.h b/Fit/PythonAPI/inc/ISquaredFunction.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..da9d91e883e8d2a98966e65386dfb00221aadc4d
--- /dev/null
+++ b/Fit/PythonAPI/inc/ISquaredFunction.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef ISquaredFunction_hpp__pyplusplus_wrapper
+#define ISquaredFunction_hpp__pyplusplus_wrapper
+
+void register_ISquaredFunction_class();
+
+#endif//ISquaredFunction_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/OutputDataNormalizer.pypp.h b/Fit/PythonAPI/inc/OutputDataNormalizer.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..6da897293fb34277bf61dc95fbb4d8e26de7e38d
--- /dev/null
+++ b/Fit/PythonAPI/inc/OutputDataNormalizer.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef OutputDataNormalizer_hpp__pyplusplus_wrapper
+#define OutputDataNormalizer_hpp__pyplusplus_wrapper
+
+void register_OutputDataNormalizer_class();
+
+#endif//OutputDataNormalizer_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h b/Fit/PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ea81066d4d2a082da40fef83bc71c5a87455a6a
--- /dev/null
+++ b/Fit/PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef OutputDataSimpleNormalizer_hpp__pyplusplus_wrapper
+#define OutputDataSimpleNormalizer_hpp__pyplusplus_wrapper
+
+void register_OutputDataSimpleNormalizer_class();
+
+#endif//OutputDataSimpleNormalizer_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/PythonInterface_enumerations.pypp.h b/Fit/PythonAPI/inc/PythonInterface_enumerations.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..6e018af0847a957a93bda749d8c7b7fbbb9c99b1
--- /dev/null
+++ b/Fit/PythonAPI/inc/PythonInterface_enumerations.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef PythonInterface_enumerations_hpp__pyplusplus_wrapper
+#define PythonInterface_enumerations_hpp__pyplusplus_wrapper
+
+void register_enumerations();
+
+#endif//PythonInterface_enumerations_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/PythonInterface_free_functions.pypp.h b/Fit/PythonAPI/inc/PythonInterface_free_functions.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..0600a558b716e773e0d47ed4785fe07b4c005951
--- /dev/null
+++ b/Fit/PythonAPI/inc/PythonInterface_free_functions.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef PythonInterface_free_functions_hpp__pyplusplus_wrapper
+#define PythonInterface_free_functions_hpp__pyplusplus_wrapper
+
+void register_free_functions();
+
+#endif//PythonInterface_free_functions_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/PythonPlusplusFitHelper.h b/Fit/PythonAPI/inc/PythonPlusplusFitHelper.h
index df7ec92fe581e0001fa0c307b1297e4cfcecf44e..79317f5115968d99c5af1ac34cedc4d4a521bc71 100644
--- a/Fit/PythonAPI/inc/PythonPlusplusFitHelper.h
+++ b/Fit/PythonAPI/inc/PythonPlusplusFitHelper.h
@@ -16,29 +16,32 @@
#include "OutputData.h"
+#include "Types.h"
-// there is some weared behavior of pyplusplus
-// without this definition it gets screwed up as soon as it sees in the code vector<kvector> like in LatticeBasis.h
+
+
+// this is special namespace to help Py++ generate correct names
namespace pyplusplus {
namespace aliases {
- typedef OutputData<double > ndimdata_t;
-// typedef OutputDataIterator<double, outputdata_t > outputdataiterator_t;
+// typedef OutputData<double > ndimdata_t;
+// typedef OutputDataIterator<double, ndimdata_t > ndimiterator_t;
typedef std::vector<double > vdouble1d_t;
-// typedef std::vector<vdouble1d_t > vdouble2d_t;
+ typedef std::vector<vdouble1d_t > vdouble2d_t;
// typedef std::vector<int > vint1d_t;
// typedef std::vector<size_t > vsizet_t;
+ typedef std::vector<complex_t > vcomplex1d_t;
}
}
-
-// class to help pyplusplus to expose kvector_t in python during automatic code generation
+// helper class to provide Py++ with explicit template instantiations
class PythonPlusplusFitHelper
{
public:
- size_t pyplusplus_boost_outputdata() { return sizeof(pyplusplus::aliases::ndimdata_t); }
-// size_t pyplusplus_boost_outputdata_iterator() { return sizeof(pyplusplus::aliases::outputdataiterator_t); }
+// size_t pyplusplus_boost_outputdata() { return sizeof(pyplusplus::aliases::ndimdata_t); }
+// size_t pyplusplus_boost_outputdata_iterator() { return sizeof(pyplusplus::aliases::ndimiterator_t); }
size_t pyplusplus_boost_vdouble1d() { return sizeof(pyplusplus::aliases::vdouble1d_t); }
+ size_t pyplusplus_boost_vcomplex1d() { return sizeof(pyplusplus::aliases::vcomplex1d_t); }
};
#endif // PYTHONFITPLUSPLUSHELPER_H
diff --git a/Fit/PythonAPI/inc/SquaredFunctionDefault.pypp.h b/Fit/PythonAPI/inc/SquaredFunctionDefault.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..da775ae6412377c4617fa9c9047c1546a0e41293
--- /dev/null
+++ b/Fit/PythonAPI/inc/SquaredFunctionDefault.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef SquaredFunctionDefault_hpp__pyplusplus_wrapper
+#define SquaredFunctionDefault_hpp__pyplusplus_wrapper
+
+void register_SquaredFunctionDefault_class();
+
+#endif//SquaredFunctionDefault_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/SquaredFunctionWhichOnlyWorks.pypp.h b/Fit/PythonAPI/inc/SquaredFunctionWhichOnlyWorks.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..22055647bf16ad3413149cf2694c8b2a36ac9260
--- /dev/null
+++ b/Fit/PythonAPI/inc/SquaredFunctionWhichOnlyWorks.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef SquaredFunctionWhichOnlyWorks_hpp__pyplusplus_wrapper
+#define SquaredFunctionWhichOnlyWorks_hpp__pyplusplus_wrapper
+
+void register_SquaredFunctionWhichOnlyWorks_class();
+
+#endif//SquaredFunctionWhichOnlyWorks_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/SquaredFunctionWithGaussianError.pypp.h b/Fit/PythonAPI/inc/SquaredFunctionWithGaussianError.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..05fa85f61f1d043bc4639a3106066eb3c688d60d
--- /dev/null
+++ b/Fit/PythonAPI/inc/SquaredFunctionWithGaussianError.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef SquaredFunctionWithGaussianError_hpp__pyplusplus_wrapper
+#define SquaredFunctionWithGaussianError_hpp__pyplusplus_wrapper
+
+void register_SquaredFunctionWithGaussianError_class();
+
+#endif//SquaredFunctionWithGaussianError_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h b/Fit/PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h
new file mode 100644
index 0000000000000000000000000000000000000000..81573c322a50d1fb9a57c2e75e8aec4d8b2c64bf
--- /dev/null
+++ b/Fit/PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h
@@ -0,0 +1,8 @@
+// This file has been generated by Py++.
+
+#ifndef SquaredFunctionWithSystematicError_hpp__pyplusplus_wrapper
+#define SquaredFunctionWithSystematicError_hpp__pyplusplus_wrapper
+
+void register_SquaredFunctionWithSystematicError_class();
+
+#endif//SquaredFunctionWithSystematicError_hpp__pyplusplus_wrapper
diff --git a/Fit/PythonAPI/src/AttLimits.pypp.cpp b/Fit/PythonAPI/src/AttLimits.pypp.cpp
index 7897f3c7dd532e0dc2e30bdf73cfc79b29897b4c..bfc6f3e51f1c83ed256319333ffed26b1f02c3a2 100644
--- a/Fit/PythonAPI/src/AttLimits.pypp.cpp
+++ b/Fit/PythonAPI/src/AttLimits.pypp.cpp
@@ -12,16 +12,19 @@ GCC_DIAG_ON(missing-field-initializers);
#include "IMinimizer.h"
#include "ChiSquaredModule.h"
#include "FitSuite.h"
+#include "FitSuiteParameters.h"
#include "MinimizerFactory.h"
-#include "OutputData.h"
#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
#include "AttLimits.pypp.h"
namespace bp = boost::python;
struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
- AttLimits_wrapper(AttLimits const& arg )
+ AttLimits_wrapper(AttLimits const & arg )
: AttLimits( arg )
, bp::wrapper< AttLimits >(){
// copy constructor
@@ -198,7 +201,7 @@ void register_AttLimits_class(){
bp::class_< AttLimits_wrapper >( "AttLimits", bp::init< >() )
.def(
"fixed"
- , (::AttLimits (*)( ))(& ::AttLimits::fixed ) )
+ , (::AttLimits (*)( ))( &::AttLimits::fixed ) )
.def(
"getLowerLimit"
, (double ( ::AttLimits::* )( ) const)(&::AttLimits::getLowerLimit)
@@ -225,14 +228,14 @@ void register_AttLimits_class(){
, (bool ( AttLimits_wrapper::* )( ) const)(&AttLimits_wrapper::default_isFixed) )
.def(
"limited"
- , (::AttLimits (*)( double,double ))(& ::AttLimits::limited )
+ , (::AttLimits (*)( double,double ))( &::AttLimits::limited )
, ( bp::arg("left_bound_value"), bp::arg("right_bound_value") ) )
.def(
"limitless"
- , (::AttLimits (*)( ))(& ::AttLimits::limitless ) )
+ , (::AttLimits (*)( ))( &::AttLimits::limitless ) )
.def(
"lowerLimited"
- , (::AttLimits (*)( double ))(& ::AttLimits::lowerLimited )
+ , (::AttLimits (*)( double ))( &::AttLimits::lowerLimited )
, ( bp::arg("bound_value") ) )
.def(
"removeLimits"
@@ -268,7 +271,7 @@ void register_AttLimits_class(){
, ( bp::arg("value") ) )
.def(
"upperLimited"
- , (::AttLimits (*)( double ))(& ::AttLimits::upperLimited )
+ , (::AttLimits (*)( double ))( &::AttLimits::upperLimited )
, ( bp::arg("bound_value") ) )
.staticmethod( "fixed" )
.staticmethod( "limited" )
diff --git a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
index 97afc23528feb38d4f8ef0d2212ea9ac8d1f5596..d50945b08c0bfacad13d1621303c203c07493769 100644
--- a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
@@ -12,9 +12,12 @@ GCC_DIAG_ON(missing-field-initializers);
#include "IMinimizer.h"
#include "ChiSquaredModule.h"
#include "FitSuite.h"
+#include "FitSuiteParameters.h"
#include "MinimizerFactory.h"
-#include "OutputData.h"
#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
#include "ChiSquaredModule.pypp.h"
namespace bp = boost::python;
@@ -28,7 +31,7 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
}
- ChiSquaredModule_wrapper(::ChiSquaredModule const& other )
+ ChiSquaredModule_wrapper(::ChiSquaredModule const & other )
: ChiSquaredModule( boost::ref(other) )
, bp::wrapper< ChiSquaredModule >(){
// copy constructor
@@ -143,7 +146,7 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
return IChiSquaredModule::getValue( );
}
- virtual void setFittingDataSelector( ::IFittingDataSelector const& selector ) {
+ virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
else{
@@ -151,11 +154,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
}
}
- void default_setFittingDataSelector( ::IFittingDataSelector const& selector ) {
+ void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
- virtual void setIntensityFunction( ::IIntensityFunction const& intensity_function ) {
+ virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
else{
@@ -163,11 +166,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
}
}
- void default_setIntensityFunction( ::IIntensityFunction const& intensity_function ) {
+ void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
- virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const& data_normalizer ) {
+ virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
else{
@@ -175,7 +178,7 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
}
}
- void default_setOutputDataNormalizer( ::IOutputDataNormalizer const& data_normalizer ) {
+ void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -184,7 +187,7 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
void register_ChiSquaredModule_class(){
bp::class_< ChiSquaredModule_wrapper, bp::bases< IChiSquaredModule > >( "ChiSquaredModule", bp::init< >() )
- .def( bp::init< ChiSquaredModule const& >(( bp::arg("other") )) )
+ .def( bp::init< ChiSquaredModule const & >(( bp::arg("other") )) )
.def(
"calculateChiSquared"
, (double ( ::ChiSquaredModule::* )( ) )(&::ChiSquaredModule::calculateChiSquared)
@@ -230,18 +233,18 @@ void register_ChiSquaredModule_class(){
, (double ( ChiSquaredModule_wrapper::* )( ) const)(&ChiSquaredModule_wrapper::default_getValue) )
.def(
"setFittingDataSelector"
- , (void ( ::IChiSquaredModule::* )( ::IFittingDataSelector const& ) )(&::IChiSquaredModule::setFittingDataSelector)
- , (void ( ChiSquaredModule_wrapper::* )( ::IFittingDataSelector const& ) )(&ChiSquaredModule_wrapper::default_setFittingDataSelector)
+ , (void ( ::IChiSquaredModule::* )( ::IFittingDataSelector const & ) )(&::IChiSquaredModule::setFittingDataSelector)
+ , (void ( ChiSquaredModule_wrapper::* )( ::IFittingDataSelector const & ) )(&ChiSquaredModule_wrapper::default_setFittingDataSelector)
, ( bp::arg("selector") ) )
.def(
"setIntensityFunction"
- , (void ( ::IChiSquaredModule::* )( ::IIntensityFunction const& ) )(&::IChiSquaredModule::setIntensityFunction)
- , (void ( ChiSquaredModule_wrapper::* )( ::IIntensityFunction const& ) )(&ChiSquaredModule_wrapper::default_setIntensityFunction)
+ , (void ( ::IChiSquaredModule::* )( ::IIntensityFunction const & ) )(&::IChiSquaredModule::setIntensityFunction)
+ , (void ( ChiSquaredModule_wrapper::* )( ::IIntensityFunction const & ) )(&ChiSquaredModule_wrapper::default_setIntensityFunction)
, ( bp::arg("intensity_function") ) )
.def(
"setOutputDataNormalizer"
- , (void ( ::IChiSquaredModule::* )( ::IOutputDataNormalizer const& ) )(&::IChiSquaredModule::setOutputDataNormalizer)
- , (void ( ChiSquaredModule_wrapper::* )( ::IOutputDataNormalizer const& ) )(&ChiSquaredModule_wrapper::default_setOutputDataNormalizer)
+ , (void ( ::IChiSquaredModule::* )( ::IOutputDataNormalizer const & ) )(&::IChiSquaredModule::setOutputDataNormalizer)
+ , (void ( ChiSquaredModule_wrapper::* )( ::IOutputDataNormalizer const & ) )(&ChiSquaredModule_wrapper::default_setOutputDataNormalizer)
, ( bp::arg("data_normalizer") ) );
}
diff --git a/Fit/PythonAPI/src/FitSuite.pypp.cpp b/Fit/PythonAPI/src/FitSuite.pypp.cpp
index 62a1ec8cca13bc549ecd39b3099adf9d545f6d48..49b1dc2d56f42094dbddfb7482c74d6be83bba16 100644
--- a/Fit/PythonAPI/src/FitSuite.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuite.pypp.cpp
@@ -12,9 +12,12 @@ GCC_DIAG_ON(missing-field-initializers);
#include "IMinimizer.h"
#include "ChiSquaredModule.h"
#include "FitSuite.h"
+#include "FitSuiteParameters.h"
#include "MinimizerFactory.h"
-#include "OutputData.h"
#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
#include "FitSuite.pypp.h"
namespace bp = boost::python;
@@ -48,33 +51,41 @@ void register_FitSuite_class(){
.def( bp::init< >() )
.def(
"addFitParameter"
- , (void ( ::FitSuite::* )( ::std::string const& ,double,double,::AttLimits const& ,double ) )(& ::FitSuite::addFitParameter )
+ , (void ( ::FitSuite::* )( ::std::string const &,double,double,::AttLimits const &,double ) )( &::FitSuite::addFitParameter )
, ( bp::arg("name"), bp::arg("value"), bp::arg("step"), bp::arg("attlim")=AttLimits::limitless( ), bp::arg("error")=0.0 ) )
.def(
"addFitParameter"
- , (void ( ::FitSuite::* )( ::std::string const& ,double,::AttLimits const& ,double ) )(& ::FitSuite::addFitParameter )
+ , (void ( ::FitSuite::* )( ::std::string const &,double,::AttLimits const &,double ) )( &::FitSuite::addFitParameter )
, ( bp::arg("name"), bp::arg("value"), bp::arg("attlim")=AttLimits::limitless( ), bp::arg("error")=0.0 ) )
.def(
"addSimulationAndRealData"
- , (void ( ::FitSuite::* )( ::Simulation const& ,::OutputData< double > const& ,::IChiSquaredModule const& ) )(& ::FitSuite::addSimulationAndRealData )
+ , (void ( ::FitSuite::* )( ::Simulation const &,::OutputData< double > const &,::IChiSquaredModule const & ) )( &::FitSuite::addSimulationAndRealData )
, ( bp::arg("simulation"), bp::arg("real_data"), bp::arg("chi2_module")=ChiSquaredModule() ) )
+ .def(
+ "getFitParameters"
+ , (::FitSuiteParameters * ( ::FitSuite::* )( ) )( &::FitSuite::getFitParameters )
+ , bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getMinimizer"
- , (::IMinimizer * ( ::FitSuite::* )( ) )(& ::FitSuite::getMinimizer )
+ , (::IMinimizer * ( ::FitSuite::* )( ) )( &::FitSuite::getMinimizer )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getNCalls"
, (::size_t ( ::FitSuite::* )( ) const)( &::FitSuite::getNCalls ) )
+ .def(
+ "initPrint"
+ , (void ( ::FitSuite::* )( int ) )( &::FitSuite::initPrint )
+ , ( bp::arg("print_every_nth") ) )
.def(
"printResults"
- , (void ( ::FitSuite::* )( ) const)(& ::FitSuite::printResults ) )
+ , (void ( ::FitSuite::* )( ) const)( &::FitSuite::printResults ) )
.def(
"runFit"
, (void ( ::FitSuite::* )( ) )(&::FitSuite::runFit)
, (void ( FitSuite_wrapper::* )( ) )(&FitSuite_wrapper::default_runFit) )
.def(
"setMinimizer"
- , (void ( ::FitSuite::* )( ::IMinimizer * ) )(& ::FitSuite::setMinimizer )
+ , (void ( ::FitSuite::* )( ::IMinimizer * ) )( &::FitSuite::setMinimizer )
, ( bp::arg("minimizer") ) );
}
diff --git a/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp b/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bb9d8cd9002e06df9790cf75ddc4a723a0383ecf
--- /dev/null
+++ b/Fit/PythonAPI/src/FitSuiteParameters.pypp.cpp
@@ -0,0 +1,32 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "FitSuiteParameters.pypp.h"
+
+namespace bp = boost::python;
+
+void register_FitSuiteParameters_class(){
+
+ bp::class_< FitSuiteParameters >( "FitSuiteParameters", bp::init< >() )
+ .def(
+ "getValues"
+ , (::std::vector< double > ( ::FitSuiteParameters::* )( ) const)( &::FitSuiteParameters::getValues ) );
+
+}
diff --git a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
index e8670fed99161d03686f5c207c272b32925566c1..60f604994c4b168f02b0ede26161d1ccf78bc2bf 100644
--- a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
@@ -12,9 +12,12 @@ GCC_DIAG_ON(missing-field-initializers);
#include "IMinimizer.h"
#include "ChiSquaredModule.h"
#include "FitSuite.h"
+#include "FitSuiteParameters.h"
#include "MinimizerFactory.h"
-#include "OutputData.h"
#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
#include "IChiSquaredModule.pypp.h"
namespace bp = boost::python;
@@ -115,7 +118,7 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
return IChiSquaredModule::getValue( );
}
- virtual void setFittingDataSelector( ::IFittingDataSelector const& selector ) {
+ virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
else{
@@ -123,11 +126,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
}
}
- void default_setFittingDataSelector( ::IFittingDataSelector const& selector ) {
+ void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
- virtual void setIntensityFunction( ::IIntensityFunction const& intensity_function ) {
+ virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
else{
@@ -135,11 +138,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
}
}
- void default_setIntensityFunction( ::IIntensityFunction const& intensity_function ) {
+ void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
- virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const& data_normalizer ) {
+ virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
else{
@@ -147,7 +150,7 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
}
}
- void default_setOutputDataNormalizer( ::IOutputDataNormalizer const& data_normalizer ) {
+ void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -189,7 +192,7 @@ void register_IChiSquaredModule_class(){
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getRealData"
- , (::OutputData< double > const * ( ::IChiSquaredModule::* )( ) const)(& ::IChiSquaredModule::getRealData )
+ , (::OutputData< double > const * ( ::IChiSquaredModule::* )( ) const)( &::IChiSquaredModule::getRealData )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getResidualValue"
@@ -198,11 +201,11 @@ void register_IChiSquaredModule_class(){
, ( bp::arg("arg0") ) )
.def(
"getSimulationData"
- , (::OutputData< double > const * ( ::IChiSquaredModule::* )( ) const)(& ::IChiSquaredModule::getSimulationData )
+ , (::OutputData< double > const * ( ::IChiSquaredModule::* )( ) const)( &::IChiSquaredModule::getSimulationData )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getSquaredFunction"
- , (::ISquaredFunction const * ( ::IChiSquaredModule::* )( ) const)(& ::IChiSquaredModule::getSquaredFunction )
+ , (::ISquaredFunction const * ( ::IChiSquaredModule::* )( ) const)( &::IChiSquaredModule::getSquaredFunction )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"getValue"
@@ -210,30 +213,30 @@ void register_IChiSquaredModule_class(){
, (double ( IChiSquaredModule_wrapper::* )( ) const)(&IChiSquaredModule_wrapper::default_getValue) )
.def(
"setChiSquaredFunction"
- , (void ( ::IChiSquaredModule::* )( ::ISquaredFunction const& ) )(& ::IChiSquaredModule::setChiSquaredFunction )
+ , (void ( ::IChiSquaredModule::* )( ::ISquaredFunction const & ) )( &::IChiSquaredModule::setChiSquaredFunction )
, ( bp::arg("squared_function") ) )
.def(
"setFittingDataSelector"
- , (void ( ::IChiSquaredModule::* )( ::IFittingDataSelector const& ) )(&::IChiSquaredModule::setFittingDataSelector)
- , (void ( IChiSquaredModule_wrapper::* )( ::IFittingDataSelector const& ) )(&IChiSquaredModule_wrapper::default_setFittingDataSelector)
+ , (void ( ::IChiSquaredModule::* )( ::IFittingDataSelector const & ) )(&::IChiSquaredModule::setFittingDataSelector)
+ , (void ( IChiSquaredModule_wrapper::* )( ::IFittingDataSelector const & ) )(&IChiSquaredModule_wrapper::default_setFittingDataSelector)
, ( bp::arg("selector") ) )
.def(
"setIntensityFunction"
- , (void ( ::IChiSquaredModule::* )( ::IIntensityFunction const& ) )(&::IChiSquaredModule::setIntensityFunction)
- , (void ( IChiSquaredModule_wrapper::* )( ::IIntensityFunction const& ) )(&IChiSquaredModule_wrapper::default_setIntensityFunction)
+ , (void ( ::IChiSquaredModule::* )( ::IIntensityFunction const & ) )(&::IChiSquaredModule::setIntensityFunction)
+ , (void ( IChiSquaredModule_wrapper::* )( ::IIntensityFunction const & ) )(&IChiSquaredModule_wrapper::default_setIntensityFunction)
, ( bp::arg("intensity_function") ) )
.def(
"setNdegreeOfFreedom"
- , (void ( ::IChiSquaredModule::* )( int ) )(& ::IChiSquaredModule::setNdegreeOfFreedom )
+ , (void ( ::IChiSquaredModule::* )( int ) )( &::IChiSquaredModule::setNdegreeOfFreedom )
, ( bp::arg("ndegree_of_freedom") ) )
.def(
"setOutputDataNormalizer"
- , (void ( ::IChiSquaredModule::* )( ::IOutputDataNormalizer const& ) )(&::IChiSquaredModule::setOutputDataNormalizer)
- , (void ( IChiSquaredModule_wrapper::* )( ::IOutputDataNormalizer const& ) )(&IChiSquaredModule_wrapper::default_setOutputDataNormalizer)
+ , (void ( ::IChiSquaredModule::* )( ::IOutputDataNormalizer const & ) )(&::IChiSquaredModule::setOutputDataNormalizer)
+ , (void ( IChiSquaredModule_wrapper::* )( ::IOutputDataNormalizer const & ) )(&IChiSquaredModule_wrapper::default_setOutputDataNormalizer)
, ( bp::arg("data_normalizer") ) )
.def(
"setRealAndSimulatedData"
- , (void ( ::IChiSquaredModule::* )( ::OutputData< double > const& ,::OutputData< double > const& ) )(& ::IChiSquaredModule::setRealAndSimulatedData )
+ , (void ( ::IChiSquaredModule::* )( ::OutputData< double > const &,::OutputData< double > const & ) )( &::IChiSquaredModule::setRealAndSimulatedData )
, ( bp::arg("real_data"), bp::arg("simulation_data") ) );
}
diff --git a/Fit/PythonAPI/src/IMinimizer.pypp.cpp b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
index 5d7cce4c121f10fc9ce0f4a3473d50ec6ef459bd..4e2d7c69af6ac49a62ff5f3102641231fd85938d 100644
--- a/Fit/PythonAPI/src/IMinimizer.pypp.cpp
+++ b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
@@ -12,9 +12,12 @@ GCC_DIAG_ON(missing-field-initializers);
#include "IMinimizer.h"
#include "ChiSquaredModule.h"
#include "FitSuite.h"
+#include "FitSuiteParameters.h"
#include "MinimizerFactory.h"
-#include "OutputData.h"
#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
#include "IMinimizer.pypp.h"
namespace bp = boost::python;
@@ -129,7 +132,7 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
IMinimizer::printResults( );
}
- virtual void setOptions( ::std::string const& options ) {
+ virtual void setOptions( ::std::string const & options ) {
if( bp::override func_setOptions = this->get_override( "setOptions" ) )
func_setOptions( options );
else{
@@ -137,11 +140,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
}
}
- void default_setOptions( ::std::string const& options ) {
+ void default_setOptions( ::std::string const & options ) {
IMinimizer::setOptions( options );
}
- virtual void setParameters( ::FitSuiteParameters const& parameters ) {
+ virtual void setParameters( ::FitSuiteParameters const & parameters ) {
if( bp::override func_setParameters = this->get_override( "setParameters" ) )
func_setParameters( boost::ref(parameters) );
else{
@@ -149,7 +152,7 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
}
}
- void default_setParameters( ::FitSuiteParameters const& parameters ) {
+ void default_setParameters( ::FitSuiteParameters const & parameters ) {
IMinimizer::setParameters( boost::ref(parameters) );
}
@@ -197,13 +200,13 @@ void register_IMinimizer_class(){
, (void ( IMinimizer_wrapper::* )( ) const)(&IMinimizer_wrapper::default_printResults) )
.def(
"setOptions"
- , (void ( ::IMinimizer::* )( ::std::string const& ) )(&::IMinimizer::setOptions)
- , (void ( IMinimizer_wrapper::* )( ::std::string const& ) )(&IMinimizer_wrapper::default_setOptions)
+ , (void ( ::IMinimizer::* )( ::std::string const & ) )(&::IMinimizer::setOptions)
+ , (void ( IMinimizer_wrapper::* )( ::std::string const & ) )(&IMinimizer_wrapper::default_setOptions)
, ( bp::arg("options") ) )
.def(
"setParameters"
- , (void ( ::IMinimizer::* )( ::FitSuiteParameters const& ) )(&::IMinimizer::setParameters)
- , (void ( IMinimizer_wrapper::* )( ::FitSuiteParameters const& ) )(&IMinimizer_wrapper::default_setParameters)
+ , (void ( ::IMinimizer::* )( ::FitSuiteParameters const & ) )(&::IMinimizer::setParameters)
+ , (void ( IMinimizer_wrapper::* )( ::FitSuiteParameters const & ) )(&IMinimizer_wrapper::default_setParameters)
, ( bp::arg("parameters") ) );
}
diff --git a/Fit/PythonAPI/src/IOutputDataNormalizer.pypp.cpp b/Fit/PythonAPI/src/IOutputDataNormalizer.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..33ea7378bfb478fcf1473e63087d32ee67f60bfe
--- /dev/null
+++ b/Fit/PythonAPI/src/IOutputDataNormalizer.pypp.cpp
@@ -0,0 +1,68 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "IOutputDataNormalizer.pypp.h"
+
+namespace bp = boost::python;
+
+struct IOutputDataNormalizer_wrapper : IOutputDataNormalizer, bp::wrapper< IOutputDataNormalizer > {
+
+ IOutputDataNormalizer_wrapper()
+ : IOutputDataNormalizer()
+ , bp::wrapper< IOutputDataNormalizer >(){
+ // null constructor
+
+ }
+
+ virtual ::IOutputDataNormalizer * clone( ) const {
+ bp::override func_clone = this->get_override( "clone" );
+ return func_clone( );
+ }
+
+ virtual ::OutputData< double > * createNormalizedData( ::OutputData< double > const & data ) const {
+ bp::override func_createNormalizedData = this->get_override( "createNormalizedData" );
+ return func_createNormalizedData( boost::ref(data) );
+ }
+
+ virtual void setMaximumIntensity( double arg0 ){
+ bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" );
+ func_setMaximumIntensity( arg0 );
+ }
+
+};
+
+void register_IOutputDataNormalizer_class(){
+
+ bp::class_< IOutputDataNormalizer_wrapper, boost::noncopyable >( "IOutputDataNormalizer" )
+ .def(
+ "clone"
+ , bp::pure_virtual( (::IOutputDataNormalizer * ( ::IOutputDataNormalizer::* )( ) const)(&::IOutputDataNormalizer::clone) )
+ , bp::return_value_policy< bp::manage_new_object >() )
+ .def(
+ "createNormalizedData"
+ , bp::pure_virtual( (::OutputData< double > * ( ::IOutputDataNormalizer::* )( ::OutputData< double > const & ) const)(&::IOutputDataNormalizer::createNormalizedData) )
+ , ( bp::arg("data") )
+ , bp::return_value_policy< bp::manage_new_object >() )
+ .def(
+ "setMaximumIntensity"
+ , bp::pure_virtual( (void ( ::IOutputDataNormalizer::* )( double ) )(&::IOutputDataNormalizer::setMaximumIntensity) )
+ , ( bp::arg("arg0") ) );
+
+}
diff --git a/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9a2ed8d781588f1806c489c37fcb1a73bd68f6df
--- /dev/null
+++ b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
@@ -0,0 +1,75 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "ISquaredFunction.pypp.h"
+
+namespace bp = boost::python;
+
+struct ISquaredFunction_wrapper : ISquaredFunction, bp::wrapper< ISquaredFunction > {
+
+ ISquaredFunction_wrapper()
+ : ISquaredFunction()
+ , bp::wrapper< ISquaredFunction >(){
+ // null constructor
+
+ }
+
+ virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
+ bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" );
+ return func_calculateSquaredDifference( real_value, simulated_value );
+ }
+
+ virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
+ if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
+ return func_calculateSquaredError( real_value, simulated_value );
+ else{
+ return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
+ }
+ }
+
+ double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
+ return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
+ }
+
+ virtual ::ISquaredFunction * clone( ) const {
+ bp::override func_clone = this->get_override( "clone" );
+ return func_clone( );
+ }
+
+};
+
+void register_ISquaredFunction_class(){
+
+ bp::class_< ISquaredFunction_wrapper, boost::noncopyable >( "ISquaredFunction" )
+ .def(
+ "calculateSquaredDifference"
+ , bp::pure_virtual( (double ( ::ISquaredFunction::* )( double,double ) const)(&::ISquaredFunction::calculateSquaredDifference) )
+ , ( bp::arg("real_value"), bp::arg("simulated_value") ) )
+ .def(
+ "calculateSquaredError"
+ , (double ( ::ISquaredFunction::* )( double,double ) const)(&::ISquaredFunction::calculateSquaredError)
+ , (double ( ISquaredFunction_wrapper::* )( double,double ) const)(&ISquaredFunction_wrapper::default_calculateSquaredError)
+ , ( bp::arg("real_value"), bp::arg("simulated_value")=0.0 ) )
+ .def(
+ "clone"
+ , bp::pure_virtual( (::ISquaredFunction * ( ::ISquaredFunction::* )( ) const)(&::ISquaredFunction::clone) )
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+}
diff --git a/Fit/PythonAPI/src/MinimizerFactory.pypp.cpp b/Fit/PythonAPI/src/MinimizerFactory.pypp.cpp
index b864fe717e5b8e941adffb599b532dabe5ac3104..274d6b509b7a3ad3f452a047722ca64d9f8c5c35 100644
--- a/Fit/PythonAPI/src/MinimizerFactory.pypp.cpp
+++ b/Fit/PythonAPI/src/MinimizerFactory.pypp.cpp
@@ -12,9 +12,12 @@ GCC_DIAG_ON(missing-field-initializers);
#include "IMinimizer.h"
#include "ChiSquaredModule.h"
#include "FitSuite.h"
+#include "FitSuiteParameters.h"
#include "MinimizerFactory.h"
-#include "OutputData.h"
#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
#include "MinimizerFactory.pypp.h"
namespace bp = boost::python;
@@ -24,12 +27,12 @@ void register_MinimizerFactory_class(){
bp::class_< MinimizerFactory >( "MinimizerFactory" )
.def(
"createMinimizer"
- , (::IMinimizer * (*)( ::std::string const& ,::std::string const& ,::std::string const& ))(& ::MinimizerFactory::createMinimizer )
+ , (::IMinimizer * (*)( ::std::string const &,::std::string const &,::std::string const & ))( &::MinimizerFactory::createMinimizer )
, ( bp::arg("minimizer"), bp::arg("algorithm")=std::basic_string<char, std::char_traits<char>, std::allocator<char> >(), bp::arg("options")=std::basic_string<char, std::char_traits<char>, std::allocator<char> >() )
, bp::return_value_policy< bp::reference_existing_object >() )
.def(
"print_catalogue"
- , (void (*)( ))(& ::MinimizerFactory::print_catalogue ) )
+ , (void (*)( ))( &::MinimizerFactory::print_catalogue ) )
.staticmethod( "createMinimizer" )
.staticmethod( "print_catalogue" );
diff --git a/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9282a5f164f7161b94e0e37f79d8ed73ced65f2b
--- /dev/null
+++ b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
@@ -0,0 +1,99 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "OutputDataNormalizer.pypp.h"
+
+namespace bp = boost::python;
+
+struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputDataNormalizer > {
+
+ OutputDataNormalizer_wrapper(OutputDataNormalizer const & arg )
+ : OutputDataNormalizer( arg )
+ , bp::wrapper< OutputDataNormalizer >(){
+ // copy constructor
+
+ }
+
+ OutputDataNormalizer_wrapper(double scale=1.0e+0, double shift=0.0 )
+ : OutputDataNormalizer( scale, shift )
+ , bp::wrapper< OutputDataNormalizer >(){
+ // constructor
+
+ }
+
+ virtual ::OutputDataNormalizer * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else{
+ return this->OutputDataNormalizer::clone( );
+ }
+ }
+
+ ::OutputDataNormalizer * default_clone( ) const {
+ return OutputDataNormalizer::clone( );
+ }
+
+ 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{
+ return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
+ }
+ }
+
+ ::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
+ return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
+ }
+
+ virtual void setMaximumIntensity( double max_intensity ) {
+ if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
+ func_setMaximumIntensity( max_intensity );
+ else{
+ this->OutputDataNormalizer::setMaximumIntensity( max_intensity );
+ }
+ }
+
+ void default_setMaximumIntensity( double max_intensity ) {
+ OutputDataNormalizer::setMaximumIntensity( max_intensity );
+ }
+
+};
+
+void register_OutputDataNormalizer_class(){
+
+ bp::class_< OutputDataNormalizer_wrapper, bp::bases< IOutputDataNormalizer > >( "OutputDataNormalizer", bp::init< bp::optional< double, double > >(( bp::arg("scale")=1.0e+0, bp::arg("shift")=0.0 )) )
+ .def(
+ "clone"
+ , (::OutputDataNormalizer * ( ::OutputDataNormalizer::* )( ) const)(&::OutputDataNormalizer::clone)
+ , (::OutputDataNormalizer * ( OutputDataNormalizer_wrapper::* )( ) const)(&OutputDataNormalizer_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() )
+ .def(
+ "createNormalizedData"
+ , (::OutputData< double > * ( ::OutputDataNormalizer::* )( ::OutputData< double > const & ) const)(&::OutputDataNormalizer::createNormalizedData)
+ , (::OutputData< double > * ( OutputDataNormalizer_wrapper::* )( ::OutputData< double > const & ) const)(&OutputDataNormalizer_wrapper::default_createNormalizedData)
+ , ( bp::arg("data") )
+ , bp::return_value_policy< bp::manage_new_object >() )
+ .def(
+ "setMaximumIntensity"
+ , (void ( ::OutputDataNormalizer::* )( double ) )(&::OutputDataNormalizer::setMaximumIntensity)
+ , (void ( OutputDataNormalizer_wrapper::* )( double ) )(&OutputDataNormalizer_wrapper::default_setMaximumIntensity)
+ , ( bp::arg("max_intensity") ) );
+
+}
diff --git a/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..65e719b3c98571ac13d2a023419ceb53209f0d16
--- /dev/null
+++ b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
@@ -0,0 +1,99 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "OutputDataSimpleNormalizer.pypp.h"
+
+namespace bp = boost::python;
+
+struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrapper< OutputDataSimpleNormalizer > {
+
+ OutputDataSimpleNormalizer_wrapper(OutputDataSimpleNormalizer const & arg )
+ : OutputDataSimpleNormalizer( arg )
+ , bp::wrapper< OutputDataSimpleNormalizer >(){
+ // copy constructor
+
+ }
+
+ OutputDataSimpleNormalizer_wrapper(double scale=1.0e+0, double shift=0.0 )
+ : OutputDataSimpleNormalizer( scale, shift )
+ , bp::wrapper< OutputDataSimpleNormalizer >(){
+ // constructor
+
+ }
+
+ virtual ::OutputDataSimpleNormalizer * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else{
+ return this->OutputDataSimpleNormalizer::clone( );
+ }
+ }
+
+ ::OutputDataSimpleNormalizer * default_clone( ) const {
+ return OutputDataSimpleNormalizer::clone( );
+ }
+
+ virtual void setMaximumIntensity( double max_intensity ) {
+ if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
+ func_setMaximumIntensity( max_intensity );
+ else{
+ this->OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
+ }
+ }
+
+ void default_setMaximumIntensity( double max_intensity ) {
+ OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
+ }
+
+ 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{
+ return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
+ }
+ }
+
+ ::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
+ return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
+ }
+
+};
+
+void register_OutputDataSimpleNormalizer_class(){
+
+ bp::class_< OutputDataSimpleNormalizer_wrapper, bp::bases< OutputDataNormalizer > >( "OutputDataSimpleNormalizer", bp::init< bp::optional< double, double > >(( bp::arg("scale")=1.0e+0, bp::arg("shift")=0.0 )) )
+ .def(
+ "clone"
+ , (::OutputDataSimpleNormalizer * ( ::OutputDataSimpleNormalizer::* )( ) const)(&::OutputDataSimpleNormalizer::clone)
+ , (::OutputDataSimpleNormalizer * ( OutputDataSimpleNormalizer_wrapper::* )( ) const)(&OutputDataSimpleNormalizer_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() )
+ .def(
+ "setMaximumIntensity"
+ , (void ( ::OutputDataSimpleNormalizer::* )( double ) )(&::OutputDataSimpleNormalizer::setMaximumIntensity)
+ , (void ( OutputDataSimpleNormalizer_wrapper::* )( double ) )(&OutputDataSimpleNormalizer_wrapper::default_setMaximumIntensity)
+ , ( bp::arg("max_intensity") ) )
+ .def(
+ "createNormalizedData"
+ , (::OutputData< double > * ( ::OutputDataNormalizer::* )( ::OutputData< double > const & ) const)(&::OutputDataNormalizer::createNormalizedData)
+ , (::OutputData< double > * ( OutputDataSimpleNormalizer_wrapper::* )( ::OutputData< double > const & ) const)(&OutputDataSimpleNormalizer_wrapper::default_createNormalizedData)
+ , ( bp::arg("data") )
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+}
diff --git a/Fit/PythonAPI/src/PythonInterface_enumerations.pypp.cpp b/Fit/PythonAPI/src/PythonInterface_enumerations.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bb67ac2e7f76cfcb2fe57ff04e88529df379e416
--- /dev/null
+++ b/Fit/PythonAPI/src/PythonInterface_enumerations.pypp.cpp
@@ -0,0 +1,33 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "PythonInterface_enumerations.pypp.h"
+
+namespace bp = boost::python;
+
+void register_enumerations(){
+
+ bp::enum_< MathFunctions::TransformCase>("TransformCase")
+ .value("ForwardFFT", MathFunctions::ForwardFFT)
+ .value("BackwardFFT", MathFunctions::BackwardFFT)
+ .export_values()
+ ;
+
+}
diff --git a/Fit/PythonAPI/src/PythonInterface_free_functions.pypp.cpp b/Fit/PythonAPI/src/PythonInterface_free_functions.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5d46a2e109da8b08070f640e08e258504fa475c3
--- /dev/null
+++ b/Fit/PythonAPI/src/PythonInterface_free_functions.pypp.cpp
@@ -0,0 +1,245 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "PythonInterface_free_functions.pypp.h"
+
+namespace bp = boost::python;
+
+void register_free_functions(){
+
+ { //::MathFunctions::Bessel_C1
+
+ typedef double ( *Bessel_C1_function_type )( double );
+
+ bp::def(
+ "Bessel_C1"
+ , Bessel_C1_function_type( &::MathFunctions::Bessel_C1 )
+ , ( bp::arg("value") ) );
+
+ }
+
+ { //::MathFunctions::Bessel_J1
+
+ typedef double ( *Bessel_J1_function_type )( double );
+
+ bp::def(
+ "Bessel_J1"
+ , Bessel_J1_function_type( &::MathFunctions::Bessel_J1 )
+ , ( bp::arg("value") ) );
+
+ }
+
+ { //::MathFunctions::ConvolveFFT
+
+ typedef ::std::vector< std::complex<double> > ( *ConvolveFFT_function_type )( ::std::vector< double > const &,::std::vector< double > const & );
+
+ bp::def(
+ "ConvolveFFT"
+ , ConvolveFFT_function_type( &::MathFunctions::ConvolveFFT )
+ , ( bp::arg("signal"), bp::arg("resfunc") ) );
+
+ }
+
+ { //::MathFunctions::FastCos
+
+ typedef ::complex_t ( *FastCos_function_type )( ::complex_t const & );
+
+ bp::def(
+ "FastCos"
+ , FastCos_function_type( &::MathFunctions::FastCos )
+ , ( bp::arg("x") ) );
+
+ }
+
+ { //::MathFunctions::FastCos
+
+ typedef double ( *FastCos_function_type )( double const & );
+
+ bp::def(
+ "FastCos"
+ , FastCos_function_type( &::MathFunctions::FastCos )
+ , ( bp::arg("x") ) );
+
+ }
+
+ { //::MathFunctions::FastFourierTransform
+
+ typedef ::std::vector< std::complex<double> > ( *FastFourierTransform_function_type )( ::std::vector< double > const &,::MathFunctions::TransformCase );
+
+ bp::def(
+ "FastFourierTransform"
+ , FastFourierTransform_function_type( &::MathFunctions::FastFourierTransform )
+ , ( bp::arg("data"), bp::arg("tcase") ) );
+
+ }
+
+ { //::MathFunctions::FastFourierTransform
+
+ typedef ::std::vector< std::complex<double> > ( *FastFourierTransform_function_type )( ::std::vector< std::complex<double> > const &,::MathFunctions::TransformCase );
+
+ bp::def(
+ "FastFourierTransform"
+ , FastFourierTransform_function_type( &::MathFunctions::FastFourierTransform )
+ , ( bp::arg("data"), bp::arg("tcase") ) );
+
+ }
+
+ { //::MathFunctions::FastSin
+
+ typedef ::complex_t ( *FastSin_function_type )( ::complex_t const & );
+
+ bp::def(
+ "FastSin"
+ , FastSin_function_type( &::MathFunctions::FastSin )
+ , ( bp::arg("x") ) );
+
+ }
+
+ { //::MathFunctions::FastSin
+
+ typedef double ( *FastSin_function_type )( double const & );
+
+ bp::def(
+ "FastSin"
+ , FastSin_function_type( &::MathFunctions::FastSin )
+ , ( bp::arg("x") ) );
+
+ }
+
+ { //::MathFunctions::FastSinCos
+
+ typedef void ( *FastSinCos_function_type )( ::complex_t const &,::complex_t &,::complex_t & );
+
+ bp::def(
+ "FastSinCos"
+ , FastSinCos_function_type( &::MathFunctions::FastSinCos )
+ , ( bp::arg("x"), bp::arg("xsin"), bp::arg("xcos") ) );
+
+ }
+
+ { //::MathFunctions::Gaussian
+
+ typedef double ( *Gaussian_function_type )( double,double,double );
+
+ bp::def(
+ "Gaussian"
+ , Gaussian_function_type( &::MathFunctions::Gaussian )
+ , ( bp::arg("value"), bp::arg("average"), bp::arg("std_dev") ) );
+
+ }
+
+ { //::MathFunctions::GenerateNormalRandom
+
+ typedef double ( *GenerateNormalRandom_function_type )( double,double );
+
+ bp::def(
+ "GenerateNormalRandom"
+ , GenerateNormalRandom_function_type( &::MathFunctions::GenerateNormalRandom )
+ , ( bp::arg("average"), bp::arg("std_dev") ) );
+
+ }
+
+ { //::MathFunctions::GenerateStandardNormalRandom
+
+ typedef double ( *GenerateStandardNormalRandom_function_type )( );
+
+ bp::def(
+ "GenerateStandardNormalRandom"
+ , GenerateStandardNormalRandom_function_type( &::MathFunctions::GenerateStandardNormalRandom ) );
+
+ }
+
+ { //::MathFunctions::GenerateUniformRandom
+
+ typedef double ( *GenerateUniformRandom_function_type )( );
+
+ bp::def(
+ "GenerateUniformRandom"
+ , GenerateUniformRandom_function_type( &::MathFunctions::GenerateUniformRandom ) );
+
+ }
+
+ { //::MathFunctions::IntegratedGaussian
+
+ typedef double ( *IntegratedGaussian_function_type )( double,double,double );
+
+ bp::def(
+ "IntegratedGaussian"
+ , IntegratedGaussian_function_type( &::MathFunctions::IntegratedGaussian )
+ , ( bp::arg("value"), bp::arg("average"), bp::arg("std_dev") ) );
+
+ }
+
+ { //::MathFunctions::Laue
+
+ typedef ::complex_t ( *Laue_function_type )( ::complex_t const &,::size_t );
+
+ bp::def(
+ "Laue"
+ , Laue_function_type( &::MathFunctions::Laue )
+ , ( bp::arg("value"), bp::arg("N") ) );
+
+ }
+
+ { //::MathFunctions::Si
+
+ typedef double ( *Si_function_type )( double );
+
+ bp::def(
+ "Si"
+ , Si_function_type( &::MathFunctions::Si )
+ , ( bp::arg("value") ) );
+
+ }
+
+ { //::MathFunctions::Sinc
+
+ typedef ::complex_t ( *Sinc_function_type )( ::complex_t const & );
+
+ bp::def(
+ "Sinc"
+ , Sinc_function_type( &::MathFunctions::Sinc )
+ , ( bp::arg("value") ) );
+
+ }
+
+ { //::MathFunctions::Sinc
+
+ typedef double ( *Sinc_function_type )( double );
+
+ bp::def(
+ "Sinc"
+ , Sinc_function_type( &::MathFunctions::Sinc )
+ , ( bp::arg("value") ) );
+
+ }
+
+ { //::MathFunctions::StandardNormal
+
+ typedef double ( *StandardNormal_function_type )( double );
+
+ bp::def(
+ "StandardNormal"
+ , StandardNormal_function_type( &::MathFunctions::StandardNormal )
+ , ( bp::arg("value") ) );
+
+ }
+
+}
diff --git a/Fit/PythonAPI/src/PythonModule.cpp b/Fit/PythonAPI/src/PythonModule.cpp
index 5a8b586c0ff0287167c70ccf6f459928f9b9e6d3..6fa5e70d73bf5bcb57efc5441e61061b2b9c263f 100644
--- a/Fit/PythonAPI/src/PythonModule.cpp
+++ b/Fit/PythonAPI/src/PythonModule.cpp
@@ -10,18 +10,38 @@ GCC_DIAG_ON(missing-field-initializers);
#include "AttLimits.pypp.h"
#include "ChiSquaredModule.pypp.h"
#include "FitSuite.pypp.h"
+#include "FitSuiteParameters.pypp.h"
#include "IChiSquaredModule.pypp.h"
#include "IMinimizer.pypp.h"
+#include "IOutputDataNormalizer.pypp.h"
+#include "ISquaredFunction.pypp.h"
#include "MinimizerFactory.pypp.h"
-#include "ndimdata_t.pypp.h"
+#include "OutputDataNormalizer.pypp.h"
+#include "OutputDataSimpleNormalizer.pypp.h"
+#include "PythonInterface_enumerations.pypp.h"
+#include "PythonInterface_free_functions.pypp.h"
+#include "SquaredFunctionDefault.pypp.h"
+#include "SquaredFunctionWhichOnlyWorks.pypp.h"
+#include "SquaredFunctionWithGaussianError.pypp.h"
+#include "SquaredFunctionWithSystematicError.pypp.h"
BOOST_PYTHON_MODULE(libBornAgainFit){
+ register_enumerations();
register_AttLimits_class();
register_IChiSquaredModule_class();
register_ChiSquaredModule_class();
register_FitSuite_class();
+ register_FitSuiteParameters_class();
register_IMinimizer_class();
+ register_IOutputDataNormalizer_class();
+ register_ISquaredFunction_class();
register_MinimizerFactory_class();
- register_ndimdata_t_class();
+ register_OutputDataNormalizer_class();
+ register_OutputDataSimpleNormalizer_class();
+ register_SquaredFunctionDefault_class();
+ register_SquaredFunctionWhichOnlyWorks_class();
+ register_SquaredFunctionWithGaussianError_class();
+ register_SquaredFunctionWithSystematicError_class();
+ register_free_functions();
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e6129765aefb8088fe53c9e7a6b34db813016d23
--- /dev/null
+++ b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
@@ -0,0 +1,98 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "SquaredFunctionDefault.pypp.h"
+
+namespace bp = boost::python;
+
+struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< SquaredFunctionDefault > {
+
+ SquaredFunctionDefault_wrapper(SquaredFunctionDefault const & arg )
+ : SquaredFunctionDefault( arg )
+ , bp::wrapper< SquaredFunctionDefault >(){
+ // copy constructor
+
+ }
+
+ SquaredFunctionDefault_wrapper( )
+ : SquaredFunctionDefault( )
+ , bp::wrapper< SquaredFunctionDefault >(){
+ // null constructor
+
+ }
+
+ 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{
+ 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 );
+ }
+
+ virtual double calculateSquaredError( double real_value, double arg1 ) const {
+ if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
+ return func_calculateSquaredError( real_value, arg1 );
+ else{
+ return this->SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
+ }
+ }
+
+ double default_calculateSquaredError( double real_value, double arg1 ) const {
+ return SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
+ }
+
+ virtual ::SquaredFunctionDefault * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else{
+ return this->SquaredFunctionDefault::clone( );
+ }
+ }
+
+ ::SquaredFunctionDefault * default_clone( ) const {
+ return SquaredFunctionDefault::clone( );
+ }
+
+};
+
+void register_SquaredFunctionDefault_class(){
+
+ bp::class_< SquaredFunctionDefault_wrapper, bp::bases< ISquaredFunction > >( "SquaredFunctionDefault", bp::init< >() )
+ .def(
+ "calculateSquaredDifference"
+ , (double ( ::SquaredFunctionDefault::* )( double,double ) const)(&::SquaredFunctionDefault::calculateSquaredDifference)
+ , (double ( SquaredFunctionDefault_wrapper::* )( double,double ) const)(&SquaredFunctionDefault_wrapper::default_calculateSquaredDifference)
+ , ( bp::arg("real_value"), bp::arg("simulated_value") ) )
+ .def(
+ "calculateSquaredError"
+ , (double ( ::SquaredFunctionDefault::* )( double,double ) const)(&::SquaredFunctionDefault::calculateSquaredError)
+ , (double ( SquaredFunctionDefault_wrapper::* )( double,double ) const)(&SquaredFunctionDefault_wrapper::default_calculateSquaredError)
+ , ( bp::arg("real_value"), bp::arg("arg1") ) )
+ .def(
+ "clone"
+ , (::SquaredFunctionDefault * ( ::SquaredFunctionDefault::* )( ) const)(&::SquaredFunctionDefault::clone)
+ , (::SquaredFunctionDefault * ( SquaredFunctionDefault_wrapper::* )( ) const)(&SquaredFunctionDefault_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..aa93efc9d4e3f704884267bea7936bf9b2abc427
--- /dev/null
+++ b/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
@@ -0,0 +1,98 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "SquaredFunctionWhichOnlyWorks.pypp.h"
+
+namespace bp = boost::python;
+
+struct SquaredFunctionWhichOnlyWorks_wrapper : SquaredFunctionWhichOnlyWorks, bp::wrapper< SquaredFunctionWhichOnlyWorks > {
+
+ SquaredFunctionWhichOnlyWorks_wrapper(SquaredFunctionWhichOnlyWorks const & arg )
+ : SquaredFunctionWhichOnlyWorks( arg )
+ , bp::wrapper< SquaredFunctionWhichOnlyWorks >(){
+ // copy constructor
+
+ }
+
+ SquaredFunctionWhichOnlyWorks_wrapper( )
+ : SquaredFunctionWhichOnlyWorks( )
+ , bp::wrapper< SquaredFunctionWhichOnlyWorks >(){
+ // null constructor
+
+ }
+
+ 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{
+ return this->SquaredFunctionWhichOnlyWorks::calculateSquaredDifference( real_value, simulated_value );
+ }
+ }
+
+ double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
+ return SquaredFunctionWhichOnlyWorks::calculateSquaredDifference( real_value, simulated_value );
+ }
+
+ virtual ::SquaredFunctionWhichOnlyWorks * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else{
+ return this->SquaredFunctionWhichOnlyWorks::clone( );
+ }
+ }
+
+ ::SquaredFunctionWhichOnlyWorks * default_clone( ) const {
+ return SquaredFunctionWhichOnlyWorks::clone( );
+ }
+
+ virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
+ if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
+ return func_calculateSquaredError( real_value, simulated_value );
+ else{
+ return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
+ }
+ }
+
+ double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
+ return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
+ }
+
+};
+
+void register_SquaredFunctionWhichOnlyWorks_class(){
+
+ bp::class_< SquaredFunctionWhichOnlyWorks_wrapper, bp::bases< ISquaredFunction > >( "SquaredFunctionWhichOnlyWorks", bp::init< >() )
+ .def(
+ "calculateSquaredDifference"
+ , (double ( ::SquaredFunctionWhichOnlyWorks::* )( double,double ) const)(&::SquaredFunctionWhichOnlyWorks::calculateSquaredDifference)
+ , (double ( SquaredFunctionWhichOnlyWorks_wrapper::* )( double,double ) const)(&SquaredFunctionWhichOnlyWorks_wrapper::default_calculateSquaredDifference)
+ , ( bp::arg("real_value"), bp::arg("simulated_value") ) )
+ .def(
+ "clone"
+ , (::SquaredFunctionWhichOnlyWorks * ( ::SquaredFunctionWhichOnlyWorks::* )( ) const)(&::SquaredFunctionWhichOnlyWorks::clone)
+ , (::SquaredFunctionWhichOnlyWorks * ( SquaredFunctionWhichOnlyWorks_wrapper::* )( ) const)(&SquaredFunctionWhichOnlyWorks_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() )
+ .def(
+ "calculateSquaredError"
+ , (double ( ::ISquaredFunction::* )( double,double ) const)(&::ISquaredFunction::calculateSquaredError)
+ , (double ( SquaredFunctionWhichOnlyWorks_wrapper::* )( double,double ) const)(&SquaredFunctionWhichOnlyWorks_wrapper::default_calculateSquaredError)
+ , ( bp::arg("real_value"), bp::arg("simulated_value")=0.0 ) );
+
+}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..207f37428915fdcd2d1acf4d5ec60fa96a2e31fc
--- /dev/null
+++ b/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
@@ -0,0 +1,98 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "SquaredFunctionWithGaussianError.pypp.h"
+
+namespace bp = boost::python;
+
+struct SquaredFunctionWithGaussianError_wrapper : SquaredFunctionWithGaussianError, bp::wrapper< SquaredFunctionWithGaussianError > {
+
+ SquaredFunctionWithGaussianError_wrapper(SquaredFunctionWithGaussianError const & arg )
+ : SquaredFunctionWithGaussianError( arg )
+ , bp::wrapper< SquaredFunctionWithGaussianError >(){
+ // copy constructor
+
+ }
+
+ SquaredFunctionWithGaussianError_wrapper(double sigma=1.00000000000000002081668171172168513294309377670288085938e-2 )
+ : SquaredFunctionWithGaussianError( sigma )
+ , bp::wrapper< SquaredFunctionWithGaussianError >(){
+ // constructor
+
+ }
+
+ 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{
+ return this->SquaredFunctionWithGaussianError::calculateSquaredDifference( real_value, simulated_value );
+ }
+ }
+
+ double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
+ return SquaredFunctionWithGaussianError::calculateSquaredDifference( real_value, simulated_value );
+ }
+
+ virtual double calculateSquaredError( double arg0, double arg1 ) const {
+ if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
+ return func_calculateSquaredError( arg0, arg1 );
+ else{
+ return this->SquaredFunctionWithGaussianError::calculateSquaredError( arg0, arg1 );
+ }
+ }
+
+ double default_calculateSquaredError( double arg0, double arg1 ) const {
+ return SquaredFunctionWithGaussianError::calculateSquaredError( arg0, arg1 );
+ }
+
+ virtual ::SquaredFunctionWithGaussianError * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else{
+ return this->SquaredFunctionWithGaussianError::clone( );
+ }
+ }
+
+ ::SquaredFunctionWithGaussianError * default_clone( ) const {
+ return SquaredFunctionWithGaussianError::clone( );
+ }
+
+};
+
+void register_SquaredFunctionWithGaussianError_class(){
+
+ bp::class_< SquaredFunctionWithGaussianError_wrapper, bp::bases< ISquaredFunction > >( "SquaredFunctionWithGaussianError", bp::init< bp::optional< double > >(( bp::arg("sigma")=1.00000000000000002081668171172168513294309377670288085938e-2 )) )
+ .def(
+ "calculateSquaredDifference"
+ , (double ( ::SquaredFunctionWithGaussianError::* )( double,double ) const)(&::SquaredFunctionWithGaussianError::calculateSquaredDifference)
+ , (double ( SquaredFunctionWithGaussianError_wrapper::* )( double,double ) const)(&SquaredFunctionWithGaussianError_wrapper::default_calculateSquaredDifference)
+ , ( bp::arg("real_value"), bp::arg("simulated_value") ) )
+ .def(
+ "calculateSquaredError"
+ , (double ( ::SquaredFunctionWithGaussianError::* )( double,double ) const)(&::SquaredFunctionWithGaussianError::calculateSquaredError)
+ , (double ( SquaredFunctionWithGaussianError_wrapper::* )( double,double ) const)(&SquaredFunctionWithGaussianError_wrapper::default_calculateSquaredError)
+ , ( bp::arg("arg0"), bp::arg("arg1") ) )
+ .def(
+ "clone"
+ , (::SquaredFunctionWithGaussianError * ( ::SquaredFunctionWithGaussianError::* )( ) const)(&::SquaredFunctionWithGaussianError::clone)
+ , (::SquaredFunctionWithGaussianError * ( SquaredFunctionWithGaussianError_wrapper::* )( ) const)(&SquaredFunctionWithGaussianError_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c6644f2cc43f772e767602d87473a0434890b804
--- /dev/null
+++ b/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
@@ -0,0 +1,98 @@
+// This file has been generated by Py++.
+
+#include "Macros.h"
+GCC_DIAG_OFF(unused-parameter);
+GCC_DIAG_OFF(missing-field-initializers);
+#include "boost/python.hpp"
+#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
+GCC_DIAG_ON(unused-parameter);
+GCC_DIAG_ON(missing-field-initializers);
+#include "AttLimits.h"
+#include "IChiSquaredModule.h"
+#include "IMinimizer.h"
+#include "ChiSquaredModule.h"
+#include "FitSuite.h"
+#include "FitSuiteParameters.h"
+#include "MinimizerFactory.h"
+#include "PythonPlusplusFitHelper.h"
+#include "MathFunctions.h"
+#include "ISquaredFunction.h"
+#include "IOutputDataNormalizer.h"
+#include "SquaredFunctionWithSystematicError.pypp.h"
+
+namespace bp = boost::python;
+
+struct SquaredFunctionWithSystematicError_wrapper : SquaredFunctionWithSystematicError, bp::wrapper< SquaredFunctionWithSystematicError > {
+
+ SquaredFunctionWithSystematicError_wrapper(SquaredFunctionWithSystematicError const & arg )
+ : SquaredFunctionWithSystematicError( arg )
+ , bp::wrapper< SquaredFunctionWithSystematicError >(){
+ // copy constructor
+
+ }
+
+ SquaredFunctionWithSystematicError_wrapper(double epsilon=8.000000000000000166533453693773481063544750213623046875e-2 )
+ : SquaredFunctionWithSystematicError( epsilon )
+ , bp::wrapper< SquaredFunctionWithSystematicError >(){
+ // constructor
+
+ }
+
+ 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{
+ return this->SquaredFunctionWithSystematicError::calculateSquaredDifference( real_value, simulated_value );
+ }
+ }
+
+ double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
+ return SquaredFunctionWithSystematicError::calculateSquaredDifference( real_value, simulated_value );
+ }
+
+ virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
+ if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
+ return func_calculateSquaredError( real_value, simulated_value );
+ else{
+ return this->SquaredFunctionWithSystematicError::calculateSquaredError( real_value, simulated_value );
+ }
+ }
+
+ double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
+ return SquaredFunctionWithSystematicError::calculateSquaredError( real_value, simulated_value );
+ }
+
+ virtual ::SquaredFunctionWithSystematicError * clone( ) const {
+ if( bp::override func_clone = this->get_override( "clone" ) )
+ return func_clone( );
+ else{
+ return this->SquaredFunctionWithSystematicError::clone( );
+ }
+ }
+
+ ::SquaredFunctionWithSystematicError * default_clone( ) const {
+ return SquaredFunctionWithSystematicError::clone( );
+ }
+
+};
+
+void register_SquaredFunctionWithSystematicError_class(){
+
+ bp::class_< SquaredFunctionWithSystematicError_wrapper, bp::bases< ISquaredFunction > >( "SquaredFunctionWithSystematicError", bp::init< bp::optional< double > >(( bp::arg("epsilon")=8.000000000000000166533453693773481063544750213623046875e-2 )) )
+ .def(
+ "calculateSquaredDifference"
+ , (double ( ::SquaredFunctionWithSystematicError::* )( double,double ) const)(&::SquaredFunctionWithSystematicError::calculateSquaredDifference)
+ , (double ( SquaredFunctionWithSystematicError_wrapper::* )( double,double ) const)(&SquaredFunctionWithSystematicError_wrapper::default_calculateSquaredDifference)
+ , ( bp::arg("real_value"), bp::arg("simulated_value") ) )
+ .def(
+ "calculateSquaredError"
+ , (double ( ::SquaredFunctionWithSystematicError::* )( double,double ) const)(&::SquaredFunctionWithSystematicError::calculateSquaredError)
+ , (double ( SquaredFunctionWithSystematicError_wrapper::* )( double,double ) const)(&SquaredFunctionWithSystematicError_wrapper::default_calculateSquaredError)
+ , ( bp::arg("real_value"), bp::arg("simulated_value")=0.0 ) )
+ .def(
+ "clone"
+ , (::SquaredFunctionWithSystematicError * ( ::SquaredFunctionWithSystematicError::* )( ) const)(&::SquaredFunctionWithSystematicError::clone)
+ , (::SquaredFunctionWithSystematicError * ( SquaredFunctionWithSystematicError_wrapper::* )( ) const)(&SquaredFunctionWithSystematicError_wrapper::default_clone)
+ , bp::return_value_policy< bp::manage_new_object >() );
+
+}
diff --git a/Fit/python_module.pri b/Fit/python_module.pri
index 06ceb34be6b152d1bb9a0cc93b27b6f02c07e1fd..05383d53f7caa58ece10f87e6a0c35fa40408ad8 100644
--- a/Fit/python_module.pri
+++ b/Fit/python_module.pri
@@ -3,20 +3,40 @@ HEADERS += \
PythonAPI/inc/AttLimits.pypp.h \
PythonAPI/inc/ChiSquaredModule.pypp.h \
PythonAPI/inc/FitSuite.pypp.h \
+ PythonAPI/inc/FitSuiteParameters.pypp.h \
PythonAPI/inc/IChiSquaredModule.pypp.h \
PythonAPI/inc/IMinimizer.pypp.h \
+ PythonAPI/inc/IOutputDataNormalizer.pypp.h \
+ PythonAPI/inc/ISquaredFunction.pypp.h \
PythonAPI/inc/MinimizerFactory.pypp.h \
- PythonAPI/inc/ndimdata_t.pypp.h
+ PythonAPI/inc/OutputDataNormalizer.pypp.h \
+ PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h \
+ PythonAPI/inc/PythonInterface_enumerations.pypp.h \
+ PythonAPI/inc/PythonInterface_free_functions.pypp.h \
+ PythonAPI/inc/SquaredFunctionDefault.pypp.h \
+ PythonAPI/inc/SquaredFunctionWhichOnlyWorks.pypp.h \
+ PythonAPI/inc/SquaredFunctionWithGaussianError.pypp.h \
+ PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h
SOURCES += \
PythonAPI/src/PythonModule.cpp \
PythonAPI/src/AttLimits.pypp.cpp \
PythonAPI/src/ChiSquaredModule.pypp.cpp \
PythonAPI/src/FitSuite.pypp.cpp \
+ PythonAPI/src/FitSuiteParameters.pypp.cpp \
PythonAPI/src/IChiSquaredModule.pypp.cpp \
PythonAPI/src/IMinimizer.pypp.cpp \
+ PythonAPI/src/IOutputDataNormalizer.pypp.cpp \
+ PythonAPI/src/ISquaredFunction.pypp.cpp \
PythonAPI/src/MinimizerFactory.pypp.cpp \
- PythonAPI/src/ndimdata_t.pypp.cpp
+ PythonAPI/src/OutputDataNormalizer.pypp.cpp \
+ PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp \
+ PythonAPI/src/PythonInterface_enumerations.pypp.cpp \
+ PythonAPI/src/PythonInterface_free_functions.pypp.cpp \
+ PythonAPI/src/SquaredFunctionDefault.pypp.cpp \
+ PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp \
+ PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp \
+ PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
INCLUDEPATH += $$PWD/PythonAPI/inc
DEPENDPATH += $$PWD/PythonAPI/inc
diff --git a/Macros/BoostPythonGenerator/InstallPyCore.py b/Macros/BoostPythonGenerator/InstallPyCore.py
index 293401093cec2b83fb00dfd0b8cd84f154260822..50687d0a1614bd2832819afb28beea66e2298e17 100644
--- a/Macros/BoostPythonGenerator/InstallPyCore.py
+++ b/Macros/BoostPythonGenerator/InstallPyCore.py
@@ -172,6 +172,7 @@ def InstallCode(OutputTempDir, InstallDir):
files_inc =glob.glob(OutputTempDir+"/*.pypp.h");
files_inc+= glob.glob(OutputTempDir+"/__call_policies.pypp.hpp");
+ files_inc+= glob.glob(OutputTempDir+"/__convenience.pypp.hpp");
files_src = glob.glob(OutputTempDir+"/*.pypp.cpp");
files = files_inc+files_src
diff --git a/Macros/BoostPythonGenerator/InstallPyFit.py b/Macros/BoostPythonGenerator/InstallPyFit.py
index 1cbd6e7121f2e86c748bcb094564fab09a6ff42f..a60e230aedf486c80b85b7b3870368137772ff3c 100644
--- a/Macros/BoostPythonGenerator/InstallPyFit.py
+++ b/Macros/BoostPythonGenerator/InstallPyFit.py
@@ -152,7 +152,7 @@ def InstallCode(OutputTempDir, InstallDir):
#for fname in FilesToExclude:
#files_inc = filter(lambda x: not fname in x, files_inc)
#files_src = filter(lambda x: not fname in x, files_src)
- PatternsToExclude = ["vdouble1d_t"]
+ PatternsToExclude = ["vdouble1d_t", "vcomplex1d_t"]
for pattern in PatternsToExclude:
files2remove = glob.glob(OutputTempDir+"/"+pattern+".*")
for ff in files2remove:
diff --git a/Macros/BoostPythonGenerator/MakePyCore.py b/Macros/BoostPythonGenerator/MakePyCore.py
index 325b66380589a1ab9d8bd40d94b4772aef95d49c..fa287f45f35d65499ac2c9cf641d4e0a98ccc892 100644
--- a/Macros/BoostPythonGenerator/MakePyCore.py
+++ b/Macros/BoostPythonGenerator/MakePyCore.py
@@ -13,8 +13,33 @@ from pygccxml.declarations.matchers import virtuality_type_matcher_t
from pygccxml import declarations
from pyplusplus import function_transformers as FT
+from pyplusplus.function_transformers import transformers
+
ModuleName = 'PythonInterface'
+
+# --------------------------------------------------------------------------
+# This is patched version of pyplusplus.function_transformers classes to
+# pass address of ctype(double) into C++. The pointer is passed now in the
+# form of long unsigned, which correspond to 64 bit (before it was unsigned int)
+# --------------------------------------------------------------------------
+class from_address_custom_t(transformers.type_modifier_t):
+ def __init__(self, function, arg_ref):
+ modifier = lambda type_: declarations.FUNDAMENTAL_TYPES[ 'long unsigned int' ]
+ print modifier
+ transformers.type_modifier_t.__init__( self, function, arg_ref, modifier )
+ if not transformers.is_ptr_or_array( self.arg.type ):
+ raise ValueError( '%s\nin order to use "from_address_t" transformation, argument %s type must be a pointer or a array (got %s).' ) \
+ % ( function, self.arg_ref.name, arg.type)
+ def __str__(self):
+ return "from_address(%s)"%(self.arg.name)
+
+def from_address_custom( *args, **keywd ):
+ def creator( function ):
+ return from_address_custom_t( function, *args, **keywd )
+ return creator
+
+
# list of files to analyse and corresponding functions with rules for analysis
myFiles=[
'BasicVector3D.h',
@@ -69,6 +94,7 @@ myFiles=[
'ParticleBuilder.h',
'ParticleCoreShell.h',
'ParticleDecoration.h',
+ 'OutputData.h',
'ParticleInfo.h',
'PositionParticleInfo.h',
'PythonOutputData.h',
@@ -135,20 +161,6 @@ def AdditionalRules(mb):
#cl = mb.class_("IFTDistribution2D")
#cl = mb.class_("FTDistribution2DCauchy")
#cl.member_function("transformToStarBasis").exclude()
-
-
-
- # --- Experiment.h --------------------------------------------------
- if "Experiment.h" in myFiles:
- cl = mb.class_( "Experiment" )
- cl.constructors( lambda decl: bool( decl.arguments ) ).exclude() # exclude non-default constructors
- #cl.member_functions().exclude()
- #cl.member_function("runSimulation").include()
- #cl.member_function("normalize").include()
- #cl.member_function("setBeamParameters").include()
- #cl.member_function("setBeamIntensity").include()
- #cl.member_function("setSample").include()
- #cl.member_function("setSampleBuilder").include()
# --- FormFactorCylinder.h ------------------------------------------
if "FormFactorCrystal.h" in myFiles:
@@ -178,10 +190,6 @@ def AdditionalRules(mb):
cl = mb.class_( "FormFactorSphereGaussianRadius" )
cl.member_functions("createDistributedFormFactors").exclude()
- # --- GISASExperiment.h ---------------------------------------------
- if "GISASExperiment.h" in myFiles:
- cl = mb.class_( "GISASExperiment" )
- cl.member_function( "setDetectorResolutionFunction" ).exclude()
# --- HomogeneousMaterial.h -----------------------------------------
#if "HomogeneousMaterial.h" in myFiles:
@@ -232,7 +240,11 @@ def AdditionalRules(mb):
#cl = mb.class_( "IMaterial" )
# --- IParameterized.h ----------------------------------------------
- #if "IParameterized.h" in myFiles:
+ if "IParameterized.h" in myFiles:
+ cl = mb.class_( "IParameterized" )
+ cl.member_function("registerParameter").include()
+ cl.member_function("registerParameter").add_transformation( from_address_custom( 1 ) )
+
#cl = mb.class_( "IParameterized" )
#cl.member_functions().exclude()
#cl.member_function( "createParameterTree" ).include()
@@ -282,7 +294,6 @@ def AdditionalRules(mb):
for fun in cl.member_functions():
if fun.name == "setMaterial":
fun.include()
- print fun
# including back constructors with pointers (general policy is to exclude them)
cl.constructors().include()
@@ -318,6 +329,19 @@ def AdditionalRules(mb):
cl.member_function( "addLayer" ).include()
cl.member_function( "addLayerWithTopRoughness" ).include()
+ # --- OutputData.h ----------------------------------------------------
+ if "OutputData.h" in myFiles:
+ cl = mb.class_("OutputData<double>")
+ cl.add_code('def("__setitem__", &pyplusplus_setitem<OutputData<double >,int,double> )')
+ MethodsToExclude=["begin","end"]
+ for fun in cl.member_functions(allow_empty=True):
+ isToExclude = False
+ for x in MethodsToExclude:
+ if fun.name == x:
+ isToExclude = True
+ if isToExclude:
+ fun.exclude()
+
# --- Particle.h ----------------------------------------------------
if "Particle.h" in myFiles:
cl = mb.class_( "Particle" )
@@ -350,11 +374,11 @@ def AdditionalRules(mb):
# --- ParameterPool.h -----------------------------------------------
if "ParameterPool.h" in myFiles:
cl = mb.class_( "ParameterPool" )
- cl.member_function("registerParameter").include()
- cl.member_function("registerParameter").add_transformation( FT.from_address( 1 ) )
+ #print "XXX",from_address_custom( 1 )
+ cl.member_function("registerParameter").add_transformation( from_address_custom( 1 ) )
cl.member_function("getMatchedParameters").exclude()
- # --- ParameterPool.h -----------------------------------------------
+ # --- ParticleCoreShell.h -----------------------------------------------
if "ParticleCoreShell.h" in myFiles:
cl = mb.class_( "ParticleCoreShell" )
cl.member_functions().exclude()
@@ -380,6 +404,8 @@ def AdditionalRules(mb):
if "Simulation.h" in myFiles:
mb.class_('DWBASimulation').exclude()
+ cl = mb.class_("Simulation")
+ cl.member_function("setSampleBuilder").include()
# --- Transform3D.h -------------------------------------------------
#if "Transform3D.h" in myFiles:
@@ -468,6 +494,18 @@ def MakePythonAPI(OutputTempDir):
if not mem_fun.call_policies and (declarations.is_reference(mem_fun.return_type) or declarations.is_pointer(mem_fun.return_type) ):
mem_fun.call_policies = call_policies.return_value_policy(call_policies.reference_existing_object )
+ # exluding classes which are dublicated in libBornAgainCore
+ DublicatesToExclude=[
+ "vector_integer_t",
+ "vector_longinteger_t",
+ ]
+
+ for cl in mb.classes():
+ for name in DublicatesToExclude:
+ if name in cl.name or name in cl.alias:
+ cl.exclude()
+
+
# disabling some warnings
messages.disable(
messages.W1020 # Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
diff --git a/Macros/BoostPythonGenerator/MakePyFit.py b/Macros/BoostPythonGenerator/MakePyFit.py
index 5188e9032651228e35e7f09533c75cbb2cf6dc26..c4143acf9d0f2bf28165484681fcb5b56603e74b 100644
--- a/Macros/BoostPythonGenerator/MakePyFit.py
+++ b/Macros/BoostPythonGenerator/MakePyFit.py
@@ -19,15 +19,15 @@ myFiles=[
'AttLimits.h',
'IChiSquaredModule.h',
'IMinimizer.h',
- #'IResolutionFunction2D.h',
- #'ISquaredFunction.h',
'ChiSquaredModule.h',
'FitSuite.h',
+ #'FitParameter.h',
+ 'FitSuiteParameters.h',
'MinimizerFactory.h',
- 'OutputData.h',
'PythonPlusplusFitHelper.h',
- #'OutputDataIterator.h',
- #'ResolutionFunction2DSimple.h'
+ 'MathFunctions.h',
+ 'ISquaredFunction.h',
+ 'IOutputDataNormalizer.h'
]
@@ -73,6 +73,18 @@ def AdditionalRules(mb):
cl.member_function("runFit").include()
cl.member_function("printResults").include()
cl.member_function("getNCalls").include()
+ cl.member_function("initPrint").include()
+ cl.member_function("getFitParameters").include()
+
+ if "FitSuiteParameters.h" in myFiles:
+ cl = mb.class_("FitSuiteParameters")
+ cl.member_functions().exclude()
+ #cl.member_operator("[]").exclude()
+ cl.member_function("getValues").include()
+ for fun in cl.member_operators():
+ if "operator[]" in fun.name:
+ fun.exclude()
+
if "MinimizerFactory.h" in myFiles:
cl = mb.class_("MinimizerFactory")
@@ -81,8 +93,8 @@ def AdditionalRules(mb):
if "OutputData.h" in myFiles:
cl = mb.class_("OutputData<double>")
- cl.member_functions().exclude()
- cl.member_function("totalSum").include()
+ #cl.member_functions().exclude()
+ #cl.member_function("totalSum").include()
# --- PythonPlusplusHelper.h ----------------------------------------
if "PythonPlusplusFitHelper.h" in myFiles:
@@ -168,6 +180,11 @@ def MakePythonAPI(OutputTempDir):
"std::vector<std::vector<double, std::allocator<double> >",
"vdouble2d_t",
"vdouble1d_t",
+ "cvector_t",
+ "kvector_t",
+ "complex_t",
+ "std::vector<double>",
+ "vcomplex1d_t",
]
for cl in mb.classes():
diff --git a/Tests/FunctionalTests/TestFit/README b/Tests/FunctionalTests/TestFit/README
index 2ebb0ed821e6ed54f3b3c81d8ce5a9dc1b0638b4..fb359904174db1bcb81a5cf9f853729e868d0252 100644
--- a/Tests/FunctionalTests/TestFit/README
+++ b/Tests/FunctionalTests/TestFit/README
@@ -9,4 +9,5 @@ python TestFit.py
List of tests
TestFit01 - Two parameter fit using variety of minimizers. Geometry: cylinders in the air.
+TestFit02 - Fitting using sample builder
diff --git a/Tests/FunctionalTests/TestFit/TestFit.pro b/Tests/FunctionalTests/TestFit/TestFit.pro
index ab018a96897e6604badcc0c951e1a266a1be5c97..8b29fa4f052d30aa10985f9cf7912ca1c407d3a1 100644
--- a/Tests/FunctionalTests/TestFit/TestFit.pro
+++ b/Tests/FunctionalTests/TestFit/TestFit.pro
@@ -2,6 +2,6 @@ TEMPLATE = subdirs
SUBDIRS += \
TestFit01 \
-# TestFit02
+ TestFit02
CONFIG += ordered
diff --git a/Tests/FunctionalTests/TestFit/TestFit.py b/Tests/FunctionalTests/TestFit/TestFit.py
index ef0f288870154f7d7d83f1e9a5bd763e2323c8ae..bd86825426ee1eb999313b1a8a43391c246cb3ab 100755
--- a/Tests/FunctionalTests/TestFit/TestFit.py
+++ b/Tests/FunctionalTests/TestFit/TestFit.py
@@ -8,6 +8,7 @@ import time
Tests = [
"TestFit01",
+ "TestFit02",
]
test_info = []
diff --git a/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp b/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp
index ec3c638db345e8a658c2cc2a65d809df1c94e57c..ed06f7e1ba7ce4eeb3db5ceeb512d18b64be3745 100644
--- a/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp
+++ b/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp
@@ -30,7 +30,7 @@ TestFit01::TestFit01()
m_minimizers.push_back( Minimizer("GSLMultiMin","BFGS") );
m_minimizers.push_back( Minimizer("GSLMultiMin","SteepestDescent") );
m_minimizers.push_back( Minimizer("GSLMultiFit","") ); // this is Levenberg-Marquard
- m_minimizers.push_back( Minimizer("GSLSimAn","") );
+// m_minimizers.push_back( Minimizer("GSLSimAn","") );
// m_minimizers.push_back( Minimizer("Genetic","") );
}
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/.obj/release/TestFit02.o b/Tests/FunctionalTests/TestFit/TestFit02/.obj/release/TestFit02.o
new file mode 100644
index 0000000000000000000000000000000000000000..94d889d285d17375f3b01eb4031aaeb8b64003f3
Binary files /dev/null and b/Tests/FunctionalTests/TestFit/TestFit02/.obj/release/TestFit02.o differ
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/Makefile b/Tests/FunctionalTests/TestFit/TestFit02/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..803c3e094c763096486f7c938ee566f763c25d63
--- /dev/null
+++ b/Tests/FunctionalTests/TestFit/TestFit02/Makefile
@@ -0,0 +1,1435 @@
+#############################################################################
+# Makefile for building: TestFit02
+# Generated by qmake (3.0) (Qt 5.0.1) on: Thu Mar 28 17:11:01 2013
+# Project: TestFit02.pro
+# Template: app
+# Command: /Users/pospelov/nest/software/Qt5.0.1/5.0.1/clang_64/bin/qmake -spec macx-clang CONFIG+=debug CONFIG+=x86_64 -o Makefile TestFit02.pro
+#############################################################################
+
+MAKEFILE = Makefile
+
+####### Compiler, tools and options
+
+CC = clang
+CXX = clang++
+DEFINES = -DSTANDALONE
+CFLAGS = -pipe -mmacosx-version-min=10.6 -g -gdwarf-2 -Wall -W -fPIE $(DEFINES)
+CXXFLAGS = -pipe -mmacosx-version-min=10.6 -std=c++98 -g -gdwarf-2 -fdiagnostics-show-option -Wall -W -fPIE $(DEFINES)
+INCPATH = -I../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/macx-clang -I. -I../../../../Fit/Factory/inc -I/opt/local/include -I../../../../Core/Algorithms/inc -I../../../../Core/Fitting/inc -I../../../../Core/FormFactors/inc -I../../../../Core/Geometry/inc -I../../../../Core/Samples/inc -I../../../../Core/Tools/inc -I/opt/local/include/root -I/opt/local/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 -I/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include
+LINK = clang++
+LFLAGS = -headerpad_max_install_names -mmacosx-version-min=10.6
+LIBS = $(SUBLIBS) -L/opt/local/lib -lgsl -lgslcblas -lfftw3 -lboost_program_options -lboost_iostreams -lboost_system -lboost_signals -lboost_filesystem -lboost_regex -lboost_thread-mt -L/opt/local/lib/root -lGui -lCore -lCint -lRIO -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lMathCore -lMathMore -lMinuit2 -lThread -lpthread -lm -ldl -lboost_python -L/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib -lpython2.7 /Users/pospelov/nest/development/git/BornAgain/Tests/FunctionalTests/TestFit/TestFit02/../../../../lib/libBornAgainCore.so /Users/pospelov/nest/development/git/BornAgain/Tests/FunctionalTests/TestFit/TestFit02/../../../../lib/libBornAgainFit.so
+AR = ar cq
+RANLIB = ranlib -s
+QMAKE = /Users/pospelov/nest/software/Qt5.0.1/5.0.1/clang_64/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP =
+INSTALL_FILE = $(COPY_FILE)
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = $(COPY_FILE)
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = .obj/debug/
+
+####### Files
+
+SOURCES = TestFit02.cpp \
+ SampleBuilder.cpp
+OBJECTS = .obj/debug/TestFit02.o \
+ .obj/debug/SampleBuilder.o
+DIST = ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/spec_pre.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/qdevice.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/device_config.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/shell-unix.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/unix.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/mac.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/gcc-base.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/gcc-base-macx.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/clang.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/clang-mac.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/mac-minimum-version.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/qconfig.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_bootstrap.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_clucene.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_concurrent.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_core.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_declarative.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_designer.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_designercomponents.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_gui.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_help.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_multimedia.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_network.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_opengl.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_platformsupport.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_printsupport.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qml.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qmldevtools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qmltest.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qtmultimediaquicktools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_quick.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_quickparticles.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_script.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_scripttools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_sql.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_svg.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_testlib.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_uitools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_v8.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_webkit.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_webkitwidgets.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_widgets.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_xml.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_xmlpatterns.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/qt_functions.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/qt_config.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/macx-clang/qmake.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/spec_post.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/exclusive_builds.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/default_pre.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/unix/default_pre.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/default_pre.prf \
+ ../../../../shared.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/debug.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/default_post.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/default_post.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/objective_c.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/shared.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/warn_on.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/rez.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/sdk.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/testcase_targets.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/exceptions.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/yacc.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/lex.prf \
+ TestFit02.pro \
+ TestFit02.pro
+QMAKE_TARGET = TestFit02
+DESTDIR =
+TARGET = TestFit02
+
+####### Custom Compiler Variables
+QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS = -pipe \
+ -mmacosx-version-min=10.6 \
+ -g \
+ -gdwarf-2 \
+ -Wall \
+ -W
+
+
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: TestFit02.pro ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/macx-clang/qmake.conf ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/spec_pre.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/qdevice.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/device_config.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/shell-unix.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/unix.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/mac.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/gcc-base.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/gcc-base-macx.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/clang.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/clang-mac.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/mac-minimum-version.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/qconfig.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_bootstrap.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_clucene.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_concurrent.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_core.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_declarative.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_designer.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_designercomponents.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_gui.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_help.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_multimedia.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_multimediawidgets.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_network.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_opengl.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_platformsupport.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_printsupport.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qml.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qmldevtools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qmltest.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qtmultimediaquicktools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_quick.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_quickparticles.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_script.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_scripttools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_sql.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_svg.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_testlib.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_uitools.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_v8.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_webkit.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_webkitwidgets.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_widgets.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_xml.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_xmlpatterns.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/qt_functions.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/qt_config.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/macx-clang/qmake.conf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/spec_post.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/exclusive_builds.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/default_pre.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/unix/default_pre.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/default_pre.prf \
+ ../../../../shared.pri \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/debug.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/default_post.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/default_post.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/objective_c.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/shared.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/warn_on.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/rez.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/sdk.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/testcase_targets.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/exceptions.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/yacc.prf \
+ ../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/lex.prf \
+ TestFit02.pro
+ $(QMAKE) -spec macx-clang CONFIG+=debug CONFIG+=x86_64 -o Makefile TestFit02.pro
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/spec_pre.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/qdevice.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/device_config.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/shell-unix.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/unix.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/mac.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/gcc-base.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/gcc-base-macx.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/clang.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/clang-mac.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/common/mac-minimum-version.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/qconfig.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_bootstrap.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_clucene.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_concurrent.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_core.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_declarative.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_designer.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_designercomponents.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_gui.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_help.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_multimedia.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_multimediawidgets.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_network.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_opengl.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_platformsupport.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_printsupport.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qml.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qmldevtools.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qmltest.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_qtmultimediaquicktools.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_quick.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_quickparticles.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_script.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_scripttools.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_sql.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_svg.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_testlib.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_uitools.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_v8.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_webkit.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_webkitwidgets.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_widgets.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_xml.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/modules/qt_lib_xmlpatterns.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/qt_functions.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/qt_config.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/macx-clang/qmake.conf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/spec_post.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/exclusive_builds.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/default_pre.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/unix/default_pre.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/default_pre.prf:
+../../../../shared.pri:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/debug.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/default_post.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/default_post.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/objective_c.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/shared.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/warn_on.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/rez.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/mac/sdk.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/testcase_targets.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/exceptions.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/yacc.prf:
+../../../../../../../software/Qt5.0.1/5.0.1/clang_64/mkspecs/features/lex.prf:
+TestFit02.pro:
+qmake: FORCE
+ @$(QMAKE) -spec macx-clang CONFIG+=debug CONFIG+=x86_64 -o Makefile TestFit02.pro
+
+qmake_all: FORCE
+
+dist:
+ @test -d .obj/debug/TestFit021.0.0 || $(MKDIR) .obj/debug/TestFit021.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .obj/debug/TestFit021.0.0/ && (cd `dirname .obj/debug/TestFit021.0.0` && $(TAR) TestFit021.0.0.tar TestFit021.0.0 && $(COMPRESS) TestFit021.0.0.tar) && $(MOVE) `dirname .obj/debug/TestFit021.0.0`/TestFit021.0.0.tar.gz . && $(DEL_FILE) -r .obj/debug/TestFit021.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) $(OBJECTS)
+ -$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+check: first
+
+compiler_objective_c_make_all:
+compiler_objective_c_clean:
+compiler_rez_source_make_all:
+compiler_rez_source_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean:
+
+####### Compile
+
+.obj/debug/TestFit02.o: TestFit02.cpp TestFit02.h \
+ ../../../../Core/Algorithms/inc/ISampleBuilder.h \
+ ../../../../Core/Samples/inc/ISample.h \
+ ../../../../Core/Tools/inc/IParameterized.h \
+ ../../../../Core/Tools/inc/INamed.h \
+ ../../../../Core/Tools/inc/IChangeable.h \
+ ../../../../Core/Tools/inc/ParameterPool.h \
+ ../../../../Core/Tools/inc/ICloneable.h \
+ ../../../../Core/Tools/inc/Exceptions.h \
+ ../../../../Core/Tools/inc/RealParameterWrapper.h \
+ ../../../../Core/Tools/inc/OutputData.h \
+ ../../../../Core/Tools/inc/AxisDouble.h \
+ ../../../../Core/Tools/inc/IAxis.h \
+ ../../../../Core/Tools/inc/Bin.h \
+ ../../../../Core/Tools/inc/Numeric.h \
+ ../../../../Core/Tools/inc/Types.h \
+ ../../../../Core/Geometry/inc/BasicVector3D.h \
+ ../../../../Core/Tools/inc/LLData.h \
+ ../../../../Core/Tools/inc/OutputDataIterator.h \
+ ../../../../Core/Algorithms/inc/Mask.h \
+ ../../../../Core/Algorithms/inc/MaskCoordinateFunction.h \
+ ../../../../Core/Tools/inc/SafePointerVector.h \
+ ../../../../Core/Samples/inc/MaterialManager.h \
+ ../../../../Core/Tools/inc/ISingleton.h \
+ /opt/local/include/boost/thread.hpp \
+ /opt/local/include/boost/thread/thread.hpp \
+ /opt/local/include/boost/thread/detail/platform.hpp \
+ /opt/local/include/boost/config.hpp \
+ /opt/local/include/boost/config/select_compiler_config.hpp \
+ /opt/local/include/boost/config/select_stdlib_config.hpp \
+ /opt/local/include/boost/config/no_tr1/utility.hpp \
+ /opt/local/include/boost/config/select_platform_config.hpp \
+ /opt/local/include/boost/config/posix_features.hpp \
+ /opt/local/include/boost/config/suffix.hpp \
+ /opt/local/include/boost/type.hpp \
+ /opt/local/include/boost/non_type.hpp \
+ /opt/local/include/boost/config/requires_threads.hpp \
+ /opt/local/include/boost/thread/win32/thread_data.hpp \
+ /opt/local/include/boost/thread/detail/config.hpp \
+ /opt/local/include/boost/detail/workaround.hpp \
+ /opt/local/include/boost/config/auto_link.hpp \
+ /opt/local/include/boost/version.hpp \
+ /opt/local/include/boost/thread/thread_time.hpp \
+ /opt/local/include/boost/date_time/time_clock.hpp \
+ /opt/local/include/boost/date_time/c_time.hpp \
+ /opt/local/include/boost/throw_exception.hpp \
+ /opt/local/include/boost/exception/detail/attribute_noreturn.hpp \
+ /opt/local/include/boost/exception/exception.hpp \
+ /opt/local/include/boost/current_function.hpp \
+ /opt/local/include/boost/date_time/compiler_config.hpp \
+ /opt/local/include/boost/date_time/locale_config.hpp \
+ /opt/local/include/boost/cstdint.hpp \
+ /opt/local/include/boost/limits.hpp \
+ /opt/local/include/boost/detail/limits.hpp \
+ /opt/local/include/boost/detail/endian.hpp \
+ /opt/local/include/boost/shared_ptr.hpp \
+ /opt/local/include/boost/smart_ptr/shared_ptr.hpp \
+ /opt/local/include/boost/smart_ptr/detail/shared_ptr_nmt.hpp \
+ /opt/local/include/boost/assert.hpp \
+ /opt/local/include/boost/checked_delete.hpp \
+ /opt/local/include/boost/smart_ptr/detail/atomic_count.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_has_sync.hpp \
+ /opt/local/include/boost/smart_ptr/detail/atomic_count_pthreads.hpp \
+ /opt/local/include/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp \
+ /opt/local/include/boost/smart_ptr/detail/atomic_count_win32.hpp \
+ /opt/local/include/boost/detail/interlocked.hpp \
+ /opt/local/include/boost/smart_ptr/detail/atomic_count_sync.hpp \
+ /opt/local/include/boost/smart_ptr/detail/atomic_count_gcc.hpp \
+ /opt/local/include/boost/config/no_tr1/memory.hpp \
+ /opt/local/include/boost/smart_ptr/detail/shared_count.hpp \
+ /opt/local/include/boost/smart_ptr/bad_weak_ptr.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_nt.hpp \
+ /opt/local/include/boost/detail/sp_typeinfo.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_spin.hpp \
+ /opt/local/include/boost/smart_ptr/detail/spinlock_pool.hpp \
+ /opt/local/include/boost/smart_ptr/detail/spinlock.hpp \
+ /opt/local/include/boost/smart_ptr/detail/spinlock_pt.hpp \
+ /opt/local/include/boost/smart_ptr/detail/spinlock_gcc_arm.hpp \
+ /opt/local/include/boost/smart_ptr/detail/yield_k.hpp \
+ /opt/local/include/boost/smart_ptr/detail/spinlock_sync.hpp \
+ /opt/local/include/boost/smart_ptr/detail/spinlock_w32.hpp \
+ /opt/local/include/boost/smart_ptr/detail/spinlock_nt.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_pt.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_sync.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_w32.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_base_aix.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_counted_impl.hpp \
+ /opt/local/include/boost/smart_ptr/detail/quick_allocator.hpp \
+ /opt/local/include/boost/smart_ptr/detail/lightweight_mutex.hpp \
+ /opt/local/include/boost/smart_ptr/detail/lwm_nop.hpp \
+ /opt/local/include/boost/smart_ptr/detail/lwm_pthreads.hpp \
+ /opt/local/include/boost/smart_ptr/detail/lwm_win32_cs.hpp \
+ /opt/local/include/boost/type_traits/type_with_alignment.hpp \
+ /opt/local/include/boost/mpl/if.hpp \
+ /opt/local/include/boost/mpl/aux_/value_wknd.hpp \
+ /opt/local/include/boost/mpl/aux_/static_cast.hpp \
+ /opt/local/include/boost/mpl/aux_/config/workaround.hpp \
+ /opt/local/include/boost/mpl/aux_/config/integral.hpp \
+ /opt/local/include/boost/mpl/aux_/config/msvc.hpp \
+ /opt/local/include/boost/mpl/aux_/config/eti.hpp \
+ /opt/local/include/boost/mpl/int.hpp \
+ /opt/local/include/boost/mpl/int_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/adl_barrier.hpp \
+ /opt/local/include/boost/mpl/aux_/config/adl.hpp \
+ /opt/local/include/boost/mpl/aux_/config/intel.hpp \
+ /opt/local/include/boost/mpl/aux_/config/gcc.hpp \
+ /opt/local/include/boost/mpl/aux_/nttp_decl.hpp \
+ /opt/local/include/boost/mpl/aux_/config/nttp.hpp \
+ /opt/local/include/boost/preprocessor/cat.hpp \
+ /opt/local/include/boost/preprocessor/config/config.hpp \
+ /opt/local/include/boost/mpl/aux_/integral_wrapper.hpp \
+ /opt/local/include/boost/mpl/integral_c_tag.hpp \
+ /opt/local/include/boost/mpl/aux_/config/static_constant.hpp \
+ /opt/local/include/boost/mpl/aux_/na_spec.hpp \
+ /opt/local/include/boost/mpl/lambda_fwd.hpp \
+ /opt/local/include/boost/mpl/void_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/na.hpp \
+ /opt/local/include/boost/mpl/bool.hpp \
+ /opt/local/include/boost/mpl/bool_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/na_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/config/ctps.hpp \
+ /opt/local/include/boost/mpl/aux_/config/lambda.hpp \
+ /opt/local/include/boost/mpl/aux_/config/ttp.hpp \
+ /opt/local/include/boost/mpl/aux_/lambda_arity_param.hpp \
+ /opt/local/include/boost/mpl/aux_/template_arity_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/arity.hpp \
+ /opt/local/include/boost/mpl/aux_/config/dtp.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/params.hpp \
+ /opt/local/include/boost/mpl/aux_/config/preprocessor.hpp \
+ /opt/local/include/boost/preprocessor/comma_if.hpp \
+ /opt/local/include/boost/preprocessor/punctuation/comma_if.hpp \
+ /opt/local/include/boost/preprocessor/control/if.hpp \
+ /opt/local/include/boost/preprocessor/control/iif.hpp \
+ /opt/local/include/boost/preprocessor/logical/bool.hpp \
+ /opt/local/include/boost/preprocessor/facilities/empty.hpp \
+ /opt/local/include/boost/preprocessor/punctuation/comma.hpp \
+ /opt/local/include/boost/preprocessor/repeat.hpp \
+ /opt/local/include/boost/preprocessor/repetition/repeat.hpp \
+ /opt/local/include/boost/preprocessor/debug/error.hpp \
+ /opt/local/include/boost/preprocessor/detail/auto_rec.hpp \
+ /opt/local/include/boost/preprocessor/detail/dmc/auto_rec.hpp \
+ /opt/local/include/boost/preprocessor/tuple/eat.hpp \
+ /opt/local/include/boost/preprocessor/inc.hpp \
+ /opt/local/include/boost/preprocessor/arithmetic/inc.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/enum.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/def_params_tail.hpp \
+ /opt/local/include/boost/mpl/limits/arity.hpp \
+ /opt/local/include/boost/preprocessor/logical/and.hpp \
+ /opt/local/include/boost/preprocessor/logical/bitand.hpp \
+ /opt/local/include/boost/preprocessor/identity.hpp \
+ /opt/local/include/boost/preprocessor/facilities/identity.hpp \
+ /opt/local/include/boost/preprocessor/empty.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/filter_params.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/sub.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/tuple.hpp \
+ /opt/local/include/boost/preprocessor/arithmetic/sub.hpp \
+ /opt/local/include/boost/preprocessor/arithmetic/dec.hpp \
+ /opt/local/include/boost/preprocessor/control/while.hpp \
+ /opt/local/include/boost/preprocessor/list/fold_left.hpp \
+ /opt/local/include/boost/preprocessor/list/detail/edg/fold_left.hpp \
+ /opt/local/include/boost/preprocessor/control/expr_iif.hpp \
+ /opt/local/include/boost/preprocessor/list/adt.hpp \
+ /opt/local/include/boost/preprocessor/detail/is_binary.hpp \
+ /opt/local/include/boost/preprocessor/detail/check.hpp \
+ /opt/local/include/boost/preprocessor/logical/compl.hpp \
+ /opt/local/include/boost/preprocessor/list/detail/dmc/fold_left.hpp \
+ /opt/local/include/boost/preprocessor/tuple/elem.hpp \
+ /opt/local/include/boost/preprocessor/facilities/overload.hpp \
+ /opt/local/include/boost/preprocessor/variadic/size.hpp \
+ /opt/local/include/boost/preprocessor/tuple/rem.hpp \
+ /opt/local/include/boost/preprocessor/variadic/elem.hpp \
+ /opt/local/include/boost/preprocessor/list/detail/fold_left.hpp \
+ /opt/local/include/boost/preprocessor/list/fold_right.hpp \
+ /opt/local/include/boost/preprocessor/list/detail/edg/fold_right.hpp \
+ /opt/local/include/boost/preprocessor/list/detail/fold_right.hpp \
+ /opt/local/include/boost/preprocessor/list/reverse.hpp \
+ /opt/local/include/boost/preprocessor/control/detail/edg/while.hpp \
+ /opt/local/include/boost/preprocessor/control/detail/msvc/while.hpp \
+ /opt/local/include/boost/preprocessor/control/detail/dmc/while.hpp \
+ /opt/local/include/boost/preprocessor/control/detail/while.hpp \
+ /opt/local/include/boost/preprocessor/arithmetic/add.hpp \
+ /opt/local/include/boost/mpl/aux_/config/overload_resolution.hpp \
+ /opt/local/include/boost/mpl/aux_/lambda_support.hpp \
+ /opt/local/include/boost/mpl/aux_/yes_no.hpp \
+ /opt/local/include/boost/mpl/aux_/config/arrays.hpp \
+ /opt/local/include/boost/preprocessor/tuple/to_list.hpp \
+ /opt/local/include/boost/preprocessor/list/for_each_i.hpp \
+ /opt/local/include/boost/preprocessor/repetition/for.hpp \
+ /opt/local/include/boost/preprocessor/repetition/detail/edg/for.hpp \
+ /opt/local/include/boost/preprocessor/repetition/detail/msvc/for.hpp \
+ /opt/local/include/boost/preprocessor/repetition/detail/dmc/for.hpp \
+ /opt/local/include/boost/preprocessor/repetition/detail/for.hpp \
+ /opt/local/include/boost/preprocessor/list/transform.hpp \
+ /opt/local/include/boost/preprocessor/list/append.hpp \
+ /opt/local/include/boost/type_traits/alignment_of.hpp \
+ /opt/local/include/boost/type_traits/intrinsics.hpp \
+ /opt/local/include/boost/type_traits/config.hpp \
+ /opt/local/include/boost/type_traits/is_same.hpp \
+ /opt/local/include/boost/type_traits/detail/yes_no_type.hpp \
+ /opt/local/include/boost/type_traits/detail/ice_and.hpp \
+ /opt/local/include/boost/type_traits/is_reference.hpp \
+ /opt/local/include/boost/type_traits/is_lvalue_reference.hpp \
+ /opt/local/include/boost/type_traits/detail/wrap.hpp \
+ /opt/local/include/boost/type_traits/detail/bool_trait_def.hpp \
+ /opt/local/include/boost/type_traits/detail/template_arity_spec.hpp \
+ /opt/local/include/boost/type_traits/integral_constant.hpp \
+ /opt/local/include/boost/mpl/integral_c.hpp \
+ /opt/local/include/boost/mpl/integral_c_fwd.hpp \
+ /opt/local/include/boost/type_traits/detail/bool_trait_undef.hpp \
+ /opt/local/include/boost/type_traits/is_rvalue_reference.hpp \
+ /opt/local/include/boost/type_traits/ice.hpp \
+ /opt/local/include/boost/type_traits/detail/ice_or.hpp \
+ /opt/local/include/boost/type_traits/detail/ice_not.hpp \
+ /opt/local/include/boost/type_traits/detail/ice_eq.hpp \
+ /opt/local/include/boost/type_traits/is_function.hpp \
+ /opt/local/include/boost/type_traits/detail/false_result.hpp \
+ /opt/local/include/boost/type_traits/detail/is_function_ptr_helper.hpp \
+ /opt/local/include/boost/preprocessor/iterate.hpp \
+ /opt/local/include/boost/preprocessor/iteration/iterate.hpp \
+ /opt/local/include/boost/preprocessor/array/elem.hpp \
+ /opt/local/include/boost/preprocessor/array/data.hpp \
+ /opt/local/include/boost/preprocessor/array/size.hpp \
+ /opt/local/include/boost/preprocessor/slot/slot.hpp \
+ /opt/local/include/boost/preprocessor/slot/detail/def.hpp \
+ /opt/local/include/boost/preprocessor/enum_params.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum_params.hpp \
+ /opt/local/include/boost/type_traits/detail/is_function_ptr_tester.hpp \
+ /opt/local/include/boost/type_traits/is_volatile.hpp \
+ /opt/local/include/boost/type_traits/detail/cv_traits_impl.hpp \
+ /opt/local/include/boost/type_traits/remove_bounds.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_bounds.hpp \
+ /opt/local/include/boost/type_traits/msvc/typeof.hpp \
+ /opt/local/include/boost/type_traits/is_array.hpp \
+ /opt/local/include/boost/type_traits/detail/type_trait_def.hpp \
+ /opt/local/include/boost/type_traits/detail/type_trait_undef.hpp \
+ /opt/local/include/boost/type_traits/is_abstract.hpp \
+ /opt/local/include/boost/static_assert.hpp \
+ /opt/local/include/boost/type_traits/is_class.hpp \
+ /opt/local/include/boost/type_traits/is_union.hpp \
+ /opt/local/include/boost/type_traits/remove_cv.hpp \
+ /opt/local/include/boost/type_traits/broken_compiler_spec.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_cv.hpp \
+ /opt/local/include/boost/type_traits/is_const.hpp \
+ /opt/local/include/boost/type_traits/is_pointer.hpp \
+ /opt/local/include/boost/type_traits/is_member_pointer.hpp \
+ /opt/local/include/boost/type_traits/is_member_function_pointer.hpp \
+ /opt/local/include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp \
+ /opt/local/include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp \
+ /opt/local/include/boost/type_traits/is_scalar.hpp \
+ /opt/local/include/boost/type_traits/is_arithmetic.hpp \
+ /opt/local/include/boost/type_traits/is_integral.hpp \
+ /opt/local/include/boost/type_traits/is_float.hpp \
+ /opt/local/include/boost/type_traits/is_enum.hpp \
+ /opt/local/include/boost/type_traits/add_reference.hpp \
+ /opt/local/include/boost/type_traits/is_convertible.hpp \
+ /opt/local/include/boost/type_traits/is_void.hpp \
+ /opt/local/include/boost/type_traits/add_lvalue_reference.hpp \
+ /opt/local/include/boost/type_traits/add_rvalue_reference.hpp \
+ /opt/local/include/boost/type_traits/remove_reference.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_reference.hpp \
+ /opt/local/include/boost/type_traits/is_polymorphic.hpp \
+ /opt/local/include/boost/type_traits/detail/size_t_trait_def.hpp \
+ /opt/local/include/boost/mpl/size_t.hpp \
+ /opt/local/include/boost/mpl/size_t_fwd.hpp \
+ /opt/local/include/boost/type_traits/detail/size_t_trait_undef.hpp \
+ /opt/local/include/boost/type_traits/is_pod.hpp \
+ /opt/local/include/boost/utility/addressof.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_convertible.hpp \
+ /opt/local/include/boost/smart_ptr/detail/sp_nullptr_t.hpp \
+ /opt/local/include/boost/memory_order.hpp \
+ /opt/local/include/boost/smart_ptr/detail/operator_bool.hpp \
+ /opt/local/include/boost/date_time/microsec_time_clock.hpp \
+ /opt/local/include/boost/date_time/filetime_functions.hpp \
+ /opt/local/include/boost/date_time/time.hpp \
+ /opt/local/include/boost/operators.hpp \
+ /opt/local/include/boost/iterator.hpp \
+ /opt/local/include/boost/date_time/time_defs.hpp \
+ /opt/local/include/boost/date_time/special_defs.hpp \
+ /opt/local/include/boost/date_time/date_defs.hpp \
+ /opt/local/include/boost/date_time/posix_time/posix_time_types.hpp \
+ /opt/local/include/boost/date_time/posix_time/ptime.hpp \
+ /opt/local/include/boost/date_time/posix_time/posix_time_system.hpp \
+ /opt/local/include/boost/date_time/posix_time/posix_time_config.hpp \
+ /opt/local/include/boost/config/no_tr1/cmath.hpp \
+ /opt/local/include/boost/date_time/time_duration.hpp \
+ /opt/local/include/boost/date_time/time_resolution_traits.hpp \
+ /opt/local/include/boost/date_time/int_adapter.hpp \
+ /opt/local/include/boost/date_time/gregorian/gregorian_types.hpp \
+ /opt/local/include/boost/date_time/date.hpp \
+ /opt/local/include/boost/date_time/year_month_day.hpp \
+ /opt/local/include/boost/date_time/period.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_calendar.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_weekday.hpp \
+ /opt/local/include/boost/date_time/constrained_value.hpp \
+ /opt/local/include/boost/type_traits/is_base_of.hpp \
+ /opt/local/include/boost/type_traits/is_base_and_derived.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_day_of_year.hpp \
+ /opt/local/include/boost/date_time/gregorian_calendar.hpp \
+ /opt/local/include/boost/date_time/gregorian_calendar.ipp \
+ /opt/local/include/boost/date_time/gregorian/greg_ymd.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_day.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_year.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_month.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_duration.hpp \
+ /opt/local/include/boost/date_time/date_duration.hpp \
+ /opt/local/include/boost/date_time/date_duration_types.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_duration_types.hpp \
+ /opt/local/include/boost/date_time/gregorian/greg_date.hpp \
+ /opt/local/include/boost/date_time/adjust_functors.hpp \
+ /opt/local/include/boost/date_time/wrapping_int.hpp \
+ /opt/local/include/boost/date_time/date_generators.hpp \
+ /opt/local/include/boost/date_time/date_clock_device.hpp \
+ /opt/local/include/boost/date_time/date_iterator.hpp \
+ /opt/local/include/boost/date_time/time_system_split.hpp \
+ /opt/local/include/boost/date_time/time_system_counted.hpp \
+ /opt/local/include/boost/date_time/posix_time/date_duration_operators.hpp \
+ /opt/local/include/boost/date_time/posix_time/posix_time_duration.hpp \
+ /opt/local/include/boost/date_time/posix_time/time_period.hpp \
+ /opt/local/include/boost/date_time/time_iterator.hpp \
+ /opt/local/include/boost/date_time/dst_rules.hpp \
+ /opt/local/include/boost/config/abi_prefix.hpp \
+ /opt/local/include/boost/config/abi_suffix.hpp \
+ /opt/local/include/boost/thread/win32/thread_primitives.hpp \
+ /opt/local/include/boost/thread/exceptions.hpp \
+ /opt/local/include/boost/system/system_error.hpp \
+ /opt/local/include/boost/system/error_code.hpp \
+ /opt/local/include/boost/system/config.hpp \
+ /opt/local/include/boost/system/api_config.hpp \
+ /opt/local/include/boost/noncopyable.hpp \
+ /opt/local/include/boost/utility/enable_if.hpp \
+ /opt/local/include/boost/cerrno.hpp \
+ /opt/local/include/boost/thread/win32/thread_heap_alloc.hpp \
+ /opt/local/include/boost/detail/no_exceptions_support.hpp \
+ /opt/local/include/boost/intrusive_ptr.hpp \
+ /opt/local/include/boost/smart_ptr/intrusive_ptr.hpp \
+ /opt/local/include/boost/config/no_tr1/functional.hpp \
+ /opt/local/include/boost/chrono/system_clocks.hpp \
+ /opt/local/include/boost/chrono/config.hpp \
+ /opt/local/include/boost/chrono/duration.hpp \
+ /opt/local/include/boost/chrono/detail/static_assert.hpp \
+ /opt/local/include/boost/mpl/assert.hpp \
+ /opt/local/include/boost/mpl/not.hpp \
+ /opt/local/include/boost/mpl/aux_/nested_type_wknd.hpp \
+ /opt/local/include/boost/mpl/aux_/config/pp_counter.hpp \
+ /opt/local/include/boost/mpl/logical.hpp \
+ /opt/local/include/boost/mpl/or.hpp \
+ /opt/local/include/boost/mpl/aux_/config/use_preprocessed.hpp \
+ /opt/local/include/boost/mpl/aux_/include_preprocessed.hpp \
+ /opt/local/include/boost/mpl/aux_/config/compiler.hpp \
+ /opt/local/include/boost/preprocessor/stringize.hpp \
+ /opt/local/include/boost/mpl/aux_/logical_op.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/ext_params.hpp \
+ /opt/local/include/boost/preprocessor/dec.hpp \
+ /opt/local/include/boost/mpl/and.hpp \
+ /opt/local/include/boost/ratio/ratio.hpp \
+ /opt/local/include/boost/ratio/config.hpp \
+ /opt/local/include/boost/ratio/detail/mpl/abs.hpp \
+ /opt/local/include/boost/ratio/detail/mpl/sign.hpp \
+ /opt/local/include/boost/ratio/detail/mpl/gcd.hpp \
+ /opt/local/include/boost/mpl/aux_/largest_int.hpp \
+ /opt/local/include/boost/mpl/aux_/config/dependent_nttp.hpp \
+ /opt/local/include/boost/ratio/detail/mpl/lcm.hpp \
+ /opt/local/include/boost/integer_traits.hpp \
+ /opt/local/include/boost/ratio/ratio_fwd.hpp \
+ /opt/local/include/boost/ratio/detail/overflow_helpers.hpp \
+ /opt/local/include/boost/rational.hpp \
+ /opt/local/include/boost/call_traits.hpp \
+ /opt/local/include/boost/detail/ob_call_traits.hpp \
+ /opt/local/include/boost/type_traits/arithmetic_traits.hpp \
+ /opt/local/include/boost/type_traits/is_fundamental.hpp \
+ /opt/local/include/boost/type_traits/composite_traits.hpp \
+ /opt/local/include/boost/detail/call_traits.hpp \
+ /opt/local/include/boost/math/common_factor_rt.hpp \
+ /opt/local/include/boost/math_fwd.hpp \
+ /opt/local/include/boost/ratio/mpl/rational_c_tag.hpp \
+ /opt/local/include/boost/type_traits/common_type.hpp \
+ /opt/local/include/boost/typeof/typeof.hpp \
+ /opt/local/include/boost/typeof/dmc/typeof_impl.hpp \
+ /opt/local/include/boost/typeof/msvc/typeof_impl.hpp \
+ /opt/local/include/boost/typeof/unsupported.hpp \
+ /opt/local/include/boost/typeof/typeof_impl.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum.hpp \
+ /opt/local/include/boost/typeof/encode_decode.hpp \
+ /opt/local/include/boost/mpl/deref.hpp \
+ /opt/local/include/boost/mpl/aux_/msvc_type.hpp \
+ /opt/local/include/boost/mpl/aux_/is_msvc_eti_arg.hpp \
+ /opt/local/include/boost/mpl/next.hpp \
+ /opt/local/include/boost/mpl/next_prior.hpp \
+ /opt/local/include/boost/mpl/aux_/common_name_wknd.hpp \
+ /opt/local/include/boost/typeof/vector.hpp \
+ /opt/local/include/boost/preprocessor/iteration/self.hpp \
+ /opt/local/include/boost/typeof/vector50.hpp \
+ /opt/local/include/boost/typeof/vector100.hpp \
+ /opt/local/include/boost/typeof/vector150.hpp \
+ /opt/local/include/boost/typeof/vector200.hpp \
+ /opt/local/include/boost/preprocessor/repeat_from_to.hpp \
+ /opt/local/include/boost/preprocessor/repetition/repeat_from_to.hpp \
+ /opt/local/include/boost/preprocessor/iteration/local.hpp \
+ /opt/local/include/boost/preprocessor/logical/not.hpp \
+ /opt/local/include/boost/typeof/type_encoding.hpp \
+ /opt/local/include/boost/typeof/template_encoding.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum_trailing.hpp \
+ /opt/local/include/boost/preprocessor/detail/is_unary.hpp \
+ /opt/local/include/boost/preprocessor/seq/transform.hpp \
+ /opt/local/include/boost/preprocessor/seq/fold_left.hpp \
+ /opt/local/include/boost/preprocessor/seq/seq.hpp \
+ /opt/local/include/boost/preprocessor/seq/elem.hpp \
+ /opt/local/include/boost/preprocessor/seq/size.hpp \
+ /opt/local/include/boost/preprocessor/seq/for_each_i.hpp \
+ /opt/local/include/boost/preprocessor/seq/cat.hpp \
+ /opt/local/include/boost/typeof/int_encoding.hpp \
+ /opt/local/include/boost/typeof/type_template_param.hpp \
+ /opt/local/include/boost/typeof/integral_template_param.hpp \
+ /opt/local/include/boost/typeof/template_template_param.hpp \
+ /opt/local/include/boost/preprocessor/logical/or.hpp \
+ /opt/local/include/boost/preprocessor/logical/bitor.hpp \
+ /opt/local/include/boost/preprocessor/seq/enum.hpp \
+ /opt/local/include/boost/typeof/modifiers.hpp \
+ /opt/local/include/boost/typeof/pointers_data_members.hpp \
+ /opt/local/include/boost/typeof/encode_decode_params.hpp \
+ /opt/local/include/boost/typeof/register_functions.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum_trailing_params.hpp \
+ /opt/local/include/boost/preprocessor/if.hpp \
+ /opt/local/include/boost/typeof/register_fundamental.hpp \
+ /opt/local/include/boost/typeof/native.hpp \
+ /opt/local/include/boost/type_traits/detail/common_type_imp.hpp \
+ /opt/local/include/boost/mpl/at.hpp \
+ /opt/local/include/boost/mpl/at_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/at_impl.hpp \
+ /opt/local/include/boost/mpl/begin_end.hpp \
+ /opt/local/include/boost/mpl/begin_end_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/begin_end_impl.hpp \
+ /opt/local/include/boost/mpl/sequence_tag_fwd.hpp \
+ /opt/local/include/boost/mpl/void.hpp \
+ /opt/local/include/boost/mpl/eval_if.hpp \
+ /opt/local/include/boost/mpl/aux_/has_begin.hpp \
+ /opt/local/include/boost/mpl/has_xxx.hpp \
+ /opt/local/include/boost/mpl/aux_/type_wrapper.hpp \
+ /opt/local/include/boost/mpl/aux_/config/has_xxx.hpp \
+ /opt/local/include/boost/mpl/aux_/config/msvc_typename.hpp \
+ /opt/local/include/boost/mpl/aux_/traits_lambda_spec.hpp \
+ /opt/local/include/boost/mpl/sequence_tag.hpp \
+ /opt/local/include/boost/mpl/aux_/has_tag.hpp \
+ /opt/local/include/boost/mpl/advance.hpp \
+ /opt/local/include/boost/mpl/advance_fwd.hpp \
+ /opt/local/include/boost/mpl/less.hpp \
+ /opt/local/include/boost/mpl/aux_/comparison_op.hpp \
+ /opt/local/include/boost/mpl/aux_/numeric_op.hpp \
+ /opt/local/include/boost/mpl/numeric_cast.hpp \
+ /opt/local/include/boost/mpl/apply_wrap.hpp \
+ /opt/local/include/boost/mpl/aux_/has_apply.hpp \
+ /opt/local/include/boost/mpl/aux_/config/has_apply.hpp \
+ /opt/local/include/boost/mpl/aux_/msvc_never_true.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/add.hpp \
+ /opt/local/include/boost/mpl/aux_/config/bcc.hpp \
+ /opt/local/include/boost/mpl/aux_/msvc_dtw.hpp \
+ /opt/local/include/boost/mpl/tag.hpp \
+ /opt/local/include/boost/mpl/aux_/numeric_cast_utils.hpp \
+ /opt/local/include/boost/mpl/aux_/config/forwarding.hpp \
+ /opt/local/include/boost/mpl/aux_/msvc_eti_base.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/partial_spec_params.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/repeat.hpp \
+ /opt/local/include/boost/mpl/negate.hpp \
+ /opt/local/include/boost/mpl/long.hpp \
+ /opt/local/include/boost/mpl/long_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/advance_forward.hpp \
+ /opt/local/include/boost/mpl/limits/unrolling.hpp \
+ /opt/local/include/boost/mpl/aux_/advance_backward.hpp \
+ /opt/local/include/boost/mpl/prior.hpp \
+ /opt/local/include/boost/mpl/contains.hpp \
+ /opt/local/include/boost/mpl/contains_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/contains_impl.hpp \
+ /opt/local/include/boost/mpl/find.hpp \
+ /opt/local/include/boost/mpl/find_if.hpp \
+ /opt/local/include/boost/mpl/aux_/find_if_pred.hpp \
+ /opt/local/include/boost/mpl/aux_/iter_apply.hpp \
+ /opt/local/include/boost/mpl/apply.hpp \
+ /opt/local/include/boost/mpl/apply_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/default_params.hpp \
+ /opt/local/include/boost/mpl/placeholders.hpp \
+ /opt/local/include/boost/mpl/arg.hpp \
+ /opt/local/include/boost/mpl/arg_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/na_assert.hpp \
+ /opt/local/include/boost/mpl/aux_/arity_spec.hpp \
+ /opt/local/include/boost/mpl/aux_/arg_typedef.hpp \
+ /opt/local/include/boost/mpl/lambda.hpp \
+ /opt/local/include/boost/mpl/bind.hpp \
+ /opt/local/include/boost/mpl/bind_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/config/bind.hpp \
+ /opt/local/include/boost/mpl/aux_/config/dmc_ambiguous_ctps.hpp \
+ /opt/local/include/boost/mpl/protect.hpp \
+ /opt/local/include/boost/mpl/aux_/count_args.hpp \
+ /opt/local/include/boost/preprocessor/expr_if.hpp \
+ /opt/local/include/boost/preprocessor/control/expr_if.hpp \
+ /opt/local/include/boost/preprocessor/enum_shifted_params.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum_shifted_params.hpp \
+ /opt/local/include/boost/mpl/aux_/full_lambda.hpp \
+ /opt/local/include/boost/mpl/quote.hpp \
+ /opt/local/include/boost/mpl/aux_/has_type.hpp \
+ /opt/local/include/boost/mpl/aux_/template_arity.hpp \
+ /opt/local/include/boost/mpl/aux_/has_rebind.hpp \
+ /opt/local/include/boost/mpl/aux_/msvc_is_class.hpp \
+ /opt/local/include/boost/mpl/aux_/preprocessor/range.hpp \
+ /opt/local/include/boost/preprocessor/seq/subseq.hpp \
+ /opt/local/include/boost/preprocessor/seq/first_n.hpp \
+ /opt/local/include/boost/preprocessor/seq/detail/split.hpp \
+ /opt/local/include/boost/preprocessor/seq/rest_n.hpp \
+ /opt/local/include/boost/mpl/aux_/lambda_no_ctps.hpp \
+ /opt/local/include/boost/mpl/is_placeholder.hpp \
+ /opt/local/include/boost/mpl/identity.hpp \
+ /opt/local/include/boost/mpl/iter_fold_if.hpp \
+ /opt/local/include/boost/mpl/always.hpp \
+ /opt/local/include/boost/mpl/pair.hpp \
+ /opt/local/include/boost/mpl/aux_/iter_fold_if_impl.hpp \
+ /opt/local/include/boost/mpl/same_as.hpp \
+ /opt/local/include/boost/mpl/aux_/lambda_spec.hpp \
+ /opt/local/include/boost/mpl/copy.hpp \
+ /opt/local/include/boost/mpl/fold.hpp \
+ /opt/local/include/boost/mpl/O1_size.hpp \
+ /opt/local/include/boost/mpl/O1_size_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/O1_size_impl.hpp \
+ /opt/local/include/boost/mpl/aux_/has_size.hpp \
+ /opt/local/include/boost/mpl/aux_/fold_impl.hpp \
+ /opt/local/include/boost/mpl/aux_/fold_impl_body.hpp \
+ /opt/local/include/boost/mpl/reverse_fold.hpp \
+ /opt/local/include/boost/mpl/aux_/reverse_fold_impl.hpp \
+ /opt/local/include/boost/mpl/aux_/reverse_fold_impl_body.hpp \
+ /opt/local/include/boost/mpl/aux_/inserter_algorithm.hpp \
+ /opt/local/include/boost/mpl/back_inserter.hpp \
+ /opt/local/include/boost/mpl/push_back.hpp \
+ /opt/local/include/boost/mpl/push_back_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/push_back_impl.hpp \
+ /opt/local/include/boost/mpl/inserter.hpp \
+ /opt/local/include/boost/mpl/front_inserter.hpp \
+ /opt/local/include/boost/mpl/push_front.hpp \
+ /opt/local/include/boost/mpl/push_front_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/push_front_impl.hpp \
+ /opt/local/include/boost/mpl/clear.hpp \
+ /opt/local/include/boost/mpl/clear_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/clear_impl.hpp \
+ /opt/local/include/boost/mpl/size.hpp \
+ /opt/local/include/boost/mpl/size_fwd.hpp \
+ /opt/local/include/boost/mpl/aux_/size_impl.hpp \
+ /opt/local/include/boost/mpl/distance.hpp \
+ /opt/local/include/boost/mpl/distance_fwd.hpp \
+ /opt/local/include/boost/mpl/iter_fold.hpp \
+ /opt/local/include/boost/mpl/aux_/iter_fold_impl.hpp \
+ /opt/local/include/boost/mpl/iterator_range.hpp \
+ /opt/local/include/boost/mpl/vector/vector0.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/at.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/tag.hpp \
+ /opt/local/include/boost/mpl/aux_/config/typeof.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/front.hpp \
+ /opt/local/include/boost/mpl/front_fwd.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/push_front.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/item.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/pop_front.hpp \
+ /opt/local/include/boost/mpl/pop_front_fwd.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/push_back.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/pop_back.hpp \
+ /opt/local/include/boost/mpl/pop_back_fwd.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/back.hpp \
+ /opt/local/include/boost/mpl/back_fwd.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/clear.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/vector0.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/iterator.hpp \
+ /opt/local/include/boost/mpl/iterator_tags.hpp \
+ /opt/local/include/boost/mpl/plus.hpp \
+ /opt/local/include/boost/mpl/aux_/arithmetic_op.hpp \
+ /opt/local/include/boost/mpl/minus.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/O1_size.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/size.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/empty.hpp \
+ /opt/local/include/boost/mpl/empty_fwd.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/begin_end.hpp \
+ /opt/local/include/boost/mpl/vector/vector10.hpp \
+ /opt/local/include/boost/mpl/vector/aux_/include_preprocessed.hpp \
+ /opt/local/include/boost/type_traits/make_signed.hpp \
+ /opt/local/include/boost/type_traits/is_signed.hpp \
+ /opt/local/include/boost/type_traits/is_unsigned.hpp \
+ /opt/local/include/boost/type_traits/add_const.hpp \
+ /opt/local/include/boost/type_traits/add_volatile.hpp \
+ /opt/local/include/boost/type_traits/make_unsigned.hpp \
+ /opt/local/include/boost/utility/declval.hpp \
+ /opt/local/include/boost/type_traits/is_floating_point.hpp \
+ /opt/local/include/boost/chrono/detail/is_evenly_divisible_by.hpp \
+ /opt/local/include/boost/chrono/time_point.hpp \
+ /opt/local/include/boost/chrono/detail/system.hpp \
+ /opt/local/include/boost/chrono/clock_string.hpp \
+ /opt/local/include/boost/chrono/detail/inlined/chrono.hpp \
+ /opt/local/include/boost/chrono/chrono.hpp \
+ /opt/local/include/boost/chrono/detail/inlined/win/chrono.hpp \
+ /opt/local/include/boost/detail/win/time.hpp \
+ /opt/local/include/boost/detail/win/basic_types.hpp \
+ /opt/local/include/boost/detail/win/timers.hpp \
+ /opt/local/include/boost/detail/win/GetLastError.hpp \
+ /opt/local/include/boost/chrono/detail/inlined/mac/chrono.hpp \
+ /opt/local/include/boost/chrono/detail/inlined/posix/chrono.hpp \
+ /opt/local/include/boost/thread/pthread/thread_data.hpp \
+ /opt/local/include/boost/thread/lock_guard.hpp \
+ /opt/local/include/boost/thread/detail/delete.hpp \
+ /opt/local/include/boost/thread/detail/move.hpp \
+ /opt/local/include/boost/type_traits/decay.hpp \
+ /opt/local/include/boost/type_traits/add_pointer.hpp \
+ /opt/local/include/boost/move/utility.hpp \
+ /opt/local/include/boost/move/detail/config_begin.hpp \
+ /opt/local/include/boost/move/core.hpp \
+ /opt/local/include/boost/move/detail/meta_utils.hpp \
+ /opt/local/include/boost/move/detail/config_end.hpp \
+ /opt/local/include/boost/thread/detail/lockable_wrapper.hpp \
+ /opt/local/include/boost/thread/lock_options.hpp \
+ /opt/local/include/boost/thread/is_locked_by_this_thread.hpp \
+ /opt/local/include/boost/thread/lock_types.hpp \
+ /opt/local/include/boost/thread/lockable_traits.hpp \
+ /opt/local/include/boost/thread/mutex.hpp \
+ /opt/local/include/boost/thread/win32/mutex.hpp \
+ /opt/local/include/boost/thread/win32/basic_timed_mutex.hpp \
+ /opt/local/include/boost/thread/win32/interlocked_read.hpp \
+ /opt/local/include/boost/thread/xtime.hpp \
+ /opt/local/include/boost/date_time/posix_time/conversion.hpp \
+ /opt/local/include/boost/date_time/gregorian/conversion.hpp \
+ /opt/local/include/boost/chrono/ceil.hpp \
+ /opt/local/include/boost/thread/pthread/mutex.hpp \
+ /opt/local/include/boost/thread/pthread/timespec.hpp \
+ /opt/local/include/boost/thread/pthread/pthread_mutex_scoped_lock.hpp \
+ /opt/local/include/boost/thread/pthread/condition_variable_fwd.hpp \
+ /opt/local/include/boost/thread/cv_status.hpp \
+ /opt/local/include/boost/detail/scoped_enum_emulation.hpp \
+ /opt/local/include/boost/enable_shared_from_this.hpp \
+ /opt/local/include/boost/smart_ptr/enable_shared_from_this.hpp \
+ /opt/local/include/boost/smart_ptr/weak_ptr.hpp \
+ /opt/local/include/boost/optional.hpp \
+ /opt/local/include/boost/optional/optional.hpp \
+ /opt/local/include/boost/type_traits/has_nothrow_constructor.hpp \
+ /opt/local/include/boost/type_traits/has_trivial_constructor.hpp \
+ /opt/local/include/boost/detail/reference_content.hpp \
+ /opt/local/include/boost/type_traits/has_nothrow_copy.hpp \
+ /opt/local/include/boost/type_traits/has_trivial_copy.hpp \
+ /opt/local/include/boost/none.hpp \
+ /opt/local/include/boost/none_t.hpp \
+ /opt/local/include/boost/utility/swap.hpp \
+ /opt/local/include/boost/utility/compare_pointees.hpp \
+ /opt/local/include/boost/utility/in_place_factory.hpp \
+ /opt/local/include/boost/utility/detail/in_place_factory_prefix.hpp \
+ /opt/local/include/boost/preprocessor/punctuation/paren.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum_binary_params.hpp \
+ /opt/local/include/boost/utility/detail/in_place_factory_suffix.hpp \
+ /opt/local/include/boost/optional/optional_fwd.hpp \
+ /opt/local/include/boost/thread/detail/thread.hpp \
+ /opt/local/include/boost/thread/detail/thread_heap_alloc.hpp \
+ /opt/local/include/boost/thread/pthread/thread_heap_alloc.hpp \
+ /opt/local/include/boost/thread/detail/make_tuple_indices.hpp \
+ /opt/local/include/boost/thread/detail/invoke.hpp \
+ /opt/local/include/boost/thread/detail/is_convertible.hpp \
+ /opt/local/include/boost/ref.hpp \
+ /opt/local/include/boost/bind.hpp \
+ /opt/local/include/boost/bind/bind.hpp \
+ /opt/local/include/boost/mem_fn.hpp \
+ /opt/local/include/boost/bind/mem_fn.hpp \
+ /opt/local/include/boost/get_pointer.hpp \
+ /opt/local/include/boost/bind/mem_fn_template.hpp \
+ /opt/local/include/boost/bind/mem_fn_vw.hpp \
+ /opt/local/include/boost/bind/mem_fn_cc.hpp \
+ /opt/local/include/boost/is_placeholder.hpp \
+ /opt/local/include/boost/bind/arg.hpp \
+ /opt/local/include/boost/visit_each.hpp \
+ /opt/local/include/boost/bind/storage.hpp \
+ /opt/local/include/boost/bind/bind_template.hpp \
+ /opt/local/include/boost/bind/bind_cc.hpp \
+ /opt/local/include/boost/bind/bind_mf_cc.hpp \
+ /opt/local/include/boost/bind/bind_mf2_cc.hpp \
+ /opt/local/include/boost/bind/placeholders.hpp \
+ /opt/local/include/boost/io/ios_state.hpp \
+ /opt/local/include/boost/io_fwd.hpp \
+ /opt/local/include/boost/functional/hash.hpp \
+ /opt/local/include/boost/functional/hash/hash.hpp \
+ /opt/local/include/boost/functional/hash/hash_fwd.hpp \
+ /opt/local/include/boost/functional/hash/detail/hash_float.hpp \
+ /opt/local/include/boost/functional/hash/detail/float_functions.hpp \
+ /opt/local/include/boost/functional/hash/detail/limits.hpp \
+ /opt/local/include/boost/integer/static_log2.hpp \
+ /opt/local/include/boost/integer_fwd.hpp \
+ /opt/local/include/boost/functional/hash/extensions.hpp \
+ /opt/local/include/boost/detail/container_fwd.hpp \
+ /opt/local/include/boost/thread/detail/thread_interruption.hpp \
+ /opt/local/include/boost/thread/detail/thread_group.hpp \
+ /opt/local/include/boost/thread/shared_mutex.hpp \
+ /opt/local/include/boost/thread/pthread/shared_mutex.hpp \
+ /opt/local/include/boost/thread/condition_variable.hpp \
+ /opt/local/include/boost/thread/win32/condition_variable.hpp \
+ /opt/local/include/boost/thread/pthread/condition_variable.hpp \
+ /opt/local/include/boost/thread/win32/shared_mutex.hpp \
+ /opt/local/include/boost/thread/v2/thread.hpp \
+ /opt/local/include/boost/thread/once.hpp \
+ /opt/local/include/boost/thread/win32/once.hpp \
+ /opt/local/include/boost/thread/pthread/once.hpp \
+ /opt/local/include/boost/thread/recursive_mutex.hpp \
+ /opt/local/include/boost/thread/win32/recursive_mutex.hpp \
+ /opt/local/include/boost/thread/win32/basic_recursive_mutex.hpp \
+ /opt/local/include/boost/thread/pthread/recursive_mutex.hpp \
+ /opt/local/include/boost/thread/tss.hpp \
+ /opt/local/include/boost/thread/locks.hpp \
+ /opt/local/include/boost/thread/lock_algorithms.hpp \
+ /opt/local/include/boost/thread/barrier.hpp \
+ /opt/local/include/boost/thread/future.hpp \
+ /opt/local/include/boost/thread/detail/async_func.hpp \
+ /opt/local/include/boost/utility/result_of.hpp \
+ /opt/local/include/boost/preprocessor/facilities/intercept.hpp \
+ /opt/local/include/boost/exception_ptr.hpp \
+ /opt/local/include/boost/exception/detail/exception_ptr.hpp \
+ /opt/local/include/boost/exception/info.hpp \
+ /opt/local/include/boost/exception/to_string_stub.hpp \
+ /opt/local/include/boost/exception/to_string.hpp \
+ /opt/local/include/boost/exception/detail/is_output_streamable.hpp \
+ /opt/local/include/boost/exception/detail/object_hex_dump.hpp \
+ /opt/local/include/boost/exception/detail/type_info.hpp \
+ /opt/local/include/boost/units/detail/utility.hpp \
+ /opt/local/include/boost/algorithm/string/replace.hpp \
+ /opt/local/include/boost/algorithm/string/config.hpp \
+ /opt/local/include/boost/range/iterator_range.hpp \
+ /opt/local/include/boost/range/iterator_range_core.hpp \
+ /opt/local/include/boost/iterator/iterator_traits.hpp \
+ /opt/local/include/boost/detail/iterator.hpp \
+ /opt/local/include/boost/type_traits/remove_const.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_const.hpp \
+ /opt/local/include/boost/type_traits/remove_pointer.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_pointer.hpp \
+ /opt/local/include/boost/iterator/iterator_facade.hpp \
+ /opt/local/include/boost/iterator/interoperable.hpp \
+ /opt/local/include/boost/iterator/detail/config_def.hpp \
+ /opt/local/include/boost/iterator/detail/config_undef.hpp \
+ /opt/local/include/boost/iterator/detail/facade_iterator_category.hpp \
+ /opt/local/include/boost/iterator/iterator_categories.hpp \
+ /opt/local/include/boost/detail/indirect_traits.hpp \
+ /opt/local/include/boost/detail/is_function_ref_tester.hpp \
+ /opt/local/include/boost/iterator/detail/enable_if.hpp \
+ /opt/local/include/boost/range/functions.hpp \
+ /opt/local/include/boost/range/begin.hpp \
+ /opt/local/include/boost/range/config.hpp \
+ /opt/local/include/boost/range/detail/begin.hpp \
+ /opt/local/include/boost/range/iterator.hpp \
+ /opt/local/include/boost/range/mutable_iterator.hpp \
+ /opt/local/include/boost/range/detail/iterator.hpp \
+ /opt/local/include/boost/range/detail/common.hpp \
+ /opt/local/include/boost/range/detail/sfinae.hpp \
+ /opt/local/include/boost/range/detail/remove_extent.hpp \
+ /opt/local/include/boost/range/detail/extract_optional_type.hpp \
+ /opt/local/include/boost/range/const_iterator.hpp \
+ /opt/local/include/boost/range/detail/const_iterator.hpp \
+ /opt/local/include/boost/range/value_type.hpp \
+ /opt/local/include/boost/range/end.hpp \
+ /opt/local/include/boost/range/detail/end.hpp \
+ /opt/local/include/boost/range/detail/vc6/end.hpp \
+ /opt/local/include/boost/range/detail/implementation_help.hpp \
+ /opt/local/include/boost/range/result_iterator.hpp \
+ /opt/local/include/boost/range/size.hpp \
+ /opt/local/include/boost/range/size_type.hpp \
+ /opt/local/include/boost/range/difference_type.hpp \
+ /opt/local/include/boost/range/detail/size_type.hpp \
+ /opt/local/include/boost/range/distance.hpp \
+ /opt/local/include/boost/range/empty.hpp \
+ /opt/local/include/boost/range/rbegin.hpp \
+ /opt/local/include/boost/range/reverse_iterator.hpp \
+ /opt/local/include/boost/iterator/reverse_iterator.hpp \
+ /opt/local/include/boost/next_prior.hpp \
+ /opt/local/include/boost/iterator/iterator_adaptor.hpp \
+ /opt/local/include/boost/range/rend.hpp \
+ /opt/local/include/boost/range/algorithm/equal.hpp \
+ /opt/local/include/boost/range/concepts.hpp \
+ /opt/local/include/boost/concept_check.hpp \
+ /opt/local/include/boost/concept/assert.hpp \
+ /opt/local/include/boost/concept/detail/msvc.hpp \
+ /opt/local/include/boost/concept/detail/backward_compatibility.hpp \
+ /opt/local/include/boost/concept/detail/has_constraints.hpp \
+ /opt/local/include/boost/concept/detail/borland.hpp \
+ /opt/local/include/boost/concept/detail/general.hpp \
+ /opt/local/include/boost/type_traits/conversion_traits.hpp \
+ /opt/local/include/boost/concept/usage.hpp \
+ /opt/local/include/boost/concept/detail/concept_def.hpp \
+ /opt/local/include/boost/concept/detail/concept_undef.hpp \
+ /opt/local/include/boost/iterator/iterator_concepts.hpp \
+ /opt/local/include/boost/range/detail/misc_concept.hpp \
+ /opt/local/include/boost/range/detail/safe_bool.hpp \
+ /opt/local/include/boost/range/iterator_range_io.hpp \
+ /opt/local/include/boost/algorithm/string/find_format.hpp \
+ /opt/local/include/boost/range/as_literal.hpp \
+ /opt/local/include/boost/range/detail/as_literal.hpp \
+ /opt/local/include/boost/range/detail/detail_str.hpp \
+ /opt/local/include/boost/range/detail/value_type.hpp \
+ /opt/local/include/boost/range/detail/str_types.hpp \
+ /opt/local/include/boost/algorithm/string/concept.hpp \
+ /opt/local/include/boost/algorithm/string/detail/find_format.hpp \
+ /opt/local/include/boost/algorithm/string/detail/find_format_store.hpp \
+ /opt/local/include/boost/algorithm/string/detail/replace_storage.hpp \
+ /opt/local/include/boost/algorithm/string/sequence_traits.hpp \
+ /opt/local/include/boost/algorithm/string/yes_no_type.hpp \
+ /opt/local/include/boost/algorithm/string/detail/sequence.hpp \
+ /opt/local/include/boost/algorithm/string/detail/find_format_all.hpp \
+ /opt/local/include/boost/algorithm/string/finder.hpp \
+ /opt/local/include/boost/algorithm/string/constants.hpp \
+ /opt/local/include/boost/algorithm/string/detail/finder.hpp \
+ /opt/local/include/boost/algorithm/string/compare.hpp \
+ /opt/local/include/boost/algorithm/string/formatter.hpp \
+ /opt/local/include/boost/algorithm/string/detail/formatter.hpp \
+ /opt/local/include/boost/algorithm/string/detail/util.hpp \
+ /opt/local/include/boost/exception/detail/error_info_impl.hpp \
+ /opt/local/include/boost/exception/diagnostic_information.hpp \
+ /opt/local/include/boost/exception/get_error_info.hpp \
+ /opt/local/include/boost/exception/current_exception_cast.hpp \
+ /opt/local/include/boost/exception/detail/clone_current_exception.hpp \
+ /opt/local/include/boost/scoped_ptr.hpp \
+ /opt/local/include/boost/smart_ptr/scoped_ptr.hpp \
+ /opt/local/include/boost/function.hpp \
+ /opt/local/include/boost/function/detail/prologue.hpp \
+ /opt/local/include/boost/function/function_base.hpp \
+ /opt/local/include/boost/integer.hpp \
+ /opt/local/include/boost/type_traits/has_trivial_destructor.hpp \
+ /opt/local/include/boost/function_equal.hpp \
+ /opt/local/include/boost/function/function_fwd.hpp \
+ /opt/local/include/boost/preprocessor/enum.hpp \
+ /opt/local/include/boost/function/function0.hpp \
+ /opt/local/include/boost/function/detail/maybe_include.hpp \
+ /opt/local/include/boost/function/function_template.hpp \
+ /opt/local/include/boost/function/function1.hpp \
+ /opt/local/include/boost/function/function2.hpp \
+ /opt/local/include/boost/function/function3.hpp \
+ /opt/local/include/boost/function/function4.hpp \
+ /opt/local/include/boost/function/function5.hpp \
+ /opt/local/include/boost/function/function6.hpp \
+ /opt/local/include/boost/function/function7.hpp \
+ /opt/local/include/boost/function/function8.hpp \
+ /opt/local/include/boost/function/function9.hpp \
+ /opt/local/include/boost/function/function10.hpp \
+ /opt/local/include/boost/scoped_array.hpp \
+ /opt/local/include/boost/smart_ptr/scoped_array.hpp \
+ /opt/local/include/boost/thread/future_error_code.hpp \
+ /opt/local/include/boost/thread/detail/memory.hpp \
+ /opt/local/include/boost/container/allocator_traits.hpp \
+ /opt/local/include/boost/container/detail/config_begin.hpp \
+ /opt/local/include/boost/container/detail/workaround.hpp \
+ /opt/local/include/boost/container/detail/config_end.hpp \
+ /opt/local/include/boost/intrusive/pointer_traits.hpp \
+ /opt/local/include/boost/intrusive/detail/config_begin.hpp \
+ /opt/local/include/boost/intrusive/detail/workaround.hpp \
+ /opt/local/include/boost/intrusive/detail/config_end.hpp \
+ /opt/local/include/boost/intrusive/detail/memory_util.hpp \
+ /opt/local/include/boost/intrusive/detail/mpl.hpp \
+ /opt/local/include/boost/intrusive/detail/preprocessor.hpp \
+ /opt/local/include/boost/preprocessor/punctuation/paren_if.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum_shifted.hpp \
+ /opt/local/include/boost/intrusive/detail/has_member_function_callable_with.hpp \
+ /opt/local/include/boost/move/move.hpp \
+ /opt/local/include/boost/move/iterator.hpp \
+ /opt/local/include/boost/move/traits.hpp \
+ /opt/local/include/boost/move/algorithm.hpp \
+ /opt/local/include/boost/container/detail/memory_util.hpp \
+ /opt/local/include/boost/container/detail/preprocessor.hpp \
+ /opt/local/include/boost/container/detail/mpl.hpp \
+ /opt/local/include/boost/container/scoped_allocator.hpp \
+ /opt/local/include/boost/container/scoped_allocator_fwd.hpp \
+ /opt/local/include/boost/container/detail/type_traits.hpp \
+ /opt/local/include/boost/container/detail/utilities.hpp \
+ /opt/local/include/boost/container/detail/pair.hpp \
+ ../../../../Core/Samples/inc/HomogeneousMaterial.h \
+ ../../../../Core/Samples/inc/IMaterial.h \
+ ../../../../Core/Tools/inc/MessageService.h \
+ ../../../../Core/Samples/inc/MultiLayer.h \
+ ../../../../Core/Samples/inc/ICompositeSample.h \
+ ../../../../Core/Samples/inc/Layer.h \
+ ../../../../Core/Algorithms/inc/LayerDWBASimulation.h \
+ ../../../../Core/Algorithms/inc/DWBASimulation.h \
+ ../../../../Core/Algorithms/inc/ISimulation.h \
+ ../../../../Core/Algorithms/inc/Simulation.h \
+ ../../../../Core/Algorithms/inc/Instrument.h \
+ ../../../../Core/Algorithms/inc/Beam.h \
+ ../../../../Core/Algorithms/inc/Detector.h \
+ ../../../../Core/Algorithms/inc/IDetectorResolution.h \
+ ../../../../Core/Algorithms/inc/DetectorParameters.h \
+ ../../../../Core/Tools/inc/TRange.h \
+ ../../../../Core/Algorithms/inc/IResolutionFunction2D.h \
+ ../../../../Core/Algorithms/inc/SimulationParameters.h \
+ ../../../../Core/Algorithms/inc/ThreadInfo.h \
+ ../../../../Core/Tools/inc/IDoubleToComplexFunction.h \
+ ../../../../Core/Samples/inc/LayerInterface.h \
+ ../../../../Core/Samples/inc/LayerRoughness.h \
+ ../../../../Core/Samples/inc/IRoughness.h \
+ ../../../../Core/Algorithms/inc/MultiLayerDWBASimulation.h \
+ ../../../../Core/Samples/inc/LayerDecorator.h \
+ ../../../../Core/Samples/inc/ParticleDecoration.h \
+ ../../../../Core/Samples/inc/IDecoration.h \
+ ../../../../Core/FormFactors/inc/IFormFactor.h \
+ ../../../../Core/Tools/inc/MemberFunctionIntegrator.h \
+ /opt/local/include/gsl/gsl_integration.h \
+ /opt/local/include/gsl/gsl_math.h \
+ /opt/local/include/gsl/gsl_sys.h \
+ /opt/local/include/gsl/gsl_inline.h \
+ /opt/local/include/gsl/gsl_machine.h \
+ /opt/local/include/gsl/gsl_precision.h \
+ /opt/local/include/gsl/gsl_types.h \
+ /opt/local/include/gsl/gsl_nan.h \
+ /opt/local/include/gsl/gsl_pow_int.h \
+ /opt/local/include/gsl/gsl_minmax.h \
+ ../../../../Core/Samples/inc/ParticleInfo.h \
+ ../../../../Core/Samples/inc/Particle.h \
+ ../../../../Core/FormFactors/inc/FormFactorDecoratorRefractiveIndex.h \
+ ../../../../Core/FormFactors/inc/FormFactorDecoratorFactor.h \
+ ../../../../Core/FormFactors/inc/IFormFactorDecorator.h \
+ ../../../../Core/Geometry/inc/Transform3D.h \
+ ../../../../Core/Samples/inc/IInterferenceFunction.h \
+ ../../../../Core/Algorithms/inc/LayerDecoratorDWBASimulation.h \
+ ../../../../Core/Algorithms/inc/DiffuseDWBASimulation.h \
+ ../../../../Core/Samples/inc/DiffuseParticleInfo.h \
+ ../../../../Core/Algorithms/inc/IInterferenceFunctionStrategy.h \
+ ../../../../Core/Algorithms/inc/StrategyBuilder.h \
+ ../../../../Core/Samples/inc/InterferenceFunctions.h \
+ ../../../../Core/Samples/inc/InterferenceFunctionNone.h \
+ ../../../../Core/Samples/inc/InterferenceFunction1DParaCrystal.h \
+ ../../../../Core/Samples/inc/InterferenceFunction2DLattice.h \
+ ../../../../Core/Samples/inc/Lattice2DIFParameters.h \
+ ../../../../Core/Algorithms/inc/FTDistributions.h \
+ ../../../../Core/Samples/inc/InterferenceFunction2DParaCrystal.h \
+ ../../../../Core/FormFactors/inc/FormFactorCylinder.h \
+ ../../../../Core/FormFactors/inc/IFormFactorBorn.h \
+ ../../../../Core/Tools/inc/Units.h \
+ ../../../../Core/Fitting/inc/FitSuite.h \
+ ../../../../Core/Fitting/inc/AttFitting.h \
+ ../../../../Core/Fitting/inc/FitSuiteFunctions.h \
+ ../../../../Core/Fitting/inc/FitSuiteObjects.h \
+ ../../../../Core/Fitting/inc/FitObject.h \
+ ../../../../Core/Algorithms/inc/ChiSquaredModule.h \
+ ../../../../Core/Algorithms/inc/IChiSquaredModule.h \
+ ../../../../Core/Algorithms/inc/IFittingDataSelector.h \
+ ../../../../Core/Algorithms/inc/ISquaredFunction.h \
+ ../../../../Core/Algorithms/inc/IOutputDataNormalizer.h \
+ ../../../../Core/Algorithms/inc/IIntensityFunction.h \
+ ../../../../Core/Fitting/inc/FitSuiteParameters.h \
+ ../../../../Core/Fitting/inc/FitParameterLinked.h \
+ ../../../../Core/Fitting/inc/FitParameter.h \
+ ../../../../Core/Fitting/inc/AttLimits.h \
+ ../../../../Core/Fitting/inc/FitSuiteStrategies.h \
+ ../../../../Core/Fitting/inc/IFitSuiteStrategy.h \
+ ../../../../Core/Fitting/inc/IMinimizer.h \
+ ../../../../Core/Tools/inc/IObserver.h \
+ ../../../../Fit/Factory/inc/MinimizerFactory.h \
+ ../../../../Core/FormFactors/inc/FormFactorPrism3.h \
+ ../../../../Core/Tools/inc/IStochasticParameter.h \
+ ../../../../Core/Tools/inc/MathFunctions.h \
+ /opt/local/include/gsl/gsl_sf_bessel.h \
+ /opt/local/include/gsl/gsl_mode.h \
+ /opt/local/include/gsl/gsl_sf_result.h \
+ /opt/local/include/gsl/gsl_sf_trig.h \
+ /opt/local/include/gsl/gsl_sf_expint.h \
+ ../../../../Core/Tools/inc/Utils.h \
+ /opt/local/include/boost/unordered_map.hpp \
+ /opt/local/include/boost/unordered/unordered_map.hpp \
+ /opt/local/include/boost/unordered/unordered_map_fwd.hpp \
+ /opt/local/include/boost/functional/hash_fwd.hpp \
+ /opt/local/include/boost/unordered/detail/fwd.hpp \
+ /opt/local/include/boost/unordered/detail/equivalent.hpp \
+ /opt/local/include/boost/unordered/detail/table.hpp \
+ /opt/local/include/boost/unordered/detail/buckets.hpp \
+ /opt/local/include/boost/unordered/detail/util.hpp \
+ /opt/local/include/boost/type_traits/is_empty.hpp \
+ /opt/local/include/boost/detail/select_type.hpp \
+ /opt/local/include/boost/swap.hpp \
+ /opt/local/include/boost/unordered/detail/allocate.hpp \
+ /opt/local/include/boost/tuple/tuple.hpp \
+ /opt/local/include/boost/tuple/detail/tuple_basic_no_partial_spec.hpp \
+ /opt/local/include/boost/type_traits.hpp \
+ /opt/local/include/boost/type_traits/add_cv.hpp \
+ /opt/local/include/boost/type_traits/aligned_storage.hpp \
+ /opt/local/include/boost/aligned_storage.hpp \
+ /opt/local/include/boost/type_traits/conditional.hpp \
+ /opt/local/include/boost/type_traits/extent.hpp \
+ /opt/local/include/boost/type_traits/floating_point_promotion.hpp \
+ /opt/local/include/boost/mpl/multiplies.hpp \
+ /opt/local/include/boost/mpl/times.hpp \
+ /opt/local/include/boost/mpl/vector.hpp \
+ /opt/local/include/boost/mpl/limits/vector.hpp \
+ /opt/local/include/boost/mpl/aux_/sequence_wrapper.hpp \
+ /opt/local/include/boost/preprocessor/enum_params_with_a_default.hpp \
+ /opt/local/include/boost/preprocessor/repetition/enum_params_with_a_default.hpp \
+ /opt/local/include/boost/type_traits/function_traits.hpp \
+ /opt/local/include/boost/type_traits/has_new_operator.hpp \
+ /opt/local/include/boost/type_traits/has_nothrow_assign.hpp \
+ /opt/local/include/boost/type_traits/has_trivial_assign.hpp \
+ /opt/local/include/boost/type_traits/has_nothrow_destructor.hpp \
+ /opt/local/include/boost/type_traits/has_operator.hpp \
+ /opt/local/include/boost/type_traits/has_bit_and.hpp \
+ /opt/local/include/boost/type_traits/detail/has_binary_operator.hpp \
+ /opt/local/include/boost/type_traits/has_bit_and_assign.hpp \
+ /opt/local/include/boost/type_traits/has_bit_or.hpp \
+ /opt/local/include/boost/type_traits/has_bit_or_assign.hpp \
+ /opt/local/include/boost/type_traits/has_bit_xor.hpp \
+ /opt/local/include/boost/type_traits/has_bit_xor_assign.hpp \
+ /opt/local/include/boost/type_traits/has_complement.hpp \
+ /opt/local/include/boost/type_traits/detail/has_prefix_operator.hpp \
+ /opt/local/include/boost/type_traits/has_dereference.hpp \
+ /opt/local/include/boost/type_traits/has_divides.hpp \
+ /opt/local/include/boost/type_traits/has_divides_assign.hpp \
+ /opt/local/include/boost/type_traits/has_equal_to.hpp \
+ /opt/local/include/boost/type_traits/has_greater.hpp \
+ /opt/local/include/boost/type_traits/has_greater_equal.hpp \
+ /opt/local/include/boost/type_traits/has_left_shift.hpp \
+ /opt/local/include/boost/type_traits/has_left_shift_assign.hpp \
+ /opt/local/include/boost/type_traits/has_less.hpp \
+ /opt/local/include/boost/type_traits/has_less_equal.hpp \
+ /opt/local/include/boost/type_traits/has_logical_and.hpp \
+ /opt/local/include/boost/type_traits/has_logical_not.hpp \
+ /opt/local/include/boost/type_traits/has_logical_or.hpp \
+ /opt/local/include/boost/type_traits/has_minus.hpp \
+ /opt/local/include/boost/type_traits/has_minus_assign.hpp \
+ /opt/local/include/boost/type_traits/has_modulus.hpp \
+ /opt/local/include/boost/type_traits/has_modulus_assign.hpp \
+ /opt/local/include/boost/type_traits/has_multiplies.hpp \
+ /opt/local/include/boost/type_traits/has_multiplies_assign.hpp \
+ /opt/local/include/boost/type_traits/has_negate.hpp \
+ /opt/local/include/boost/type_traits/has_not_equal_to.hpp \
+ /opt/local/include/boost/type_traits/has_plus.hpp \
+ /opt/local/include/boost/type_traits/has_plus_assign.hpp \
+ /opt/local/include/boost/type_traits/has_post_decrement.hpp \
+ /opt/local/include/boost/type_traits/detail/has_postfix_operator.hpp \
+ /opt/local/include/boost/type_traits/has_post_increment.hpp \
+ /opt/local/include/boost/type_traits/has_pre_decrement.hpp \
+ /opt/local/include/boost/type_traits/has_pre_increment.hpp \
+ /opt/local/include/boost/type_traits/has_right_shift.hpp \
+ /opt/local/include/boost/type_traits/has_right_shift_assign.hpp \
+ /opt/local/include/boost/type_traits/has_unary_minus.hpp \
+ /opt/local/include/boost/type_traits/has_unary_plus.hpp \
+ /opt/local/include/boost/type_traits/has_virtual_destructor.hpp \
+ /opt/local/include/boost/type_traits/is_complex.hpp \
+ /opt/local/include/boost/type_traits/is_compound.hpp \
+ /opt/local/include/boost/type_traits/is_member_object_pointer.hpp \
+ /opt/local/include/boost/type_traits/is_object.hpp \
+ /opt/local/include/boost/type_traits/is_stateless.hpp \
+ /opt/local/include/boost/type_traits/is_virtual_base_of.hpp \
+ /opt/local/include/boost/type_traits/rank.hpp \
+ /opt/local/include/boost/type_traits/remove_extent.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_extent.hpp \
+ /opt/local/include/boost/type_traits/remove_all_extents.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_all_extents.hpp \
+ /opt/local/include/boost/type_traits/remove_volatile.hpp \
+ /opt/local/include/boost/type_traits/msvc/remove_volatile.hpp \
+ /opt/local/include/boost/type_traits/integral_promotion.hpp \
+ /opt/local/include/boost/type_traits/promote.hpp \
+ /opt/local/include/boost/tuple/detail/tuple_basic.hpp \
+ /opt/local/include/boost/type_traits/cv_traits.hpp \
+ /opt/local/include/boost/pointer_to_other.hpp \
+ /opt/local/include/boost/unordered/detail/extract_key.hpp \
+ /opt/local/include/boost/unordered/detail/unique.hpp \
+ /opt/local/include/boost/format.hpp \
+ /opt/local/include/boost/format/detail/compat_workarounds.hpp \
+ /opt/local/include/boost/format/detail/config_macros.hpp \
+ /opt/local/include/boost/format/detail/workarounds_gcc-2_95.hpp \
+ /opt/local/include/boost/format/detail/workarounds_stlport.hpp \
+ /opt/local/include/boost/format/format_fwd.hpp \
+ /opt/local/include/boost/format/internals_fwd.hpp \
+ /opt/local/include/boost/format/internals.hpp \
+ /opt/local/include/boost/format/alt_sstream.hpp \
+ /opt/local/include/boost/utility/base_from_member.hpp \
+ /opt/local/include/boost/format/alt_sstream_impl.hpp \
+ /opt/local/include/boost/format/format_class.hpp \
+ /opt/local/include/boost/format/exceptions.hpp \
+ /opt/local/include/boost/format/format_implementation.hpp \
+ /opt/local/include/boost/format/group.hpp \
+ /opt/local/include/boost/format/feed_args.hpp \
+ /opt/local/include/boost/format/detail/msvc_disambiguater.hpp \
+ /opt/local/include/boost/format/parsing.hpp \
+ /opt/local/include/boost/format/free_funcs.hpp \
+ /opt/local/include/boost/format/detail/unset_macros.hpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/debug/TestFit02.o TestFit02.cpp
+
+.obj/debug/SampleBuilder.o: SampleBuilder.cpp SampleBuilder.h \
+ ../../../../Core/Algorithms/inc/ISampleBuilder.h \
+ ../../../../Core/Samples/inc/ISample.h \
+ ../../../../Core/Tools/inc/IParameterized.h \
+ ../../../../Core/Tools/inc/INamed.h \
+ ../../../../Core/Tools/inc/IChangeable.h \
+ ../../../../Core/Tools/inc/ParameterPool.h \
+ ../../../../Core/Tools/inc/ICloneable.h \
+ ../../../../Core/Tools/inc/Exceptions.h \
+ ../../../../Core/Tools/inc/RealParameterWrapper.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/debug/SampleBuilder.o SampleBuilder.cpp
+
+####### Install
+
+install: FORCE
+
+uninstall: FORCE
+
+FORCE:
+
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.cpp b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..19ce61ac76e67299602ecb47dab1e8fcd03afff6
--- /dev/null
+++ b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.cpp
@@ -0,0 +1,59 @@
+#include "SampleBuilder.h"
+#include "MultiLayer.h"
+#include "LayerDecorator.h"
+#include "ParticleDecoration.h"
+#include "InterferenceFunctions.h"
+#include "FormFactorCylinder.h"
+#include "Units.h"
+#include "MaterialManager.h"
+#include "MinimizerFactory.h"
+#include "FormFactorPrism3.h"
+#include "MathFunctions.h"
+#include "Utils.h"
+
+
+// ----------------------------------------------------------------------------
+// Sample builder to build mixture of cylinders and prisms on top of substrate
+// 5 parameters
+// ----------------------------------------------------------------------------
+SampleBuilder::SampleBuilder()
+ : m_cylinder_height(5.0*Units::nanometer)
+ , m_cylinder_radius(5.0*Units::nanometer)
+ , m_prism3_half_side(5.0*Units::nanometer)
+ , m_prism3_height(5.0*Units::nanometer)
+ , m_cylinder_ratio(0.2)
+{
+ init_parameters();
+}
+
+// registering parameters in parameter pool
+void SampleBuilder::init_parameters()
+{
+ clearParameterPool();
+ registerParameter("cylinder_height", &m_cylinder_height);
+ registerParameter("cylinder_radius", &m_cylinder_radius);
+ registerParameter("prism3_half_side", &m_prism3_half_side);
+ registerParameter("prism3_height", &m_prism3_height);
+ registerParameter("cylinder_ratio", &m_cylinder_ratio);
+}
+
+// build sample from registered parameters
+ISample *SampleBuilder::buildSample() const
+{
+ MultiLayer *multi_layer = new MultiLayer();
+ const IMaterial *air_material = MaterialManager::getHomogeneousMaterial("Air", 1.0, 0.0);
+ const IMaterial *substrate_material = MaterialManager::getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8);
+ Layer air_layer(air_material);
+ Layer substrate_layer(substrate_material);
+
+ ParticleDecoration particle_decoration;
+ complex_t n_particle(1.0-6e-4, 2e-8);
+ particle_decoration.addParticle(new Particle(n_particle, new FormFactorCylinder(m_cylinder_height, m_cylinder_radius)),0.0, m_cylinder_ratio);
+ particle_decoration.addParticle(new Particle(n_particle, new FormFactorPrism3(m_prism3_height, m_prism3_half_side)), 0.0, 1.0 - m_cylinder_ratio);
+ particle_decoration.addInterferenceFunction(new InterferenceFunctionNone());
+ LayerDecorator air_layer_decorator(air_layer, particle_decoration);
+ multi_layer->addLayer(air_layer_decorator);
+ multi_layer->addLayer(substrate_layer);
+ return multi_layer;
+}
+
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.h b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.h
new file mode 100644
index 0000000000000000000000000000000000000000..3c91c214f0c6f5213fc42094a6d1224b1a8a7565
--- /dev/null
+++ b/Tests/FunctionalTests/TestFit/TestFit02/SampleBuilder.h
@@ -0,0 +1,26 @@
+#ifndef SAMPLEBUILDER_H
+#define SAMPLEBUILDER_H
+
+#include "ISampleBuilder.h"
+
+//! builds sample using set of input parameters
+class SampleBuilder : public ISampleBuilder
+{
+public:
+ SampleBuilder();
+
+ virtual ~SampleBuilder(){}
+ virtual ISample *buildSample() const;
+protected:
+ virtual void init_parameters();
+private:
+ double m_cylinder_height;
+ double m_cylinder_radius;
+ double m_prism3_half_side;
+ double m_prism3_height;
+ double m_cylinder_ratio;
+};
+
+
+
+#endif // SAMPLEBUILDER_H
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/TestFit02 b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02
new file mode 100755
index 0000000000000000000000000000000000000000..2895362b8150e6a2e5e22608c34d76e444bd96f2
Binary files /dev/null and b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02 differ
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.cpp b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c7642155a3b8d7f9364a9921881674db6adb4542
--- /dev/null
+++ b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.cpp
@@ -0,0 +1,134 @@
+#include "TestFit02.h"
+#include "SampleBuilder.h"
+
+#include "MaterialManager.h"
+#include "MessageService.h"
+#include "FitSuite.h"
+#include "MinimizerFactory.h"
+#include "MathFunctions.h"
+#include "Utils.h"
+#include "FitSuiteParameters.h"
+
+#include <iostream>
+#include <iomanip>
+#include <boost/format.hpp>
+
+using namespace FunctionalTests;
+
+
+
+TestFit02::TestFit02()
+ : m_test_name("TestFit02")
+ , m_test_description("Fitting using sample builder.")
+{ }
+
+
+int TestFit02::run()
+{
+ // values we want to find
+ double cylinder_height(5.0*Units::nanometer);
+ double cylinder_radius(5.0*Units::nanometer);
+ double prism3_half_side(5.0*Units::nanometer);
+ double prism3_height(5.0*Units::nanometer);
+ double cylinder_ratio(0.2);
+
+ // setting sample builder to initial values
+ SampleBuilder *sample_builder = new SampleBuilder();
+ sample_builder->setParameterValue("cylinder_height", cylinder_height);
+ sample_builder->setParameterValue("cylinder_radius", cylinder_radius);
+ sample_builder->setParameterValue("prism3_half_side", prism3_half_side);
+ sample_builder->setParameterValue("prism3_height", prism3_height);
+ sample_builder->setParameterValue("cylinder_ratio", cylinder_ratio);
+
+ Simulation *simulation = createSimulation();
+ simulation->setSampleBuilder(sample_builder);
+
+ OutputData<double> *real_data = createRealData(simulation);
+
+ // setting up fitting
+ FitSuite *fitSuite = new FitSuite();
+ fitSuite->setMinimizer( MinimizerFactory::createMinimizer("Minuit2", "Combined") );
+ fitSuite->initPrint(10);
+
+ fitSuite->addFitParameter("*SampleBuilder/cylinder_height", 4*Units::nanometer, 0.01*Units::nanometer, AttLimits::lowerLimited(0.01) );
+ fitSuite->addFitParameter("*SampleBuilder/cylinder_radius", 6*Units::nanometer, 0.01*Units::nanometer, AttLimits::lowerLimited(0.01) );
+ fitSuite->addFitParameter("*SampleBuilder/prism3_half_side", 4*Units::nanometer, 0.01*Units::nanometer, AttLimits::lowerLimited(0.01) );
+ fitSuite->addFitParameter("*SampleBuilder/prism3_height", 6*Units::nanometer, 0.01*Units::nanometer, AttLimits::lowerLimited(0.01) );
+ fitSuite->addFitParameter("*SampleBuilder/cylinder_ratio", 0.2, 0.1, AttLimits::fixed());
+ //fitSuite->addFitParameter("*Normalizer/scale", 1, 0.01*Units::nanometer, AttLimits::limited(0.9,1.1) );
+
+ ChiSquaredModule chiModule;
+ chiModule.setChiSquaredFunction( SquaredFunctionWithSystematicError() );
+ //chiModule.setOutputDataNormalizer( OutputDataSimpleNormalizer() );
+ fitSuite->addSimulationAndRealData(*simulation, *real_data, chiModule);
+
+ fitSuite->runFit();
+
+ delete simulation;
+ delete sample_builder;
+ delete real_data;
+
+ // ---------------------------------------------------------------
+ // analysing fit results
+ // ---------------------------------------------------------------
+ //fitSuite->getFitParameters()->getParameter("*SampleBuilder/cylinder_height")->getValue() << std::endl;
+ std::vector<double > initialParameters;
+ initialParameters.push_back(cylinder_height);
+ initialParameters.push_back(cylinder_radius);
+ initialParameters.push_back(prism3_half_side);
+ initialParameters.push_back(prism3_height);
+ initialParameters.push_back(cylinder_ratio);
+ std::vector<double > results = fitSuite->getFitParameters()->getValues();
+ const double threshold = 1.0e-02;
+ bool isSuccess = true;
+ for(size_t i=0; i<results.size(); ++i) {
+ double diff = std::fabs(results[i] - initialParameters[i])/initialParameters[i];
+ if(diff > threshold) isSuccess=false;
+ }
+
+ std::cout << m_test_name << " " << m_test_description << " " << (isSuccess ? "[OK]" : "[FAILED]") << std::endl;
+ return (isSuccess ? 0 : 1);
+}
+
+
+// create simulation
+Simulation *TestFit02::createSimulation()
+{
+ Simulation *simulation = new Simulation();
+ simulation->setDetectorParameters(100, 0.0*Units::degree, 2.0*Units::degree,100 , 0.0*Units::degree, 2.0*Units::degree);
+ simulation->setBeamParameters(1.0*Units::angstrom, -0.2*Units::degree, 0.0*Units::degree);
+ return simulation;
+}
+
+
+// generating "real" data by adding noise to the simulated data
+OutputData<double> *TestFit02::createRealData(Simulation *simulation)
+{
+ const double noise_factor = 0.1;
+ simulation->runSimulation();
+ OutputData<double> *result = simulation->getOutputDataClone();
+ OutputData<double>::iterator it = result->begin();
+ int index(0);
+ while (it != result->end()) {
+ double current = *it;
+ double sigma = noise_factor*std::sqrt(current);
+ double random = MathFunctions::GenerateNormalRandom(current, sigma);
+ if (random<0.0) random = 0.0;
+ *it = random;
+ index++;
+
+ ++it;
+ }
+ return result;
+}
+
+
+#ifdef STANDALONE
+int main()
+{
+ //Utils::EnableFloatingPointExceptions();
+ FunctionalTests::TestFit02 test;
+ return test.run();
+}
+#endif
+
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.h b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.h
new file mode 100644
index 0000000000000000000000000000000000000000..c7d12729f2ad7a277a935ed35a1c908088c6895f
--- /dev/null
+++ b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.h
@@ -0,0 +1,40 @@
+#ifndef _TESTFIT02_H
+#define _TESTFIT02_H
+
+#include "ISampleBuilder.h"
+#include "OutputData.h"
+#include <string>
+#include <vector>
+
+class ISample;
+class Simulation;
+
+namespace FunctionalTests {
+
+//! functional test: fitting using sample builder
+//
+//! This test shows how to use SampleBuilder class for constructing the sample
+//! and running fitting.
+
+class TestFit02
+{
+public:
+ TestFit02();
+ ~TestFit02(){}
+
+ //! run fitting
+ int run();
+
+private:
+
+ Simulation *createSimulation();
+ OutputData<double> *createRealData(Simulation *simulation);
+
+ std::string m_test_name;
+ std::string m_test_description;
+};
+
+}
+
+
+#endif
diff --git a/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.pro b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.pro
new file mode 100644
index 0000000000000000000000000000000000000000..d69786cc57556f196ae3fe9fb344050786088f7f
--- /dev/null
+++ b/Tests/FunctionalTests/TestFit/TestFit02/TestFit02.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+CONFIG += console
+CONFIG -= qt app_bundle
+QT -= core gui
+
+CONFIG+= BORNAGAIN_ROOT
+
+INCLUDEPATH += $$PWD/../../../../Fit/Factory/inc
+DEPENDPATH += $$PWD/../../../../Fit/Factory/inc
+
+include($$PWD/../../../../shared.pri)
+DEFINES += STANDALONE
+LIBS += $$PWD/../../../../lib/libBornAgainCore.so $$PWD/../../../../lib/libBornAgainFit.so
+
+SOURCES += TestFit02.cpp \
+ SampleBuilder.cpp
+HEADERS += TestFit02.h \
+ SampleBuilder.h
+
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
index 175ec16461d5bb99590d1af55971382fc6686c4f..8750824c066a665ffa725707b1e064a62f0bb023 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
@@ -3,6 +3,7 @@ import sys
import os
import numpy
import gzip
+import math
sys.path.append(os.path.abspath(
os.path.join(os.path.split(__file__)[0],
diff --git a/Tests/FunctionalTests/TestPyFit/README b/Tests/FunctionalTests/TestPyFit/README
index 66fc0dd2307640155dd7fe8e2a57ec985747871d..29097941f35807e3a01d08a413da3915c0f74164 100644
--- a/Tests/FunctionalTests/TestPyFit/README
+++ b/Tests/FunctionalTests/TestPyFit/README
@@ -9,4 +9,5 @@ python TestPyFit.py
List of tests
testfit01.py - Two parameter fit using variety of minimizers. Geometry: cylinders in the air.
+testfit02.py - Fitting using sample builder
diff --git a/Tests/FunctionalTests/TestPyFit/TestPyFit.py b/Tests/FunctionalTests/TestPyFit/TestPyFit.py
index 6caba87190cb36d01d35a66b515ea49f19599b48..dbcfbde9ae1e3dfcee9c99fbebd5f293e1dfaca1 100644
--- a/Tests/FunctionalTests/TestPyFit/TestPyFit.py
+++ b/Tests/FunctionalTests/TestPyFit/TestPyFit.py
@@ -7,9 +7,11 @@ import subprocess
import time
import testfit01
+import testfit02
Tests = {
- "TestFit01": testfit01.runTest
+ "TestFit01": testfit01.runTest,
+ "TestFit02": testfit02.runTest,
}
test_info = []
diff --git a/Tests/FunctionalTests/TestPyFit/testfit01.py b/Tests/FunctionalTests/TestPyFit/testfit01.py
index 34172693e640e0899cdc2e820098983b4305d0f9..f50039890867853126796e75950bbb11572ff061 100644
--- a/Tests/FunctionalTests/TestPyFit/testfit01.py
+++ b/Tests/FunctionalTests/TestPyFit/testfit01.py
@@ -31,7 +31,7 @@ Minimizers = [
("GSLMultiMin","BFGS"),
("GSLMultiMin","SteepestDescent"),
("GSLMultiFit",""),
- ("GSLSimAn","")
+# ("GSLSimAn","")
]
diff --git a/Tests/FunctionalTests/TestPyFit/testfit02.py b/Tests/FunctionalTests/TestPyFit/testfit02.py
new file mode 100644
index 0000000000000000000000000000000000000000..eb328b47a031432a8d9d0f77ecadecc0918d1c23
--- /dev/null
+++ b/Tests/FunctionalTests/TestPyFit/testfit02.py
@@ -0,0 +1,154 @@
+# functional test: fitting using sample builder
+#
+# This test shows how to use SampleBuilder class for constructing the sample
+# and running fitting.
+
+
+import sys
+import os
+import numpy
+import time
+import ctypes
+import math
+
+sys.path.append(os.path.abspath(
+ os.path.join(os.path.split(__file__)[0],
+ '..', '..', '..', 'lib')))
+
+from libBornAgainCore import *
+from libBornAgainFit import *
+
+# values we want to find
+cylinder_height = 5.0*nanometer
+cylinder_radius = 5.0*nanometer
+prism3_half_side = 5.0*nanometer
+prism3_height = 5.0*nanometer
+cylinder_ratio = 0.2
+
+# -----------------------------------------------------------------------------
+# run minimization using sample builder
+# -----------------------------------------------------------------------------
+def runTest():
+ #print "**********************************************************************"
+ #print "* Starting TestFit02 *"
+ #print "**********************************************************************"
+
+ # setting sample builder to initial values
+ sample_builder = MySampleBuilder()
+ sample_builder.setParameterValue("cylinder_height", cylinder_height)
+ sample_builder.setParameterValue("cylinder_radius", cylinder_radius)
+ sample_builder.setParameterValue("prism3_half_side", prism3_half_side)
+ sample_builder.setParameterValue("prism3_height", prism3_height)
+ sample_builder.setParameterValue("cylinder_ratio", cylinder_ratio)
+
+ simulation = createSimulation()
+ simulation.setSampleBuilder(sample_builder)
+
+ real_data = createRealData(simulation)
+
+ # setting up fitting
+ fitSuite = FitSuite()
+ fitSuite.setMinimizer( MinimizerFactory.createMinimizer("Minuit2", "Combined") )
+ fitSuite.initPrint(10);
+ fitSuite.addFitParameter("*SampleBuilder/cylinder_height", 4*nanometer, 0.01*nanometer, AttLimits.lowerLimited(0.01) )
+ fitSuite.addFitParameter("*SampleBuilder/cylinder_radius", 6*nanometer, 0.01*nanometer, AttLimits.lowerLimited(0.01) )
+ fitSuite.addFitParameter("*SampleBuilder/prism3_half_side", 4*nanometer, 0.01*nanometer, AttLimits.lowerLimited(0.01) )
+ fitSuite.addFitParameter("*SampleBuilder/prism3_height", 6*nanometer, 0.01*nanometer, AttLimits.lowerLimited(0.01) )
+ fitSuite.addFitParameter("*SampleBuilder/cylinder_ratio", 0.2, 0.1, AttLimits.fixed());
+
+ chiModule = ChiSquaredModule()
+ chiModule.setChiSquaredFunction( SquaredFunctionWithSystematicError() )
+
+ fitSuite.addSimulationAndRealData(simulation, real_data, chiModule)
+ fitSuite.runFit()
+
+ # analysing fit results
+ initialParameters = [ cylinder_height, cylinder_radius, prism3_half_side, prism3_height, cylinder_ratio]
+ results = fitSuite.getFitParameters().getValues()
+ threshold = 1.0e-02
+ status = "OK"
+ for i in range(0, len(initialParameters)):
+ diff = abs(results[i] - initialParameters[i])/initialParameters[i]
+ if(diff > threshold): status = "FAILED"
+
+ return "TestFit02", "Fitting using sample builder.", status
+
+
+# create simulation
+def createSimulation():
+ simulation = Simulation();
+ simulation.setDetectorParameters(100, 0.0*degree, 2.0*degree,100 , 0.0*degree, 2.0*degree);
+ simulation.setBeamParameters(1.0*angstrom, -0.2*degree, 0.0*degree);
+ #simulation.setBeamIntensity(1e10);
+ return simulation
+
+
+# generating "real" data by adding noise to the simulated data
+def createRealData(simulation):
+ simulation.runSimulation();
+ real_data = simulation.getOutputDataClone()
+ noise_factor = 0.1
+ for i in range(0,real_data.getAllocatedSize()):
+ amplitude = real_data[i]
+ sigma = noise_factor*math.sqrt(amplitude)
+ noisy_amplitude = GenerateNormalRandom(amplitude, sigma)
+ if(noisy_amplitude < 0.0) : noisy_amplitude = 0.0
+ real_data[i] = noisy_amplitude
+ return real_data
+
+
+# ----------------------------------------------------------------------------
+# Sample builder to build mixture of cylinders and prisms on top of substrate
+# 5 parameters
+2# ----------------------------------------------------------------------------
+class MySampleBuilder(ISampleBuilder):
+ def __init__(self):
+ ISampleBuilder.__init__(self)
+ print "MySampleBuilder ctor"
+ self.sample = None
+ # parameters describing the sample
+ self.cylinder_height = ctypes.c_double(5.0*nanometer)
+ self.cylinder_radius = ctypes.c_double(5.0*nanometer)
+ self.prism3_half_side = ctypes.c_double(5.0*nanometer)
+ self.prism3_height = ctypes.c_double(5.0*nanometer)
+ self.cylinder_ratio = ctypes.c_double(0.2)
+ # register parameters
+ self.registerParameter("cylinder_height", ctypes.addressof(self.cylinder_height) )
+ self.registerParameter("cylinder_radius", ctypes.addressof(self.cylinder_radius) )
+ self.registerParameter("prism3_half_side", ctypes.addressof(self.prism3_half_side) )
+ self.registerParameter("prism3_height", ctypes.addressof(self.prism3_height) )
+ self.registerParameter("cylinder_ratio", ctypes.addressof(self.cylinder_ratio) )
+
+ # constructs the sample for current values of parameters
+ def buildSample(self):
+ multi_layer = MultiLayer()
+ air_material = MaterialManager.getHomogeneousMaterial("Air", 1.0, 0.0)
+ substrate_material = MaterialManager.getHomogeneousMaterial("Substrate", 1.0-6e-6, 2e-8)
+ air_layer = Layer(air_material)
+ substrate_layer = Layer(substrate_material)
+
+ n_particle = complex(1.0-6e-4, 2e-8)
+ cylinder_ff = FormFactorCylinder( self.cylinder_height.value, self.cylinder_radius.value)
+ prism_ff = FormFactorPrism3( self.prism3_height.value, self.prism3_half_side.value)
+ cylinder = Particle(n_particle, cylinder_ff)
+ prism = Particle(n_particle, prism_ff)
+ interference = InterferenceFunctionNone()
+
+ particle_decoration = ParticleDecoration()
+ particle_decoration.addParticle(cylinder, 0.0, self.cylinder_ratio.value)
+ particle_decoration.addParticle(prism, 0.0, 1.0 - self.cylinder_ratio.value)
+ particle_decoration.addInterferenceFunction(interference)
+
+ layer_with_particles = LayerDecorator(air_layer, particle_decoration)
+ multi_layer.addLayer(layer_with_particles)
+ multi_layer.addLayer(substrate_layer)
+ self.sample = multi_layer
+ return self.sample
+
+#-------------------------------------------------------------
+# main()
+#-------------------------------------------------------------
+if __name__ == '__main__':
+ name,description,status = runTest()
+ print name,description,status
+
diff --git a/Tests/FunctionalTests/test_all.py b/Tests/FunctionalTests/test_all.py
index 7ac20993ba0fb067ed839ac363ba246c20e4c865..a0b2bbbdb8ee95051a3881f3a43a0d424a9a8de7 100644
--- a/Tests/FunctionalTests/test_all.py
+++ b/Tests/FunctionalTests/test_all.py
@@ -10,14 +10,6 @@ import sys
import glob
-sys.path.insert(0, './TestPyCore')
-import TestPyCore
-sys.path.insert(0, './TestPyFit')
-import TestPyFit
-sys.path.insert(0, './TestCore')
-import TestCore
-sys.path.insert(0, './TestFit')
-import TestFit
def run_command(command):
p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -29,6 +21,10 @@ def run_command(command):
# run C++ functional tests
#-------------------------------------------------------------
def runCppTests():
+ sys.path.insert(0, './TestCore')
+ import TestCore
+ sys.path.insert(0, './TestFit')
+ import TestFit
#make compilation
print "Compiling C++ functional tests"
os.system("cd TestCore; qmake; make")
@@ -41,11 +37,24 @@ def runCppTests():
summary += TestFit.runTests()
return summary
+#-------------------------------------------------------------
+# clean C++ functional tests
+#-------------------------------------------------------------
+def cleanTests():
+ #make compilation
+ print "Cleaning..."
+ os.system("cd TestCore; make distclean")
+ os.system("cd TestFit; make disclean")
+
#-------------------------------------------------------------
# run python functional tests
#-------------------------------------------------------------
def runPythonTests():
+ sys.path.insert(0, './TestPyCore')
+ import TestPyCore
+ sys.path.insert(0, './TestPyFit')
+ import TestPyFit
summary = TestPyCore.runTests()
summary += TestPyFit.runTests()
return summary
@@ -66,6 +75,9 @@ def main():
elif len(sys.argv) == 2:
if "C++" in sys.argv[1]: run_python_tests = False
if "Python" in sys.argv[1]: run_cpp_tests = False
+ if "clean" in sys.argv[1]:
+ cleanTests();
+ exit()
summary = "\n"
summary += "Functional Tests Summary -->\n"
diff --git a/shared.pri b/shared.pri
index 6ccacf62b50ce10347fead9c66ee7b0ddc176483..ed3e5620c7a63b756548af78f17dcf0778afba57 100644
--- a/shared.pri
+++ b/shared.pri
@@ -102,6 +102,7 @@ LOCATIONS = $$PWD/Core/Algorithms/inc \
INCLUDEPATH += $${LOCATIONS}
DEPENDPATH += $${LOCATIONS}
+
# -----------------------------------------------------------------------------
# compiler options for debug and release
# -----------------------------------------------------------------------------
@@ -174,8 +175,9 @@ CONFIG(BORNAGAIN_ROOT) {
# -----------------------------------------------------------------------------
# add python API support
# -----------------------------------------------------------------------------
-# TODO - implement check for existance of numpy/arrayobject.h
+CONFIG += BORNAGAIN_PYTHON
CONFIG(BORNAGAIN_PYTHON) {
+ # TODO - implement check for existance of numpy/arrayobject.h
# user wants to compile python module
WhichPython=$$system(which python)
isEmpty(WhichPython) {
@@ -196,7 +198,7 @@ CONFIG(BORNAGAIN_PYTHON) {
#LIBS += -L$$pythonsyslibdir -lpython$$pythonvers -lboost_python
LIBS += -lboost_python -L$$pythonsyslibdir -lpython$$pythonvers
- # we need to know to location of numpy
+ # we need to know the location of numpy
pythonnumpy=$$system("python -c 'import sys; import numpy; sys.stdout.write(numpy.get_include())'")
INCLUDEPATH += $$pythonnumpy
}