diff --git a/BornAgain.pro b/BornAgain.pro
index 7e7ac6320977ca5e4b5076e876182064c3561312..5e5cef1371836968de1074601df8483e09d9ec6c 100644
--- a/BornAgain.pro
+++ b/BornAgain.pro
@@ -17,6 +17,7 @@ SUBDIRS += Fit
!isEmpty(ROOT_FRAMEWORK) {
SUBDIRS += App
}
+
SUBDIRS += Tests/FunctionalTests/TestCore
SUBDIRS += Tests/FunctionalTests/TestFit
diff --git a/Core/Algorithms/inc/Beam.h b/Core/Algorithms/inc/Beam.h
index 548aae5edb1d476d16e4085b5ea8f0a84034b061..f91504f423816a81a639f1c60dbd25304669e43a 100644
--- a/Core/Algorithms/inc/Beam.h
+++ b/Core/Algorithms/inc/Beam.h
@@ -20,7 +20,9 @@
#include "Types.h"
#include "IParameterized.h"
+#ifndef GCCXML_SKIP_THIS
#include <Eigen/Core>
+#endif
//! Ideal collimated Beam defined by wavelength, direction and intensity.
@@ -49,18 +51,24 @@ class BA_CORE_API_ Beam : public IParameterized
//! Sets the beam intensity in neutrons/sec
void setIntensity(double intensity) { m_intensity = intensity; }
+#ifndef GCCXML_SKIP_THIS
//! Gets the polarization density matrix (in spin basis along z-axis)
Eigen::Matrix2cd getPolarization() const { return m_polarization; }
+#endif
+#ifndef GCCXML_SKIP_THIS
//! Sets the polarization density matrix (in spin basis along z-axis)
void setPolarization(const Eigen::Matrix2cd &polarization);
+#endif
//! Sets the polarization density matrix to a value representing
//! a mixed ensemble with the given fraction of positive z spin
void SetSpinUpFraction(double up_fraction);
+#ifndef GCCXML_SKIP_THIS
//! Checks if the given matrix can represent a physical density matrix
bool checkPolarization(const Eigen::Matrix2cd &polarization) const;
+#endif
protected:
//! Registers some class members for later access via parameter pool
@@ -75,7 +83,9 @@ class BA_CORE_API_ Beam : public IParameterized
cvector_t m_central_k; //!< incoming wavevector
double m_intensity; //!< beam intensity (neutrons/sec)
+#ifndef GCCXML_SKIP_THIS
Eigen::Matrix2cd m_polarization; //!< polarization density matrix
+#endif
};
#endif /* BEAM_H_ */
diff --git a/Core/Algorithms/inc/DecoratedLayerDWBASimulation.h b/Core/Algorithms/inc/DecoratedLayerDWBASimulation.h
index ada2ef4646193823ef4ab1452bcb0d7ac4c76adc..548d3c9b925133a60bf93c9b68c76d0dce8e8913 100644
--- a/Core/Algorithms/inc/DecoratedLayerDWBASimulation.h
+++ b/Core/Algorithms/inc/DecoratedLayerDWBASimulation.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Algorithms/inc/LayerDecoratorDWBASimulation.h
-//! @brief Defines class LayerDecoratorDWBASimulation.
+//! @file Algorithms/inc/DecoratedLayerDWBASimulation.h
+//! @brief Defines class DecoratedLayerDWBASimulation.
//!
//! @homepage http://apps.jcns.fz-juelich.de/BornAgain
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -13,24 +13,24 @@
//
// ************************************************************************** //
-#ifndef LAYERDECORATORDWBASIMULATION_H_
-#define LAYERDECORATORDWBASIMULATION_H_
+#ifndef DECORATEDLAYERDWBASIMULATION_H_
+#define DECORATEDLAYERDWBASIMULATION_H_
#include "LayerDWBASimulation.h"
-#include "DiffuseDWBASimulation.h"
#include "IInterferenceFunctionStrategy.h"
+#include "DiffuseDWBASimulation.h"
class Layer;
//! Calculates scattering cross sections in DWBA for a layer with particles in/on it
-class LayerDecoratorDWBASimulation : public LayerDWBASimulation
+class DecoratedLayerDWBASimulation : public LayerDWBASimulation
{
public:
- LayerDecoratorDWBASimulation(const Layer *p_layer_decorator);
- virtual ~LayerDecoratorDWBASimulation();
+ DecoratedLayerDWBASimulation(const Layer *p_layer);
+ virtual ~DecoratedLayerDWBASimulation();
- LayerDecoratorDWBASimulation *clone() const
+ DecoratedLayerDWBASimulation *clone() const
{
throw NotImplementedException("LayerDecoratorDWBASimulation::clone() -> "
"Error: not implemented.");
@@ -51,6 +51,6 @@ class LayerDecoratorDWBASimulation : public LayerDWBASimulation
};
-#endif /* LAYERDECORATORDWBASIMULATION_H_ */
+#endif /* DECORATEDLAYERDWBASIMULATION_H_ */
diff --git a/Core/Algorithms/inc/IInterferenceFunctionStrategy.h b/Core/Algorithms/inc/IInterferenceFunctionStrategy.h
index 6d4b96d650aa54437aa1081a5c8c6ab25a401b84..aebdb8adef32120a62f99febf4a24bf686e173bc 100644
--- a/Core/Algorithms/inc/IInterferenceFunctionStrategy.h
+++ b/Core/Algorithms/inc/IInterferenceFunctionStrategy.h
@@ -20,7 +20,7 @@
#include "IInterferenceFunction.h"
#include "Bin.h"
#include "SafePointerVector.h"
-#include "StrategyBuilder.h"
+#include "LayerStrategyBuilder.h"
#include <vector>
@@ -28,7 +28,7 @@ class IInterferenceFunctionStrategy
{
public:
IInterferenceFunctionStrategy(SimulationParameters sim_params)
- : m_sim_params(sim_params) {};
+ : m_sim_params(sim_params) {}
virtual ~IInterferenceFunctionStrategy() {}
virtual void init(const SafePointerVector<FormFactorInfo>&
form_factor_infos,
diff --git a/Core/Algorithms/inc/LayerStrategyBuilder.h b/Core/Algorithms/inc/LayerStrategyBuilder.h
index b3e231f2654fd33706c1a42cba68cfac8a63ea43..2050359ce7242517fc9e8a1212639e64bd3deba2 100644
--- a/Core/Algorithms/inc/LayerStrategyBuilder.h
+++ b/Core/Algorithms/inc/LayerStrategyBuilder.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Algorithms/inc/StrategyBuilder.h
-//! @brief Defines classes LayerDecoratorStrategyBuilder, FormFactorInfo.
+//! @file Algorithms/inc/LayerStrategyBuilder.h
+//! @brief Defines classes LayerStrategyBuilder, FormFactorInfo.
//!
//! @homepage http://apps.jcns.fz-juelich.de/BornAgain
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef STRATEGYBUILDER_H_
-#define STRATEGYBUILDER_H_
+#ifndef LAYERSTRATEGYBUILDER_H_
+#define LAYERSTRATEGYBUILDER_H_
#include "SimulationParameters.h"
#include "SafePointerVector.h"
@@ -32,15 +32,15 @@ class IFormFactor;
//! Methods to generate a simulation strategy for decorated Layer SimulationParameters
-class LayerDecoratorStrategyBuilder
+class LayerStrategyBuilder
{
public:
- LayerDecoratorStrategyBuilder(
+ LayerStrategyBuilder(
const Layer& decorated_layer,
const Simulation& simulation,
const SimulationParameters& sim_params);
- virtual ~LayerDecoratorStrategyBuilder();
+ virtual ~LayerStrategyBuilder();
//! Sets R and T coefficient map for DWBA simulation
void setReflectionTransmissionFunction(
@@ -50,7 +50,7 @@ public:
virtual IInterferenceFunctionStrategy *createStrategy();
protected:
- Layer *mp_layer_decorator; //!< decorated layer
+ Layer *mp_layer; //!< decorated layer
Simulation *mp_simulation; //!< simulation
SimulationParameters m_sim_params; //!< simulation parameters
IDoubleToPairOfComplexMap *mp_RT_function; //!< R and T coefficients for DWBA
@@ -87,6 +87,6 @@ public:
double m_abundance;
};
-#endif /* STRATEGYBUILDER_H_ */
+#endif /* LAYERSTRATEGYBUILDER_H_ */
diff --git a/Core/Algorithms/src/DecoratedLayerDWBASimulation.cpp b/Core/Algorithms/src/DecoratedLayerDWBASimulation.cpp
index 7ffc825f958016b997404554ba34704d7377cbc4..976baf450e8728de2fc4ded9876e77ab50d0b5e6 100644
--- a/Core/Algorithms/src/DecoratedLayerDWBASimulation.cpp
+++ b/Core/Algorithms/src/DecoratedLayerDWBASimulation.cpp
@@ -13,26 +13,25 @@
//
// ************************************************************************** //
-#include "LayerDecoratorDWBASimulation.h"
-//#include "LayerDecorator.h"
+#include "DecoratedLayerDWBASimulation.h"
#include "Layer.h"
#include "FormFactors.h"
#include "MessageService.h"
-LayerDecoratorDWBASimulation::LayerDecoratorDWBASimulation(
+DecoratedLayerDWBASimulation::DecoratedLayerDWBASimulation(
const Layer *p_layer)
{
mp_layer = p_layer->clone();
mp_diffuseDWBA = mp_layer->createDiffuseDWBASimulation();
}
-LayerDecoratorDWBASimulation::~LayerDecoratorDWBASimulation()
+DecoratedLayerDWBASimulation::~DecoratedLayerDWBASimulation()
{
delete mp_layer;
delete mp_diffuseDWBA;
}
-void LayerDecoratorDWBASimulation::init(const Simulation& simulation)
+void DecoratedLayerDWBASimulation::init(const Simulation& simulation)
{
msglog(MSG::DEBUG) << "LayerDecoratorDWBASimulation::init()";
DWBASimulation::init(simulation);
@@ -41,7 +40,7 @@ void LayerDecoratorDWBASimulation::init(const Simulation& simulation)
}
}
-void LayerDecoratorDWBASimulation::run()
+void DecoratedLayerDWBASimulation::run()
{
msglog(MSG::DEBUG) << "LayerDecoratorDWBASimulation::run()";
IInterferenceFunctionStrategy *p_strategy = createAndInitStrategy();
@@ -53,9 +52,9 @@ void LayerDecoratorDWBASimulation::run()
}
IInterferenceFunctionStrategy
- *LayerDecoratorDWBASimulation::createAndInitStrategy() const
+ *DecoratedLayerDWBASimulation::createAndInitStrategy() const
{
- LayerDecoratorStrategyBuilder builder(
+ LayerStrategyBuilder builder(
*mp_layer, *mp_simulation, m_sim_params);
if (mp_RT_function)
builder.setReflectionTransmissionFunction(*mp_RT_function);
@@ -64,7 +63,7 @@ IInterferenceFunctionStrategy
}
std::vector<IFormFactor*>
-LayerDecoratorDWBASimulation::createDWBAFormFactors() const
+DecoratedLayerDWBASimulation::createDWBAFormFactors() const
{
msglog(MSG::DEBUG) << "LayerDecoratorDWBASimulation::create...()";
std::vector<IFormFactor*> result;
@@ -104,7 +103,7 @@ LayerDecoratorDWBASimulation::createDWBAFormFactors() const
return result;
}
-void LayerDecoratorDWBASimulation::calculateCoherentIntensity(
+void DecoratedLayerDWBASimulation::calculateCoherentIntensity(
const IInterferenceFunctionStrategy *p_strategy)
{
msglog(MSG::DEBUG) << "LayerDecoratorDWBASimulation::calculateCoh...()";
@@ -136,7 +135,7 @@ void LayerDecoratorDWBASimulation::calculateCoherentIntensity(
}
}
-void LayerDecoratorDWBASimulation::calculateInCoherentIntensity()
+void DecoratedLayerDWBASimulation::calculateInCoherentIntensity()
{
msglog(MSG::DEBUG) << "Calculating incoherent scattering...";
if (mp_diffuseDWBA) {
diff --git a/Core/Algorithms/src/LayerStrategyBuilder.cpp b/Core/Algorithms/src/LayerStrategyBuilder.cpp
index d420ed4169c2211d88e8c3a70ba3b3fa88845bc0..b9921be3003010e3dfa3ecb19d2ba4c37cd27f54 100644
--- a/Core/Algorithms/src/LayerStrategyBuilder.cpp
+++ b/Core/Algorithms/src/LayerStrategyBuilder.cpp
@@ -14,7 +14,7 @@
//
// ************************************************************************** //
-#include "StrategyBuilder.h"
+#include "LayerStrategyBuilder.h"
#include "Layer.h"
#include "Simulation.h"
#include "IDoubleToComplexFunction.h"
@@ -25,25 +25,26 @@
#include <cmath>
-LayerDecoratorStrategyBuilder::LayerDecoratorStrategyBuilder(
+LayerStrategyBuilder::LayerStrategyBuilder(
const Layer& decorated_layer, const Simulation& simulation,
const SimulationParameters& sim_params)
- : mp_layer_decorator(decorated_layer.clone())
+ : mp_layer(decorated_layer.clone())
, mp_simulation(simulation.clone())
, m_sim_params(sim_params)
, mp_RT_function(0)
{
+ assert(mp_layer->getDecoration());
}
-LayerDecoratorStrategyBuilder::~LayerDecoratorStrategyBuilder()
+LayerStrategyBuilder::~LayerStrategyBuilder()
{
- delete mp_layer_decorator;
+ delete mp_layer;
delete mp_simulation;
delete mp_RT_function;
}
-void LayerDecoratorStrategyBuilder::setReflectionTransmissionFunction(
+void LayerStrategyBuilder::setReflectionTransmissionFunction(
const IDoubleToPairOfComplexMap& rt_map)
{
if (mp_RT_function !=& rt_map) {
@@ -52,7 +53,7 @@ void LayerDecoratorStrategyBuilder::setReflectionTransmissionFunction(
}
}
-IInterferenceFunctionStrategy* LayerDecoratorStrategyBuilder::createStrategy()
+IInterferenceFunctionStrategy* LayerStrategyBuilder::createStrategy()
{
collectFormFactorInfos();
collectInterferenceFunctions();
@@ -96,11 +97,12 @@ IInterferenceFunctionStrategy* LayerDecoratorStrategyBuilder::createStrategy()
return p_result;
}
-void LayerDecoratorStrategyBuilder::collectFormFactorInfos()
+void LayerStrategyBuilder::collectFormFactorInfos()
{
+ assert(mp_layer->getDecoration());
m_ff_infos.clear();
- const IDecoration *p_decoration = mp_layer_decorator->getDecoration();
- complex_t n_layer = mp_layer_decorator->getRefractiveIndex();
+ const IDecoration *p_decoration = mp_layer->getDecoration();
+ complex_t n_layer = mp_layer->getRefractiveIndex();
double wavelength = getWavelength();
complex_t wavevector_scattering_factor = M_PI/wavelength/wavelength;
size_t number_of_particles = p_decoration->getNumberOfParticles();
@@ -119,23 +121,24 @@ void LayerDecoratorStrategyBuilder::collectFormFactorInfos()
return;
}
-void LayerDecoratorStrategyBuilder::collectInterferenceFunctions()
+void LayerStrategyBuilder::collectInterferenceFunctions()
{
+ assert(mp_layer->getDecoration());
m_ifs.clear();
- if (mp_layer_decorator->getDecoration()->getNumberOfInterferenceFunctions()) {
- m_ifs = mp_layer_decorator->getDecoration()->getInterferenceFunctions();
+ if (mp_layer->getDecoration()->getNumberOfInterferenceFunctions()) {
+ m_ifs = mp_layer->getDecoration()->getInterferenceFunctions();
}
else m_ifs.push_back(new InterferenceFunctionNone);
}
-double LayerDecoratorStrategyBuilder::getWavelength()
+double LayerStrategyBuilder::getWavelength()
{
cvector_t ki = mp_simulation->getInstrument().getBeam().getCentralK();
kvector_t ki_real(ki.x().real(), ki.y().real(), ki.z().real());
return 2*M_PI/ki_real.mag();
}
-FormFactorInfo *LayerDecoratorStrategyBuilder::createFormFactorInfo(
+FormFactorInfo *LayerStrategyBuilder::createFormFactorInfo(
const ParticleInfo *p_particle_info,
complex_t n_ambient_refractive_index,
complex_t factor) const
diff --git a/Core/Core.pro b/Core/Core.pro
index 944aaff175525b5dbe2cb23932cf511da722d789..8b03c8cb797705e0b1ea59147ba53406b32fa6f0 100644
--- a/Core/Core.pro
+++ b/Core/Core.pro
@@ -66,7 +66,6 @@ SOURCES += \
Algorithms/src/Instrument.cpp \
Algorithms/src/IsGISAXSMorphologyFileStrategy.cpp \
Algorithms/src/LayerDWBASimulation.cpp \
- Algorithms/src/LayerDecoratorDWBASimulation.cpp \
Algorithms/src/LocalMonodisperseApproximationStrategy.cpp \
Algorithms/src/Mask.cpp \
Algorithms/src/MaskCoordinateFunction.cpp \
@@ -77,7 +76,6 @@ SOURCES += \
Algorithms/src/Simulation.cpp \
Algorithms/src/SizeSpacingCorrelationApproximationStrategy.cpp \
Algorithms/src/SpecularMatrix.cpp \
- Algorithms/src/StrategyBuilder.cpp \
\
FormFactors/src/FormFactorBox.cpp \
FormFactors/src/FormFactorCone.cpp \
@@ -130,7 +128,9 @@ SOURCES += \
StandardSamples/IsGISAXS02Builder.cpp \
StandardSamples/IsGISAXS03Builder.cpp \
StandardSamples/IsGISAXS06Builder.cpp \
- StandardSamples/IsGISAXS09Builder.cpp
+ StandardSamples/IsGISAXS09Builder.cpp \
+ Algorithms/src/LayerStrategyBuilder.cpp \
+ Algorithms/src/DecoratedLayerDWBASimulation.cpp
HEADERS += \
@@ -212,7 +212,6 @@ HEADERS += \
Algorithms/inc/InterferenceFunctionStrategies.h \
Algorithms/inc/IsGISAXSMorphologyFileStrategy.h \
Algorithms/inc/LayerDWBASimulation.h \
- Algorithms/inc/LayerDecoratorDWBASimulation.h \
Algorithms/inc/LocalMonodisperseApproximationStrategy.h \
Algorithms/inc/Mask.h \
Algorithms/inc/MaskCoordinateFunction.h \
@@ -224,7 +223,6 @@ HEADERS += \
Algorithms/inc/SimulationParameters.h \
Algorithms/inc/SizeSpacingCorrelationApproximationStrategy.h \
Algorithms/inc/SpecularMatrix.h \
- Algorithms/inc/StrategyBuilder.h \
Algorithms/inc/ThreadInfo.h \
\
FormFactors/inc/FormFactorBox.h \
@@ -302,7 +300,9 @@ HEADERS += \
StandardSamples/IsGISAXS02Builder.h \
StandardSamples/IsGISAXS03Builder.h \
StandardSamples/IsGISAXS06Builder.h \
- StandardSamples/IsGISAXS09Builder.h
+ StandardSamples/IsGISAXS09Builder.h \
+ Algorithms/inc/LayerStrategyBuilder.h \
+ Algorithms/inc/DecoratedLayerDWBASimulation.h
contains(CONFIG, BORNAGAIN_PYTHON) {
include($$PWD/python_module.pri)
diff --git a/Core/PythonAPI/inc/LayerDecorator.pypp.h b/Core/PythonAPI/inc/LayerDecorator.pypp.h
deleted file mode 100644
index 823731d8796f8fe9fddf40db796fac2240b4a088..0000000000000000000000000000000000000000
--- a/Core/PythonAPI/inc/LayerDecorator.pypp.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file has been generated by Py++.
-
-// BornAgain: simulate and fit scattering at grazing incidence
-//! @brief automatically generated boost::python code for PythonCoreAPI
-
-#ifndef LayerDecorator_hpp__pyplusplus_wrapper
-#define LayerDecorator_hpp__pyplusplus_wrapper
-
-void register_LayerDecorator_class();
-
-#endif//LayerDecorator_hpp__pyplusplus_wrapper
diff --git a/Core/PythonAPI/inc/__call_policies.pypp.hpp b/Core/PythonAPI/inc/__call_policies.pypp.hpp
index b31e20b5413618a6720f6151c07ec0cfd0729a62..e5f8bb6a1bf0725c4072ca511a85c0b091532890 100644
--- a/Core/PythonAPI/inc/__call_policies.pypp.hpp
+++ b/Core/PythonAPI/inc/__call_policies.pypp.hpp
@@ -73,7 +73,7 @@ struct make_addressof_holder{
return bpl::detail::none();
}
else{
- size_t addressof_p = size_t( p );
+ boost::uint32_t addressof_p = reinterpret_cast< boost::uint32_t >( p );
bpl::object p_address( addressof_p );
return bpl::incref( p_address.ptr() );
}
@@ -152,11 +152,6 @@ struct as_tuple_impl{
MemoryManager::deallocate_array( arr );
return bpl::incref( bpl::tuple( list_ ).ptr() );
}
-
- static PyTypeObject const *get_pytype(){
- return &PyTuple_Type;
- }
-
};
}
diff --git a/Core/PythonAPI/src/Beam.pypp.cpp b/Core/PythonAPI/src/Beam.pypp.cpp
index b9a6fb9a58eeaa7ec01aa8a6085af928a9683646..3f33465d84b2a505d8f19270191efe8c70078949 100644
--- a/Core/PythonAPI/src/Beam.pypp.cpp
+++ b/Core/PythonAPI/src/Beam.pypp.cpp
@@ -35,11 +35,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -114,11 +114,11 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -141,16 +141,6 @@ void register_Beam_class(){
, SetSpinUpFraction_function_type( &::Beam::SetSpinUpFraction )
, ( bp::arg("up_fraction") ) );
- }
- { //::Beam::checkPolarization
-
- typedef bool ( ::Beam::*checkPolarization_function_type )( ::Eigen::Matrix2cd const & ) const;
-
- Beam_exposer.def(
- "checkPolarization"
- , checkPolarization_function_type( &::Beam::checkPolarization )
- , ( bp::arg("polarization") ) );
-
}
{ //::Beam::getCentralK
@@ -169,15 +159,6 @@ void register_Beam_class(){
"getIntensity"
, getIntensity_function_type( &::Beam::getIntensity ) );
- }
- { //::Beam::getPolarization
-
- typedef ::Eigen::Matrix2cd ( ::Beam::*getPolarization_function_type )( ) const;
-
- Beam_exposer.def(
- "getPolarization"
- , getPolarization_function_type( &::Beam::getPolarization ) );
-
}
{ //::Beam::operator=
@@ -219,16 +200,6 @@ void register_Beam_class(){
, setIntensity_function_type( &::Beam::setIntensity )
, ( bp::arg("intensity") ) );
- }
- { //::Beam::setPolarization
-
- typedef void ( ::Beam::*setPolarization_function_type )( ::Eigen::Matrix2cd const & ) ;
-
- Beam_exposer.def(
- "setPolarization"
- , setPolarization_function_type( &::Beam::setPolarization )
- , ( bp::arg("polarization") ) );
-
}
{ //::IParameterized::areParametersChanged
diff --git a/Core/PythonAPI/src/Crystal.pypp.cpp b/Core/PythonAPI/src/Crystal.pypp.cpp
index 372654b945423dd913d511696d09a08a8f9efba8..37b50908229174695002b636918674e93050683d 100644
--- a/Core/PythonAPI/src/Crystal.pypp.cpp
+++ b/Core/PythonAPI/src/Crystal.pypp.cpp
@@ -28,11 +28,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::Crystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Crystal::clone( );
- }
}
+
::Crystal * default_clone( ) const {
return Crystal::clone( );
}
@@ -40,11 +40,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::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{
+ else
return this->Crystal::createTotalFormFactor( boost::ref(meso_crystal_form_factor), ambient_refractive_index );
- }
}
+
::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 );
}
@@ -52,11 +52,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void setAmbientRefractiveIndex( ::complex_t refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( refractive_index );
- else{
+ else
this->Crystal::setAmbientRefractiveIndex( refractive_index );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t refractive_index ) {
Crystal::setAmbientRefractiveIndex( refractive_index );
}
@@ -64,11 +64,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,11 +88,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -155,11 +155,11 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -167,24 +167,24 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -376,8 +376,8 @@ void register_Crystal_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( Crystal_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( Crystal_wrapper::*default_size_function_type )( ) const;
Crystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Detector.pypp.cpp b/Core/PythonAPI/src/Detector.pypp.cpp
index 17c52c99368ca4464f26779411000f1a37275fb8..add6a2a0e22ed26add69553641dd7f37577c1ec2 100644
--- a/Core/PythonAPI/src/Detector.pypp.cpp
+++ b/Core/PythonAPI/src/Detector.pypp.cpp
@@ -35,11 +35,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -114,11 +114,11 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -143,7 +143,7 @@ void register_Detector_class(){
}
{ //::Detector::getAxis
- typedef ::IAxis const & ( ::Detector::*getAxis_function_type )( ::size_t ) const;
+ typedef ::IAxis const & ( ::Detector::*getAxis_function_type )( ::std::size_t ) const;
Detector_exposer.def(
"getAxis"
@@ -164,7 +164,7 @@ void register_Detector_class(){
}
{ //::Detector::getDimension
- typedef ::size_t ( ::Detector::*getDimension_function_type )( ) const;
+ typedef ::std::size_t ( ::Detector::*getDimension_function_type )( ) const;
Detector_exposer.def(
"getDimension"
diff --git a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
index ca3f64b351588b81c7b02a08af7ee0162895b335..be52bad15dfe4a43e31d27390ef89a33328bd77b 100644
--- a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
+++ b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
@@ -35,11 +35,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual ::FTDistribution2DCauchy * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FTDistribution2DCauchy::clone( );
- }
}
+
::FTDistribution2DCauchy * default_clone( ) const {
return FTDistribution2DCauchy::clone( );
}
@@ -47,11 +47,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual double evaluate( double qx, double qy ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( qx, qy );
- else{
+ else
return this->FTDistribution2DCauchy::evaluate( qx, qy );
- }
}
+
double default_evaluate( double qx, double qy ) const {
return FTDistribution2DCauchy::evaluate( qx, qy );
}
@@ -59,11 +59,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual 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{
+ else
this->FTDistribution2DCauchy::transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
- }
}
+
void default_transformToStarBasis( double qX, double qY, double alpha, double a, double b, double & qa, double & qb ) const {
FTDistribution2DCauchy::transformToStarBasis( qX, qY, alpha, a, b, qa, qb );
}
@@ -71,11 +71,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -83,11 +83,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -95,11 +95,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -107,11 +107,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -138,11 +138,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -150,11 +150,11 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index 41eacc1c3d05d4477ceb683a97c875fa1062d9cd..a3643a1bf3f80306783db1ac7b20ff269c76ef97 100644
--- a/Core/PythonAPI/src/FormFactorBox.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::FormFactorBox * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorBox::clone( );
- }
}
+
::FormFactorBox * default_clone( ) const {
return FormFactorBox::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorBox::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorBox::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorBox::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorBox::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorBox::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorBox::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorBox::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorBox::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->FormFactorBox::getVolume( );
- }
}
+
double default_getVolume( ) const {
return FormFactorBox::getVolume( );
}
@@ -100,11 +100,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,35 +112,35 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, 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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -160,11 +160,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -184,11 +184,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -215,11 +215,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -227,11 +227,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -239,11 +239,11 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -357,8 +357,8 @@ void register_FormFactorBox_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorBox_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorBox_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorBox_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCone.pypp.cpp b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
index 409155eacd9fce1643942822b940e53534766fba..e5f97db0a86af3ca61f1bca747e734aa98467ed6 100644
--- a/Core/PythonAPI/src/FormFactorCone.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::FormFactorCone * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCone::clone( );
- }
}
+
::FormFactorCone * default_clone( ) const {
return FormFactorCone::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorCone::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorCone::getHeight( );
}
@@ -52,11 +52,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorCone::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCone::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,35 +76,35 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -124,11 +124,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -148,11 +148,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -160,11 +160,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -172,11 +172,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -203,11 +203,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -215,11 +215,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -227,11 +227,11 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -302,8 +302,8 @@ void register_FormFactorCone_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCone_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCone_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCone_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index 69b827c9c17bb238cacf706d5fef52d4e4c2833a..d6f2d8bf00f3089a5c8fe805da3d42a3d1b30b22 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::FormFactorCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCrystal::clone( );
- }
}
+
::FormFactorCrystal * default_clone( ) const {
return FormFactorCrystal::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
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{
+ else
return this->FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::complex_t default_evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, double alpha_i, double alpha_f ) const {
return FormFactorCrystal::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
}
@@ -52,11 +52,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorCrystal::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCrystal::evaluate_for_q( boost::ref(q) );
}
@@ -64,11 +64,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->FormFactorCrystal::getVolume( );
- }
}
+
double default_getVolume( ) const {
return FormFactorCrystal::getVolume( );
}
@@ -76,11 +76,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->FormFactorCrystal::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
FormFactorCrystal::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -88,11 +88,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -100,35 +100,35 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -136,11 +136,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -160,11 +160,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -172,11 +172,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -184,11 +184,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -196,11 +196,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -227,11 +227,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -239,11 +239,11 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -339,8 +339,8 @@ void register_FormFactorCrystal_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCrystal_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCrystal_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCrystal_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index 8847d360b3117efaa6d1c0c7597afd919d5d4cf7..ce750263c4306cabb0045702b7476352aba4a0a1 100644
--- a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::FormFactorCylinder * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorCylinder::clone( );
- }
}
+
::FormFactorCylinder * default_clone( ) const {
return FormFactorCylinder::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorCylinder::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorCylinder::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorCylinder::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorCylinder::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorCylinder::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorCylinder::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorCylinder::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorCylinder::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorCylinder::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorCylinder::setHeight( height );
}
@@ -100,11 +100,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorCylinder::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorCylinder::setRadius( radius );
}
@@ -112,11 +112,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,35 +124,35 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -172,11 +172,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -196,11 +196,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -208,11 +208,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -239,11 +239,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -251,11 +251,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -263,11 +263,11 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -385,8 +385,8 @@ void register_FormFactorCylinder_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorCylinder_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorCylinder_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index db7a0dc096746269daeaef7791dea9c58dcbd1f9..a9290c97f690ff0e9cc67c7c5189870d0b30a9c1 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::FormFactorDecoratorDebyeWaller * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorDecoratorDebyeWaller::clone( );
- }
}
+
::FormFactorDecoratorDebyeWaller * default_clone( ) const {
return FormFactorDecoratorDebyeWaller::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, 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{
+ else
return this->FormFactorDecoratorDebyeWaller::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -52,11 +52,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorDecoratorDebyeWaller::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,35 +76,35 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -124,11 +124,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactorDecorator::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactorDecorator::getHeight( );
}
@@ -136,11 +136,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactorDecorator::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactorDecorator::getRadius( );
}
@@ -148,11 +148,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorDecorator::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorDecorator::getVolume( );
}
@@ -160,11 +160,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -172,11 +172,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -203,11 +203,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactorDecorator::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactorDecorator::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -215,11 +215,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -227,11 +227,11 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -303,8 +303,8 @@ void register_FormFactorDecoratorDebyeWaller_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorDecoratorDebyeWaller_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorDecoratorDebyeWaller_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorDecoratorDebyeWaller_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp b/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
index 5f07705a3b858e5315965dd221b21a48d10b18fd..88377ca81112c4ef6dd9f182ecdbed7d325b2953 100644
--- a/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::FormFactorEllipsoid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorEllipsoid::clone( );
- }
}
+
::FormFactorEllipsoid * default_clone( ) const {
return FormFactorEllipsoid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorEllipsoid::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorEllipsoid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorEllipsoid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorEllipsoid::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorEllipsoid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorEllipsoid::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorEllipsoid::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorEllipsoid::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->FormFactorEllipsoid::getVolume( );
- }
}
+
double default_getVolume( ) const {
return FormFactorEllipsoid::getVolume( );
}
@@ -100,11 +100,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,35 +112,35 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, 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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -160,11 +160,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -184,11 +184,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -215,11 +215,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -227,11 +227,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -239,11 +239,11 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -357,8 +357,8 @@ void register_FormFactorEllipsoid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorEllipsoid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorEllipsoid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorEllipsoid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index 9ed7bd7620aa82c2b63cb70720c1de4a9b60b8ad..c9008d5ea61eac4dcd7f611a93040920cda59462 100644
--- a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::FormFactorFullSphere * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorFullSphere::clone( );
- }
}
+
::FormFactorFullSphere * default_clone( ) const {
return FormFactorFullSphere::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorFullSphere::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorFullSphere::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorFullSphere::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorFullSphere::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorFullSphere::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorFullSphere::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorFullSphere::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorFullSphere::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void setRadius( double radius ) {
if( bp::override func_setRadius = this->get_override( "setRadius" ) )
func_setRadius( radius );
- else{
+ else
this->FormFactorFullSphere::setRadius( radius );
- }
}
+
void default_setRadius( double radius ) {
FormFactorFullSphere::setRadius( radius );
}
@@ -100,11 +100,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,35 +112,35 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -160,11 +160,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -184,11 +184,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -196,11 +196,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -227,11 +227,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -239,11 +239,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -251,11 +251,11 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -361,8 +361,8 @@ void register_FormFactorFullSphere_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorFullSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorFullSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorFullSphere_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
index 2484f4b99cf9903a16afaa0668c966135407554e..1926d5551047b240b863177a3a5a5c7e27e744dd 100644
--- a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::FormFactorFullSpheroid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorFullSpheroid::clone( );
- }
}
+
::FormFactorFullSpheroid * default_clone( ) const {
return FormFactorFullSpheroid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorFullSpheroid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorFullSpheroid::getHeight( );
}
@@ -52,11 +52,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorFullSpheroid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorFullSpheroid::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,35 +76,35 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -124,11 +124,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -148,11 +148,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -160,11 +160,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -172,11 +172,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -203,11 +203,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -215,11 +215,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -227,11 +227,11 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -302,8 +302,8 @@ void register_FormFactorFullSpheroid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorFullSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorFullSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorFullSpheroid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index 7a1d9c6b40922dc4e26f726a23851f0af466c7b7..f92617c15fe21ae8726dde8cef5136ea9b92eb70 100644
--- a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
@@ -35,11 +35,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::FormFactorGauss * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorGauss::clone( );
- }
}
+
::FormFactorGauss * default_clone( ) const {
return FormFactorGauss::clone( );
}
@@ -47,11 +47,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorGauss::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorGauss::evaluate_for_q( boost::ref(q) );
}
@@ -59,11 +59,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorGauss::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorGauss::getNumberOfStochasticParameters( );
}
@@ -71,11 +71,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -83,35 +83,35 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -119,11 +119,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -131,11 +131,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -143,11 +143,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -155,11 +155,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -167,11 +167,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -179,11 +179,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -191,11 +191,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -222,11 +222,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -234,11 +234,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -246,11 +246,11 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -323,8 +323,8 @@ void register_FormFactorGauss_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorGauss_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorGauss_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorGauss_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
index 5593fb1acba4436ba2d991d71f048a79d628d148..0acfca84ef23da568c70a4baa5b275095f44e49b 100644
--- a/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual ::FormFactorHemiSpheroid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorHemiSpheroid::clone( );
- }
}
+
::FormFactorHemiSpheroid * default_clone( ) const {
return FormFactorHemiSpheroid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorHemiSpheroid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorHemiSpheroid::getHeight( );
}
@@ -52,11 +52,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorHemiSpheroid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorHemiSpheroid::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,35 +76,35 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -124,11 +124,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -148,11 +148,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -160,11 +160,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -172,11 +172,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -203,11 +203,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -215,11 +215,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -227,11 +227,11 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -302,8 +302,8 @@ void register_FormFactorHemiSpheroid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorHemiSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorHemiSpheroid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorHemiSpheroid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index c2a4afcbbff8aed652a3863348115b6dd76fc364..d4a7bc78283203dea81d37756973cbc23d0f8e19 100644
--- a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
@@ -35,11 +35,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::FormFactorLorentz * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorLorentz::clone( );
- }
}
+
::FormFactorLorentz * default_clone( ) const {
return FormFactorLorentz::clone( );
}
@@ -47,11 +47,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorLorentz::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorLorentz::evaluate_for_q( boost::ref(q) );
}
@@ -59,11 +59,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorLorentz::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorLorentz::getNumberOfStochasticParameters( );
}
@@ -71,11 +71,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -83,35 +83,35 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -119,11 +119,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -131,11 +131,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -143,11 +143,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -155,11 +155,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -167,11 +167,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -179,11 +179,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -191,11 +191,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -222,11 +222,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -234,11 +234,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -246,11 +246,11 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -323,8 +323,8 @@ void register_FormFactorLorentz_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorLorentz_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorLorentz_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorLorentz_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
index aadba71ade5dca84446c4bb6af43e984b4455c54..5de2f5cb5f071c200393e5ee2609599ff25c0970 100644
--- a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::FormFactorParallelepiped * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorParallelepiped::clone( );
- }
}
+
::FormFactorParallelepiped * default_clone( ) const {
return FormFactorParallelepiped::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorParallelepiped::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorParallelepiped::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorParallelepiped::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorParallelepiped::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorParallelepiped::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorParallelepiped::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->FormFactorParallelepiped::getRadius( );
- }
}
+
double default_getRadius( ) const {
return FormFactorParallelepiped::getRadius( );
}
@@ -88,11 +88,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->FormFactorParallelepiped::getVolume( );
- }
}
+
double default_getVolume( ) const {
return FormFactorParallelepiped::getVolume( );
}
@@ -100,11 +100,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,35 +112,35 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -148,11 +148,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, 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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -160,11 +160,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -172,11 +172,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -184,11 +184,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -215,11 +215,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -227,11 +227,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -239,11 +239,11 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -348,8 +348,8 @@ void register_FormFactorParallelepiped_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorParallelepiped_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorParallelepiped_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorParallelepiped_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index 4493f33957be712f15ceab97a6240c2dff7d1bd1..3efb0ec276e07de1ca3aa1fa384955de4f2ca97b 100644
--- a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::FormFactorPrism3 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorPrism3::clone( );
- }
}
+
::FormFactorPrism3 * default_clone( ) const {
return FormFactorPrism3::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorPrism3::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPrism3::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getHalfSide( ) const {
if( bp::override func_getHalfSide = this->get_override( "getHalfSide" ) )
return func_getHalfSide( );
- else{
+ else
return this->FormFactorPrism3::getHalfSide( );
- }
}
+
double default_getHalfSide( ) const {
return FormFactorPrism3::getHalfSide( );
}
@@ -64,11 +64,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorPrism3::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorPrism3::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorPrism3::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPrism3::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setHalfSide( double half_side ) {
if( bp::override func_setHalfSide = this->get_override( "setHalfSide" ) )
func_setHalfSide( half_side );
- else{
+ else
this->FormFactorPrism3::setHalfSide( half_side );
- }
}
+
void default_setHalfSide( double half_side ) {
FormFactorPrism3::setHalfSide( half_side );
}
@@ -100,11 +100,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorPrism3::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorPrism3::setHeight( height );
}
@@ -112,11 +112,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -124,35 +124,35 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -160,11 +160,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -172,11 +172,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -184,11 +184,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -196,11 +196,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -208,11 +208,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -220,11 +220,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -251,11 +251,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -263,11 +263,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -275,11 +275,11 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -397,8 +397,8 @@ void register_FormFactorPrism3_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorPrism3_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorPrism3_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorPrism3_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
index cd03e8bcc1ba4cfc0d25bf553fb17833664d3529..882734cabc8d952183bac101b48b4fadff570e0a 100644
--- a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::FormFactorPrism6 * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorPrism6::clone( );
- }
}
+
::FormFactorPrism6 * default_clone( ) const {
return FormFactorPrism6::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorPrism6::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPrism6::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorPrism6::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorPrism6::getHeight( );
}
@@ -64,11 +64,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorPrism6::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPrism6::getNumberOfStochasticParameters( );
}
@@ -76,11 +76,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -88,35 +88,35 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -124,11 +124,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -136,11 +136,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -160,11 +160,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -172,11 +172,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -184,11 +184,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -215,11 +215,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -227,11 +227,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -239,11 +239,11 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -326,8 +326,8 @@ void register_FormFactorPrism6_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorPrism6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorPrism6_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorPrism6_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index 8f6b5b7cb3e12cd5f643e1d58d2d91ea67d39a28..f8cd556d3d20619ef237a661974e3b6d228c23eb 100644
--- a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::FormFactorPyramid * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorPyramid::clone( );
- }
}
+
::FormFactorPyramid * default_clone( ) const {
return FormFactorPyramid::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorPyramid::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorPyramid::evaluate_for_q( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getAlpha( ) const {
if( bp::override func_getAlpha = this->get_override( "getAlpha" ) )
return func_getAlpha( );
- else{
+ else
return this->FormFactorPyramid::getAlpha( );
- }
}
+
double default_getAlpha( ) const {
return FormFactorPyramid::getAlpha( );
}
@@ -64,11 +64,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getHalfSide( ) const {
if( bp::override func_getHalfSide = this->get_override( "getHalfSide" ) )
return func_getHalfSide( );
- else{
+ else
return this->FormFactorPyramid::getHalfSide( );
- }
}
+
double default_getHalfSide( ) const {
return FormFactorPyramid::getHalfSide( );
}
@@ -76,11 +76,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorPyramid::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorPyramid::getHeight( );
}
@@ -88,11 +88,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorPyramid::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorPyramid::getNumberOfStochasticParameters( );
}
@@ -100,11 +100,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setAlpha( double alpha ) {
if( bp::override func_setAlpha = this->get_override( "setAlpha" ) )
func_setAlpha( alpha );
- else{
+ else
this->FormFactorPyramid::setAlpha( alpha );
- }
}
+
void default_setAlpha( double alpha ) {
FormFactorPyramid::setAlpha( alpha );
}
@@ -112,11 +112,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setHalfSide( double half_side ) {
if( bp::override func_setHalfSide = this->get_override( "setHalfSide" ) )
func_setHalfSide( half_side );
- else{
+ else
this->FormFactorPyramid::setHalfSide( half_side );
- }
}
+
void default_setHalfSide( double half_side ) {
FormFactorPyramid::setHalfSide( half_side );
}
@@ -124,11 +124,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setHeight( double height ) {
if( bp::override func_setHeight = this->get_override( "setHeight" ) )
func_setHeight( height );
- else{
+ else
this->FormFactorPyramid::setHeight( height );
- }
}
+
void default_setHeight( double height ) {
FormFactorPyramid::setHeight( height );
}
@@ -136,11 +136,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -148,35 +148,35 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -184,11 +184,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -196,11 +196,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -208,11 +208,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -220,11 +220,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -232,11 +232,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -244,11 +244,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -275,11 +275,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -287,11 +287,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -299,11 +299,11 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -444,8 +444,8 @@ void register_FormFactorPyramid_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorPyramid_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorPyramid_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
index 0e75c0d09da50f4a24aee380f6fb0a286c8ce55f..94b4105bb4b1f96ad7f0c39e7c8cd084c4cab841 100644
--- a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
@@ -28,11 +28,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::FormFactorSphere * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorSphere::clone( );
- }
}
+
::FormFactorSphere * default_clone( ) const {
return FormFactorSphere::clone( );
}
@@ -40,11 +40,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorSphere::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorSphere::getHeight( );
}
@@ -52,11 +52,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorSphere::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphere::getNumberOfStochasticParameters( );
}
@@ -64,11 +64,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,35 +76,35 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -112,11 +112,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -124,11 +124,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -136,11 +136,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -148,11 +148,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -160,11 +160,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -172,11 +172,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -203,11 +203,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -215,11 +215,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -227,11 +227,11 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -302,8 +302,8 @@ void register_FormFactorSphere_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorSphere_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorSphere_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index a6355deec27609730e7abf110c66163769d3ce03..70b1b762ca772a14eb02336ab1e4c985a30b2169 100644
--- a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
@@ -28,35 +28,35 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::FormFactorSphereGaussianRadius * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::clone( );
- }
}
+
::FormFactorSphereGaussianRadius * default_clone( ) const {
return FormFactorSphereGaussianRadius::clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->FormFactorSphereGaussianRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
FormFactorSphereGaussianRadius::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::complex_t evaluate_for_q( ::cvector_t const & q ) const {
if( bp::override func_evaluate_for_q = this->get_override( "evaluate_for_q" ) )
return func_evaluate_for_q( boost::ref(q) );
- else{
+ else
return this->FormFactorSphereGaussianRadius::evaluate_for_q( boost::ref(q) );
- }
}
+
::complex_t default_evaluate_for_q( ::cvector_t const & q ) const {
return FormFactorSphereGaussianRadius::evaluate_for_q( boost::ref(q) );
}
@@ -64,11 +64,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::getHeight( );
- }
}
+
double default_getHeight( ) const {
return FormFactorSphereGaussianRadius::getHeight( );
}
@@ -76,11 +76,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return FormFactorSphereGaussianRadius::getNumberOfStochasticParameters( );
}
@@ -88,11 +88,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->FormFactorSphereGaussianRadius::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return FormFactorSphereGaussianRadius::isDistributedFormFactor( );
}
@@ -100,11 +100,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -136,11 +136,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -148,11 +148,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -160,11 +160,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -172,11 +172,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -184,11 +184,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -215,11 +215,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -227,11 +227,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -239,11 +239,11 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -270,8 +270,8 @@ void register_FormFactorSphereGaussianRadius_class(){
}
{ //::FormFactorSphereGaussianRadius::createDistributedFormFactors
- typedef void ( ::FormFactorSphereGaussianRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( FormFactorSphereGaussianRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::FormFactorSphereGaussianRadius::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( FormFactorSphereGaussianRadius_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
FormFactorSphereGaussianRadius_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
index ae553a961747045302f059a3be2debf95d937b64..32898d24d9ed868cadcb3bcec250949217bb68ce 100644
--- a/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
@@ -40,11 +40,11 @@ struct HomogeneousMaterial_wrapper : HomogeneousMaterial, bp::wrapper< Homogeneo
virtual bool isScalarMaterial( ) {
if( bp::override func_isScalarMaterial = this->get_override( "isScalarMaterial" ) )
return func_isScalarMaterial( );
- else{
+ else
return this->IMaterial::isScalarMaterial( );
- }
}
+
bool default_isScalarMaterial( ) {
return IMaterial::isScalarMaterial( );
}
diff --git a/Core/PythonAPI/src/IAxis.pypp.cpp b/Core/PythonAPI/src/IAxis.pypp.cpp
index a6c9c35dcd98aa69f39a992fe63304b54e7adf7c..9c689bebe60a4d93f9e856aaab898a9a45e5c2d3 100644
--- a/Core/PythonAPI/src/IAxis.pypp.cpp
+++ b/Core/PythonAPI/src/IAxis.pypp.cpp
@@ -33,12 +33,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return func_createDoubleBinSize( );
}
- virtual ::size_t findClosestIndex( double value ) const {
+ virtual ::std::size_t findClosestIndex( double value ) const {
bp::override func_findClosestIndex = this->get_override( "findClosestIndex" );
return func_findClosestIndex( value );
}
- virtual ::Bin1D getBin( ::size_t index ) const {
+ virtual ::Bin1D getBin( ::std::size_t index ) const {
bp::override func_getBin = this->get_override( "getBin" );
return func_getBin( index );
}
@@ -53,12 +53,12 @@ struct IAxis_wrapper : IAxis, bp::wrapper< IAxis > {
return func_getMin( );
}
- virtual ::size_t getSize( ) const {
+ virtual ::std::size_t getSize( ) const {
bp::override func_getSize = this->get_override( "getSize" );
return func_getSize( );
}
- virtual double operator[]( ::size_t index ) const {
+ virtual double operator[]( ::std::size_t index ) const {
bp::override func___getitem__ = this->get_override( "__getitem__" );
return func___getitem__( index );
}
@@ -93,7 +93,7 @@ void register_IAxis_class(){
}
{ //::IAxis::findClosestIndex
- typedef ::size_t ( ::IAxis::*findClosestIndex_function_type )( double ) const;
+ typedef ::std::size_t ( ::IAxis::*findClosestIndex_function_type )( double ) const;
IAxis_exposer.def(
"findClosestIndex"
@@ -103,7 +103,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getBin
- typedef ::Bin1D ( ::IAxis::*getBin_function_type )( ::size_t ) const;
+ typedef ::Bin1D ( ::IAxis::*getBin_function_type )( ::std::size_t ) const;
IAxis_exposer.def(
"getBin"
@@ -140,7 +140,7 @@ void register_IAxis_class(){
}
{ //::IAxis::getSize
- typedef ::size_t ( ::IAxis::*getSize_function_type )( ) const;
+ typedef ::std::size_t ( ::IAxis::*getSize_function_type )( ) const;
IAxis_exposer.def(
"getSize"
@@ -149,7 +149,7 @@ void register_IAxis_class(){
}
{ //::IAxis::operator[]
- typedef double ( ::IAxis::*__getitem___function_type )( ::size_t ) const;
+ typedef double ( ::IAxis::*__getitem___function_type )( ::std::size_t ) const;
IAxis_exposer.def(
"__getitem__"
diff --git a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
index 7938c6d0e696b00c0cc853e17f44f2f16e9d7ebd..7c4807fc9a013da2e23dfb5c3057dc9953e06d23 100644
--- a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
+++ b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
@@ -28,11 +28,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::IClusteredParticles * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->IClusteredParticles::clone( );
- }
}
+
::IClusteredParticles * default_clone( ) const {
return IClusteredParticles::clone( );
}
@@ -40,11 +40,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::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{
+ else
return this->IClusteredParticles::createTotalFormFactor( boost::ref(meso_crystal_form_factor), ambient_refractive_index );
- }
}
+
::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 );
}
@@ -62,11 +62,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -74,11 +74,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -86,11 +86,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -98,11 +98,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -110,11 +110,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -122,11 +122,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -153,11 +153,11 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -165,24 +165,24 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -343,8 +343,8 @@ void register_IClusteredParticles_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( IClusteredParticles_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( IClusteredParticles_wrapper::*default_size_function_type )( ) const;
IClusteredParticles_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ICompositeSample.pypp.cpp b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
index a6e05af285da90e3f20fe755b39d99e49e555bc9..17e9d6af8fd5238035d80f17020d7ae5e775ad49 100644
--- a/Core/PythonAPI/src/ICompositeSample.pypp.cpp
+++ b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
@@ -28,11 +28,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ICompositeSample * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ICompositeSample::clone( );
- }
}
+
::ICompositeSample * default_clone( ) const {
return ICompositeSample::clone( );
}
@@ -40,11 +40,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -52,24 +52,24 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -81,11 +81,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -93,11 +93,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -105,11 +105,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -117,11 +117,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -148,11 +148,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -160,11 +160,11 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -251,8 +251,8 @@ void register_ICompositeSample_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ICompositeSample_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ICompositeSample_wrapper::*default_size_function_type )( ) const;
ICompositeSample_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IDecoration.pypp.cpp b/Core/PythonAPI/src/IDecoration.pypp.cpp
index 0bcbb984eda3a670da41af9ed2fb02a143f4f566..8d170d9acdaf20505cdcb877f4176dfded964a2d 100644
--- a/Core/PythonAPI/src/IDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/IDecoration.pypp.cpp
@@ -30,7 +30,7 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
return func_clone( );
}
- virtual double getAbundanceFractionOfParticle( ::size_t index ) const {
+ virtual double getAbundanceFractionOfParticle( ::std::size_t index ) const {
bp::override func_getAbundanceFractionOfParticle = this->get_override( "getAbundanceFractionOfParticle" );
return func_getAbundanceFractionOfParticle( index );
}
@@ -40,24 +40,24 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
return func_getInterferenceFunctions( );
}
- virtual ::size_t getNumberOfInterferenceFunctions( ) const {
+ virtual ::std::size_t getNumberOfInterferenceFunctions( ) const {
if( bp::override func_getNumberOfInterferenceFunctions = this->get_override( "getNumberOfInterferenceFunctions" ) )
return func_getNumberOfInterferenceFunctions( );
- else{
+ else
return this->IDecoration::getNumberOfInterferenceFunctions( );
- }
}
- ::size_t default_getNumberOfInterferenceFunctions( ) const {
+
+ ::std::size_t default_getNumberOfInterferenceFunctions( ) const {
return IDecoration::getNumberOfInterferenceFunctions( );
}
- virtual ::size_t getNumberOfParticles( ) const {
+ virtual ::std::size_t getNumberOfParticles( ) const {
bp::override func_getNumberOfParticles = this->get_override( "getNumberOfParticles" );
return func_getNumberOfParticles( );
}
- virtual ::ParticleInfo const * getParticleInfo( ::size_t index ) const {
+ virtual ::ParticleInfo const * getParticleInfo( ::std::size_t index ) const {
bp::override func_getParticleInfo = this->get_override( "getParticleInfo" );
return func_getParticleInfo( index );
}
@@ -70,11 +70,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -82,11 +82,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -94,11 +94,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -106,11 +106,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -118,11 +118,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -130,11 +130,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -161,11 +161,11 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -173,24 +173,24 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -214,7 +214,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getAbundanceFractionOfParticle
- typedef double ( ::IDecoration::*getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
+ typedef double ( ::IDecoration::*getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
IDecoration_exposer.def(
"getAbundanceFractionOfParticle"
@@ -233,8 +233,8 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getNumberOfInterferenceFunctions
- typedef ::size_t ( ::IDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
- typedef ::size_t ( IDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( ::IDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( IDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
IDecoration_exposer.def(
"getNumberOfInterferenceFunctions"
@@ -244,7 +244,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getNumberOfParticles
- typedef ::size_t ( ::IDecoration::*getNumberOfParticles_function_type )( ) const;
+ typedef ::std::size_t ( ::IDecoration::*getNumberOfParticles_function_type )( ) const;
IDecoration_exposer.def(
"getNumberOfParticles"
@@ -253,7 +253,7 @@ void register_IDecoration_class(){
}
{ //::IDecoration::getParticleInfo
- typedef ::ParticleInfo const * ( ::IDecoration::*getParticleInfo_function_type )( ::size_t ) const;
+ typedef ::ParticleInfo const * ( ::IDecoration::*getParticleInfo_function_type )( ::std::size_t ) const;
IDecoration_exposer.def(
"getParticleInfo"
@@ -395,8 +395,8 @@ void register_IDecoration_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( IDecoration_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( IDecoration_wrapper::*default_size_function_type )( ) const;
IDecoration_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
index 7332b764f3c96f324096ae7816ce40f921942ec6..7451a416c7a46025799d38a0569b2d700f51867c 100644
--- a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
+++ b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
@@ -38,11 +38,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -50,11 +50,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -62,11 +62,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -74,11 +74,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -105,11 +105,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -117,11 +117,11 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
index 3e0819da07dff38e9cb126774ff42b0c637c1898..8fbe7b360e91d804e8752bde9e71e80da7b9377c 100644
--- a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
+++ b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
@@ -43,11 +43,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -55,11 +55,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -67,11 +67,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -79,11 +79,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -110,11 +110,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -122,11 +122,11 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index 48944ab83f36a1e7cfa4280ebedc25ddf01a3e1a..f5e55493e536cdb7925bbe53753b090568065b55 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -30,15 +30,15 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
return func_clone( );
}
- virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+ virtual void createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
@@ -50,11 +50,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -62,11 +62,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -74,11 +74,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -86,11 +86,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactor::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactor::getVolume( );
}
@@ -98,11 +98,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -110,11 +110,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -122,11 +122,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -134,11 +134,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -146,11 +146,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -158,11 +158,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -170,11 +170,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -201,11 +201,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -213,11 +213,11 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -242,8 +242,8 @@ void register_IFormFactor_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( IFormFactor_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( IFormFactor_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
IFormFactor_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index 3e2faa106d9a69bcd6cc18c916a3bbc5dacace60..9e66b678aef3414e8e5a795edb874d4370fb7259 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -33,11 +33,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::complex_t evaluate( ::cvector_t const & k_i, ::Bin1DCVector const & k_f_bin, 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{
+ else
return this->IFormFactorBorn::evaluate( boost::ref(k_i), boost::ref(k_f_bin), alpha_i, alpha_f );
- }
}
+
::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 );
}
@@ -50,11 +50,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorBorn::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorBorn::getVolume( );
}
@@ -62,11 +62,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -74,35 +74,35 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -110,11 +110,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -122,11 +122,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactor::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactor::getHeight( );
}
@@ -134,11 +134,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -146,11 +146,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactor::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactor::getRadius( );
}
@@ -158,11 +158,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -170,11 +170,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -201,11 +201,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactor::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -213,11 +213,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -225,11 +225,11 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -309,8 +309,8 @@ void register_IFormFactorBorn_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( IFormFactorBorn_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( IFormFactorBorn_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
IFormFactorBorn_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
index 37ffbc13a4c24330626679f368a577933d23070e..3d7b478e1677a320733e5db2d1a8912cb967c090 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -26,11 +26,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getHeight( ) const {
if( bp::override func_getHeight = this->get_override( "getHeight" ) )
return func_getHeight( );
- else{
+ else
return this->IFormFactorDecorator::getHeight( );
- }
}
+
double default_getHeight( ) const {
return IFormFactorDecorator::getHeight( );
}
@@ -38,11 +38,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getRadius( ) const {
if( bp::override func_getRadius = this->get_override( "getRadius" ) )
return func_getRadius( );
- else{
+ else
return this->IFormFactorDecorator::getRadius( );
- }
}
+
double default_getRadius( ) const {
return IFormFactorDecorator::getRadius( );
}
@@ -50,11 +50,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual double getVolume( ) const {
if( bp::override func_getVolume = this->get_override( "getVolume" ) )
return func_getVolume( );
- else{
+ else
return this->IFormFactorDecorator::getVolume( );
- }
}
+
double default_getVolume( ) const {
return IFormFactorDecorator::getVolume( );
}
@@ -62,11 +62,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( boost::ref(refractive_index) );
- else{
+ else
this->IFormFactorDecorator::setAmbientRefractiveIndex( boost::ref(refractive_index) );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t const & refractive_index ) {
IFormFactorDecorator::setAmbientRefractiveIndex( boost::ref(refractive_index) );
}
@@ -74,11 +74,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -86,35 +86,35 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
- 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, ::std::size_t nbr_samples ) const {
if( bp::override func_createDistributedFormFactors = this->get_override( "createDistributedFormFactors" ) )
func_createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- else{
+ else
this->IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
- }
}
- void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::size_t nbr_samples ) const {
+
+ void default_createDistributedFormFactors( ::std::vector< IFormFactor* > & form_factors, ::std::vector< double > & probabilities, ::std::size_t nbr_samples ) const {
IFormFactor::createDistributedFormFactors( boost::ref(form_factors), boost::ref(probabilities), nbr_samples );
}
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -127,11 +127,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -139,11 +139,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual int getNumberOfStochasticParameters( ) const {
if( bp::override func_getNumberOfStochasticParameters = this->get_override( "getNumberOfStochasticParameters" ) )
return func_getNumberOfStochasticParameters( );
- else{
+ else
return this->IFormFactor::getNumberOfStochasticParameters( );
- }
}
+
int default_getNumberOfStochasticParameters( ) const {
return IFormFactor::getNumberOfStochasticParameters( );
}
@@ -151,11 +151,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool isDistributedFormFactor( ) const {
if( bp::override func_isDistributedFormFactor = this->get_override( "isDistributedFormFactor" ) )
return func_isDistributedFormFactor( );
- else{
+ else
return this->IFormFactor::isDistributedFormFactor( );
- }
}
+
bool default_isDistributedFormFactor( ) const {
return IFormFactor::isDistributedFormFactor( );
}
@@ -163,11 +163,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -194,11 +194,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -206,11 +206,11 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -302,8 +302,8 @@ void register_IFormFactorDecorator_class(){
}
{ //::IFormFactor::createDistributedFormFactors
- typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
- typedef void ( IFormFactorDecorator_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::size_t ) const;
+ typedef void ( ::IFormFactor::*createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
+ typedef void ( IFormFactorDecorator_wrapper::*default_createDistributedFormFactors_function_type )( ::std::vector< IFormFactor* > &,::std::vector< double > &,::std::size_t ) const;
IFormFactorDecorator_exposer.def(
"createDistributedFormFactors"
diff --git a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
index edc707f6d80ebeedaa7f3ac9122b86aa4258c4b5..67cc3315898a4ae82425bfca96822c2fc3e429e7 100644
--- a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
+++ b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
@@ -38,11 +38,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -50,11 +50,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -62,11 +62,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -74,11 +74,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -86,11 +86,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -98,11 +98,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -129,11 +129,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -141,11 +141,11 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IMaterial.pypp.cpp b/Core/PythonAPI/src/IMaterial.pypp.cpp
index 87c26478ab3396e132684a4eee76153ab501b54d..42e8ded401e2d309403d0db3d6168fdb1d3b7dd1 100644
--- a/Core/PythonAPI/src/IMaterial.pypp.cpp
+++ b/Core/PythonAPI/src/IMaterial.pypp.cpp
@@ -33,11 +33,11 @@ struct IMaterial_wrapper : IMaterial, bp::wrapper< IMaterial > {
virtual bool isScalarMaterial( ) {
if( bp::override func_isScalarMaterial = this->get_override( "isScalarMaterial" ) )
return func_isScalarMaterial( );
- else{
+ else
return this->IMaterial::isScalarMaterial( );
- }
}
+
bool default_isScalarMaterial( ) {
return IMaterial::isScalarMaterial( );
}
diff --git a/Core/PythonAPI/src/IParameterized.pypp.cpp b/Core/PythonAPI/src/IParameterized.pypp.cpp
index 5c6ebffeeede8ce3c0ae7380a7806a6c458d4b5b..270c7cda80a8a579dbb61a4e11335012fb7a3c01 100644
--- a/Core/PythonAPI/src/IParameterized.pypp.cpp
+++ b/Core/PythonAPI/src/IParameterized.pypp.cpp
@@ -42,11 +42,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -54,11 +54,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -66,11 +66,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -78,11 +78,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -109,11 +109,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -121,11 +121,11 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
index 41b775dc6300d331c48bd8883a0c05ff65e7c393..2b51f7601e0f640ec3e5a2c08b71b321bf9662fc 100644
--- a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
+++ b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
@@ -38,11 +38,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -50,11 +50,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -62,11 +62,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -74,11 +74,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -105,11 +105,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -117,11 +117,11 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ISample.pypp.cpp b/Core/PythonAPI/src/ISample.pypp.cpp
index 825c7f0c108e2c340d793c866223c05f2633a917..d4ce7319abddc927f846afe14a3169b0634ccdc0 100644
--- a/Core/PythonAPI/src/ISample.pypp.cpp
+++ b/Core/PythonAPI/src/ISample.pypp.cpp
@@ -33,11 +33,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ISample * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ISample::clone( );
- }
}
+
::ISample * default_clone( ) const {
return ISample::clone( );
}
@@ -45,11 +45,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -57,11 +57,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -69,11 +69,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -81,11 +81,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -93,11 +93,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -124,11 +124,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -136,11 +136,11 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
index 48973a8d6aef66c0db0cb3851104b14058e89232..1860511271975d9d6d065c12991e8a613bcd9c7f 100644
--- a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
+++ b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
@@ -35,11 +35,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual ::ISample * buildSample( ) const {
if( bp::override func_buildSample = this->get_override( "buildSample" ) )
return func_buildSample( );
- else{
+ else
return this->ISampleBuilder::buildSample( );
- }
}
+
::ISample * default_buildSample( ) const {
return ISampleBuilder::buildSample( );
}
@@ -47,11 +47,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -83,11 +83,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -114,11 +114,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -126,11 +126,11 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/ITransform3D.pypp.cpp b/Core/PythonAPI/src/ITransform3D.pypp.cpp
index 445f4162c984c5e9f1c62900d48de7b04ffcd6be..73595141dca75b64ce7574e31783857907e4b635 100644
--- a/Core/PythonAPI/src/ITransform3D.pypp.cpp
+++ b/Core/PythonAPI/src/ITransform3D.pypp.cpp
@@ -33,11 +33,11 @@ struct ITransform3D_wrapper : Geometry::ITransform3D, bp::wrapper< Geometry::ITr
virtual void print( ::std::ostream & ostr ) const {
if( bp::override func_print = this->get_override( "print" ) )
func_print( boost::ref(ostr) );
- else{
+ else
this->Geometry::ITransform3D::print( boost::ref(ostr) );
- }
}
+
void default_print( ::std::ostream & ostr ) const {
Geometry::ITransform3D::print( boost::ref(ostr) );
}
diff --git a/Core/PythonAPI/src/Instrument.pypp.cpp b/Core/PythonAPI/src/Instrument.pypp.cpp
index 5bfa2f37bcfc2743da0d415230f711da9b666968..c167a95becc465b754412db9de86832982d426ee 100644
--- a/Core/PythonAPI/src/Instrument.pypp.cpp
+++ b/Core/PythonAPI/src/Instrument.pypp.cpp
@@ -35,11 +35,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -47,11 +47,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -59,11 +59,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -71,11 +71,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -102,11 +102,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -114,11 +114,11 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -152,7 +152,7 @@ void register_Instrument_class(){
}
{ //::Instrument::getDetectorAxis
- typedef ::IAxis const & ( ::Instrument::*getDetectorAxis_function_type )( ::size_t ) const;
+ typedef ::IAxis const & ( ::Instrument::*getDetectorAxis_function_type )( ::std::size_t ) const;
Instrument_exposer.def(
"getDetectorAxis"
@@ -163,7 +163,7 @@ void register_Instrument_class(){
}
{ //::Instrument::getDetectorDimension
- typedef ::size_t ( ::Instrument::*getDetectorDimension_function_type )( ) const;
+ typedef ::std::size_t ( ::Instrument::*getDetectorDimension_function_type )( ) const;
Instrument_exposer.def(
"getDetectorDimension"
@@ -221,7 +221,7 @@ void register_Instrument_class(){
}
{ //::Instrument::setDetectorParameters
- typedef void ( ::Instrument::*setDetectorParameters_function_type )( ::size_t,double,double,::size_t,double,double,bool ) ;
+ typedef void ( ::Instrument::*setDetectorParameters_function_type )( ::std::size_t,double,double,::std::size_t,double,double,bool ) ;
Instrument_exposer.def(
"setDetectorParameters"
diff --git a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
index 6445acb91f30cd5cd2b7aceec4bf40502c44a11a..bb54ede72996c1fe26b15cff2031ff24a08b5565 100644
--- a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::InterferenceFunction1DParaCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunction1DParaCrystal::clone( );
- }
}
+
::InterferenceFunction1DParaCrystal * default_clone( ) const {
return InterferenceFunction1DParaCrystal::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunction1DParaCrystal::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction1DParaCrystal::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->InterferenceFunction1DParaCrystal::getKappa( );
- }
}
+
double default_getKappa( ) const {
return InterferenceFunction1DParaCrystal::getKappa( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -143,11 +143,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -155,11 +155,11 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
index 292350d77d242f7310d06b6cd739bdb02043e04c..b057a7e2f721429ef31acff4bc8bccd4bf6e36a1 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::InterferenceFunction2DLattice * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunction2DLattice::clone( );
- }
}
+
::InterferenceFunction2DLattice * default_clone( ) const {
return InterferenceFunction2DLattice::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunction2DLattice::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DLattice::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -143,11 +143,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -155,11 +155,11 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
index 3b56c7218cf0d7e9ed346238eb4a054566301b67..df78aa4576414e523427c385a4b522aca8b5ce71 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::InterferenceFunction2DParaCrystal * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunction2DParaCrystal::clone( );
- }
}
+
::InterferenceFunction2DParaCrystal * default_clone( ) const {
return InterferenceFunction2DParaCrystal::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunction2DParaCrystal::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunction2DParaCrystal::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -143,11 +143,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -155,11 +155,11 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
index 3c3a578f1ae12209ebd5e2b13424bb12e56762ba..e9e20855c4cc957e8c55de168b824761325485d6 100644
--- a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
@@ -28,11 +28,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::InterferenceFunctionNone * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->InterferenceFunctionNone::clone( );
- }
}
+
::InterferenceFunctionNone * default_clone( ) const {
return InterferenceFunctionNone::clone( );
}
@@ -40,11 +40,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual double evaluate( ::cvector_t const & q ) const {
if( bp::override func_evaluate = this->get_override( "evaluate" ) )
return func_evaluate( boost::ref(q) );
- else{
+ else
return this->InterferenceFunctionNone::evaluate( boost::ref(q) );
- }
}
+
double default_evaluate( ::cvector_t const & q ) const {
return InterferenceFunctionNone::evaluate( boost::ref(q) );
}
@@ -52,11 +52,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -100,11 +100,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual double getKappa( ) const {
if( bp::override func_getKappa = this->get_override( "getKappa" ) )
return func_getKappa( );
- else{
+ else
return this->IInterferenceFunction::getKappa( );
- }
}
+
double default_getKappa( ) const {
return IInterferenceFunction::getKappa( );
}
@@ -112,11 +112,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -143,11 +143,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -155,11 +155,11 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/LatticeBasis.pypp.cpp b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
index 3f764054a3f3ab7f1ff77ee94b2fa07464646054..1935cdc1d1a7147b5018911ec8eac84d88616103 100644
--- a/Core/PythonAPI/src/LatticeBasis.pypp.cpp
+++ b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
@@ -28,11 +28,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -40,11 +40,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -52,11 +52,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -64,11 +64,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -76,11 +76,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -88,11 +88,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::complex_t const getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t const default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -100,11 +100,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual ::IFormFactor const * getSimpleFormFactor( ) const {
if( bp::override func_getSimpleFormFactor = this->get_override( "getSimpleFormFactor" ) )
return func_getSimpleFormFactor( );
- else{
+ else
return this->Particle::getSimpleFormFactor( );
- }
}
+
::IFormFactor const * default_getSimpleFormFactor( ) const {
return Particle::getSimpleFormFactor( );
}
@@ -112,11 +112,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -124,11 +124,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -155,11 +155,11 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -167,24 +167,24 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -344,8 +344,8 @@ void register_LatticeBasis_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( LatticeBasis_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( LatticeBasis_wrapper::*default_size_function_type )( ) const;
LatticeBasis_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Layer.pypp.cpp b/Core/PythonAPI/src/Layer.pypp.cpp
index ac27644de2e7a6264a2d2f0e4770f276412e145f..c31113aa0991b27a79db959351798b9e4155f317 100644
--- a/Core/PythonAPI/src/Layer.pypp.cpp
+++ b/Core/PythonAPI/src/Layer.pypp.cpp
@@ -25,8 +25,15 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
}
- Layer_wrapper(::IMaterial const * material, double thickness=0 )
- : Layer( boost::python::ptr(material), thickness )
+ Layer_wrapper(::IMaterial const * material, double thickness=0, ::IDecoration * decoration=0 )
+ : Layer( boost::python::ptr(material), thickness, boost::python::ptr(decoration) )
+ , bp::wrapper< Layer >(){
+ // constructor
+
+ }
+
+ Layer_wrapper(::IMaterial const * material, double thickness, ::IDecoration const & decoration )
+ : Layer( boost::python::ptr(material), thickness, boost::ref(decoration) )
, bp::wrapper< Layer >(){
// constructor
@@ -42,11 +49,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::Layer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Layer::clone( );
- }
}
+
::Layer * default_clone( ) const {
return Layer::clone( );
}
@@ -54,11 +61,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::IMaterial const * getMaterial( ) const {
if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
return func_getMaterial( );
- else{
+ else
return this->Layer::getMaterial( );
- }
}
+
::IMaterial const * default_getMaterial( ) const {
return Layer::getMaterial( );
}
@@ -66,11 +73,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::complex_t getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Layer::getRefractiveIndex( );
- }
}
+
::complex_t default_getRefractiveIndex( ) const {
return Layer::getRefractiveIndex( );
}
@@ -78,23 +85,35 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual double getThickness( ) const {
if( bp::override func_getThickness = this->get_override( "getThickness" ) )
return func_getThickness( );
- else{
+ else
return this->Layer::getThickness( );
- }
}
+
double default_getThickness( ) const {
return Layer::getThickness( );
}
+ virtual double getTotalParticleSurfaceDensity( ) const {
+ if( bp::override func_getTotalParticleSurfaceDensity = this->get_override( "getTotalParticleSurfaceDensity" ) )
+ return func_getTotalParticleSurfaceDensity( );
+ else
+ return this->Layer::getTotalParticleSurfaceDensity( );
+ }
+
+
+ double default_getTotalParticleSurfaceDensity( ) const {
+ return Layer::getTotalParticleSurfaceDensity( );
+ }
+
virtual void setMaterial( ::IMaterial const * material ) {
if( bp::override func_setMaterial = this->get_override( "setMaterial" ) )
func_setMaterial( boost::python::ptr(material) );
- else{
+ else
this->Layer::setMaterial( boost::python::ptr(material) );
- }
}
+
void default_setMaterial( ::IMaterial const * material ) {
Layer::setMaterial( boost::python::ptr(material) );
}
@@ -102,11 +121,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setMaterial( ::IMaterial const * material, double thickness ) {
if( bp::override func_setMaterial = this->get_override( "setMaterial" ) )
func_setMaterial( boost::python::ptr(material), thickness );
- else{
+ else
this->Layer::setMaterial( boost::python::ptr(material), thickness );
- }
}
+
void default_setMaterial( ::IMaterial const * material, double thickness ) {
Layer::setMaterial( boost::python::ptr(material), thickness );
}
@@ -114,11 +133,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setThickness( double thickness ) {
if( bp::override func_setThickness = this->get_override( "setThickness" ) )
func_setThickness( thickness );
- else{
+ else
this->Layer::setThickness( thickness );
- }
}
+
void default_setThickness( double thickness ) {
Layer::setThickness( thickness );
}
@@ -126,11 +145,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -138,11 +157,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -150,11 +169,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -162,11 +181,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -174,11 +193,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -186,11 +205,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -217,11 +236,11 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -229,24 +248,24 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -258,7 +277,8 @@ void register_Layer_class(){
typedef bp::class_< Layer_wrapper, bp::bases< ICompositeSample >, boost::noncopyable > Layer_exposer_t;
Layer_exposer_t Layer_exposer = Layer_exposer_t( "Layer", bp::init< >() );
bp::scope Layer_scope( Layer_exposer );
- Layer_exposer.def( bp::init< IMaterial const *, bp::optional< double > >(( bp::arg("material"), bp::arg("thickness")=0 )) );
+ Layer_exposer.def( bp::init< IMaterial const *, bp::optional< double, IDecoration * > >(( bp::arg("material"), bp::arg("thickness")=0, bp::arg("decoration")=bp::object() )) );
+ Layer_exposer.def( bp::init< IMaterial const *, double, IDecoration const & >(( bp::arg("material"), bp::arg("thickness"), bp::arg("decoration") )) );
Layer_exposer.def( bp::init< Layer const & >(( bp::arg("other") )) );
{ //::Layer::clone
@@ -271,6 +291,16 @@ void register_Layer_class(){
, default_clone_function_type(&Layer_wrapper::default_clone)
, bp::return_value_policy< bp::manage_new_object >() );
+ }
+ { //::Layer::getDecoration
+
+ typedef ::IDecoration const * ( ::Layer::*getDecoration_function_type )( ) const;
+
+ Layer_exposer.def(
+ "getDecoration"
+ , getDecoration_function_type( &::Layer::getDecoration )
+ , bp::return_value_policy< bp::reference_existing_object >() );
+
}
{ //::Layer::getMaterial
@@ -305,6 +335,27 @@ void register_Layer_class(){
, getThickness_function_type(&::Layer::getThickness)
, default_getThickness_function_type(&Layer_wrapper::default_getThickness) );
+ }
+ { //::Layer::getTotalParticleSurfaceDensity
+
+ typedef double ( ::Layer::*getTotalParticleSurfaceDensity_function_type )( ) const;
+ typedef double ( Layer_wrapper::*default_getTotalParticleSurfaceDensity_function_type )( ) const;
+
+ Layer_exposer.def(
+ "getTotalParticleSurfaceDensity"
+ , getTotalParticleSurfaceDensity_function_type(&::Layer::getTotalParticleSurfaceDensity)
+ , default_getTotalParticleSurfaceDensity_function_type(&Layer_wrapper::default_getTotalParticleSurfaceDensity) );
+
+ }
+ { //::Layer::setDecoration
+
+ typedef void ( ::Layer::*setDecoration_function_type )( ::IDecoration const & ) ;
+
+ Layer_exposer.def(
+ "setDecoration"
+ , setDecoration_function_type( &::Layer::setDecoration )
+ , ( bp::arg("decoration") ) );
+
}
{ //::Layer::setMaterial
@@ -446,8 +497,8 @@ void register_Layer_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( Layer_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( Layer_wrapper::*default_size_function_type )( ) const;
Layer_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/LayerDecorator.pypp.cpp b/Core/PythonAPI/src/LayerDecorator.pypp.cpp
deleted file mode 100644
index bef21ce99444d1d9c8ac699f642b9a2a125ef91e..0000000000000000000000000000000000000000
--- a/Core/PythonAPI/src/LayerDecorator.pypp.cpp
+++ /dev/null
@@ -1,462 +0,0 @@
-// This file has been generated by Py++.
-
-// BornAgain: simulate and fit scattering at grazing incidence
-//! @brief automatically generated boost::python code for PythonCoreAPI
-
-#include "Macros.h"
-GCC_DIAG_OFF(unused-parameter);
-GCC_DIAG_OFF(missing-field-initializers);
-#include "boost/python.hpp"
-GCC_DIAG_ON(unused-parameter);
-GCC_DIAG_ON(missing-field-initializers);
-#include "__call_policies.pypp.hpp"
-#include "__convenience.pypp.hpp"
-#include "PythonCoreList.h"
-#include "LayerDecorator.pypp.h"
-
-namespace bp = boost::python;
-
-struct LayerDecorator_wrapper : LayerDecorator, bp::wrapper< LayerDecorator > {
-
- LayerDecorator_wrapper(::Layer const & layer, ::IDecoration const & decoration )
- : LayerDecorator( boost::ref(layer), boost::ref(decoration) )
- , bp::wrapper< LayerDecorator >(){
- // constructor
-
- }
-
- virtual ::LayerDecorator * clone( ) const {
- if( bp::override func_clone = this->get_override( "clone" ) )
- return func_clone( );
- else{
- return this->LayerDecorator::clone( );
- }
- }
-
- ::LayerDecorator * default_clone( ) const {
- return LayerDecorator::clone( );
- }
-
- virtual ::IMaterial const * getMaterial( ) const {
- if( bp::override func_getMaterial = this->get_override( "getMaterial" ) )
- return func_getMaterial( );
- else{
- return this->LayerDecorator::getMaterial( );
- }
- }
-
- ::IMaterial const * default_getMaterial( ) const {
- return LayerDecorator::getMaterial( );
- }
-
- virtual ::complex_t getRefractiveIndex( ) const {
- if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
- return func_getRefractiveIndex( );
- else{
- return this->LayerDecorator::getRefractiveIndex( );
- }
- }
-
- ::complex_t default_getRefractiveIndex( ) const {
- return LayerDecorator::getRefractiveIndex( );
- }
-
- virtual double getThickness( ) const {
- if( bp::override func_getThickness = this->get_override( "getThickness" ) )
- return func_getThickness( );
- else{
- return this->LayerDecorator::getThickness( );
- }
- }
-
- double default_getThickness( ) const {
- return LayerDecorator::getThickness( );
- }
-
- virtual double getTotalParticleSurfaceDensity( ) const {
- if( bp::override func_getTotalParticleSurfaceDensity = this->get_override( "getTotalParticleSurfaceDensity" ) )
- return func_getTotalParticleSurfaceDensity( );
- else{
- return this->LayerDecorator::getTotalParticleSurfaceDensity( );
- }
- }
-
- double default_getTotalParticleSurfaceDensity( ) const {
- return LayerDecorator::getTotalParticleSurfaceDensity( );
- }
-
- virtual void init_parameters( ) {
- if( bp::override func_init_parameters = this->get_override( "init_parameters" ) )
- func_init_parameters( );
- else{
- this->LayerDecorator::init_parameters( );
- }
- }
-
- void default_init_parameters( ) {
- LayerDecorator::init_parameters( );
- }
-
- virtual void setThickness( double thickness ) {
- if( bp::override func_setThickness = this->get_override( "setThickness" ) )
- func_setThickness( thickness );
- else{
- this->LayerDecorator::setThickness( thickness );
- }
- }
-
- void default_setThickness( double thickness ) {
- LayerDecorator::setThickness( thickness );
- }
-
- virtual bool areParametersChanged( ) {
- if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
- return func_areParametersChanged( );
- else{
- return this->IParameterized::areParametersChanged( );
- }
- }
-
- bool default_areParametersChanged( ) {
- 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( );
- else{
- return this->IParameterized::createParameterTree( );
- }
- }
-
- ::ParameterPool * default_createParameterTree( ) const {
- return IParameterized::createParameterTree( );
- }
-
- virtual ::ICompositeSample * getCompositeSample( ) {
- if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
- return func_getCompositeSample( );
- else{
- return this->ICompositeSample::getCompositeSample( );
- }
- }
-
- ::ICompositeSample * default_getCompositeSample( ) {
- return ICompositeSample::getCompositeSample( );
- }
-
- virtual ::ICompositeSample const * getCompositeSample( ) const {
- if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
- return func_getCompositeSample( );
- else{
- return this->ICompositeSample::getCompositeSample( );
- }
- }
-
- ::ICompositeSample const * default_getCompositeSample( ) const {
- return ICompositeSample::getCompositeSample( );
- }
-
- virtual void printParameters( ) const {
- if( bp::override func_printParameters = this->get_override( "printParameters" ) )
- func_printParameters( );
- else{
- this->IParameterized::printParameters( );
- }
- }
-
- void default_printParameters( ) const {
- 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< 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( );
- else{
- this->IParameterized::setParametersAreChanged( );
- }
- }
-
- void default_setParametersAreChanged( ) {
- IParameterized::setParametersAreChanged( );
- }
-
- virtual ::size_t size( ) const {
- if( bp::override func_size = this->get_override( "size" ) )
- return func_size( );
- else{
- return this->ICompositeSample::size( );
- }
- }
-
- ::size_t default_size( ) const {
- return ICompositeSample::size( );
- }
-
-};
-
-void register_LayerDecorator_class(){
-
- { //::LayerDecorator
- typedef bp::class_< LayerDecorator_wrapper, bp::bases< Layer >, boost::noncopyable > LayerDecorator_exposer_t;
- LayerDecorator_exposer_t LayerDecorator_exposer = LayerDecorator_exposer_t( "LayerDecorator", bp::init< Layer const &, IDecoration const & >(( bp::arg("layer"), bp::arg("decoration") )) );
- bp::scope LayerDecorator_scope( LayerDecorator_exposer );
- { //::LayerDecorator::clone
-
- typedef ::LayerDecorator * ( ::LayerDecorator::*clone_function_type )( ) const;
- typedef ::LayerDecorator * ( LayerDecorator_wrapper::*default_clone_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "clone"
- , clone_function_type(&::LayerDecorator::clone)
- , default_clone_function_type(&LayerDecorator_wrapper::default_clone)
- , bp::return_value_policy< bp::manage_new_object >() );
-
- }
- { //::LayerDecorator::getDecoratedLayer
-
- typedef ::Layer const * ( ::LayerDecorator::*getDecoratedLayer_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "getDecoratedLayer"
- , getDecoratedLayer_function_type( &::LayerDecorator::getDecoratedLayer )
- , bp::return_value_policy< bp::reference_existing_object >() );
-
- }
- { //::LayerDecorator::getDecoration
-
- typedef ::IDecoration const * ( ::LayerDecorator::*getDecoration_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "getDecoration"
- , getDecoration_function_type( &::LayerDecorator::getDecoration )
- , bp::return_value_policy< bp::reference_existing_object >() );
-
- }
- { //::LayerDecorator::getMaterial
-
- typedef ::IMaterial const * ( ::LayerDecorator::*getMaterial_function_type )( ) const;
- typedef ::IMaterial const * ( LayerDecorator_wrapper::*default_getMaterial_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "getMaterial"
- , getMaterial_function_type(&::LayerDecorator::getMaterial)
- , default_getMaterial_function_type(&LayerDecorator_wrapper::default_getMaterial)
- , bp::return_value_policy< bp::reference_existing_object >() );
-
- }
- { //::LayerDecorator::getRefractiveIndex
-
- typedef ::complex_t ( ::LayerDecorator::*getRefractiveIndex_function_type )( ) const;
- typedef ::complex_t ( LayerDecorator_wrapper::*default_getRefractiveIndex_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "getRefractiveIndex"
- , getRefractiveIndex_function_type(&::LayerDecorator::getRefractiveIndex)
- , default_getRefractiveIndex_function_type(&LayerDecorator_wrapper::default_getRefractiveIndex) );
-
- }
- { //::LayerDecorator::getThickness
-
- typedef double ( ::LayerDecorator::*getThickness_function_type )( ) const;
- typedef double ( LayerDecorator_wrapper::*default_getThickness_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "getThickness"
- , getThickness_function_type(&::LayerDecorator::getThickness)
- , default_getThickness_function_type(&LayerDecorator_wrapper::default_getThickness) );
-
- }
- { //::LayerDecorator::getTotalParticleSurfaceDensity
-
- typedef double ( ::LayerDecorator::*getTotalParticleSurfaceDensity_function_type )( ) const;
- typedef double ( LayerDecorator_wrapper::*default_getTotalParticleSurfaceDensity_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "getTotalParticleSurfaceDensity"
- , getTotalParticleSurfaceDensity_function_type(&::LayerDecorator::getTotalParticleSurfaceDensity)
- , default_getTotalParticleSurfaceDensity_function_type(&LayerDecorator_wrapper::default_getTotalParticleSurfaceDensity) );
-
- }
- { //::LayerDecorator::init_parameters
-
- typedef void ( ::LayerDecorator::*init_parameters_function_type )( ) ;
- typedef void ( LayerDecorator_wrapper::*default_init_parameters_function_type )( ) ;
-
- LayerDecorator_exposer.def(
- "init_parameters"
- , init_parameters_function_type(&::LayerDecorator::init_parameters)
- , default_init_parameters_function_type(&LayerDecorator_wrapper::default_init_parameters) );
-
- }
- { //::LayerDecorator::setThickness
-
- typedef void ( ::LayerDecorator::*setThickness_function_type )( double ) ;
- typedef void ( LayerDecorator_wrapper::*default_setThickness_function_type )( double ) ;
-
- LayerDecorator_exposer.def(
- "setThickness"
- , setThickness_function_type(&::LayerDecorator::setThickness)
- , default_setThickness_function_type(&LayerDecorator_wrapper::default_setThickness)
- , ( bp::arg("thickness") ) );
-
- }
- { //::IParameterized::areParametersChanged
-
- typedef bool ( ::IParameterized::*areParametersChanged_function_type )( ) ;
- typedef bool ( LayerDecorator_wrapper::*default_areParametersChanged_function_type )( ) ;
-
- LayerDecorator_exposer.def(
- "areParametersChanged"
- , areParametersChanged_function_type(&::IParameterized::areParametersChanged)
- , default_areParametersChanged_function_type(&LayerDecorator_wrapper::default_areParametersChanged) );
-
- }
- { //::IParameterized::clearParameterPool
-
- typedef void ( ::IParameterized::*clearParameterPool_function_type )( ) ;
- typedef void ( LayerDecorator_wrapper::*default_clearParameterPool_function_type )( ) ;
-
- LayerDecorator_exposer.def(
- "clearParameterPool"
- , clearParameterPool_function_type(&::IParameterized::clearParameterPool)
- , default_clearParameterPool_function_type(&LayerDecorator_wrapper::default_clearParameterPool) );
-
- }
- { //::IParameterized::createParameterTree
-
- typedef ::ParameterPool * ( ::IParameterized::*createParameterTree_function_type )( ) const;
- typedef ::ParameterPool * ( LayerDecorator_wrapper::*default_createParameterTree_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "createParameterTree"
- , createParameterTree_function_type(&::IParameterized::createParameterTree)
- , default_createParameterTree_function_type(&LayerDecorator_wrapper::default_createParameterTree)
- , bp::return_value_policy< bp::manage_new_object >() );
-
- }
- { //::ICompositeSample::getCompositeSample
-
- typedef ::ICompositeSample * ( ::ICompositeSample::*getCompositeSample_function_type )( ) ;
- typedef ::ICompositeSample * ( LayerDecorator_wrapper::*default_getCompositeSample_function_type )( ) ;
-
- LayerDecorator_exposer.def(
- "getCompositeSample"
- , getCompositeSample_function_type(&::ICompositeSample::getCompositeSample)
- , default_getCompositeSample_function_type(&LayerDecorator_wrapper::default_getCompositeSample)
- , bp::return_value_policy< bp::reference_existing_object >() );
-
- }
- { //::ICompositeSample::getCompositeSample
-
- typedef ::ICompositeSample const * ( ::ICompositeSample::*getCompositeSample_function_type )( ) const;
- typedef ::ICompositeSample const * ( LayerDecorator_wrapper::*default_getCompositeSample_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "getCompositeSample"
- , getCompositeSample_function_type(&::ICompositeSample::getCompositeSample)
- , default_getCompositeSample_function_type(&LayerDecorator_wrapper::default_getCompositeSample)
- , bp::return_value_policy< bp::reference_existing_object >() );
-
- }
- { //::IParameterized::printParameters
-
- typedef void ( ::IParameterized::*printParameters_function_type )( ) const;
- typedef void ( LayerDecorator_wrapper::*default_printParameters_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "printParameters"
- , printParameters_function_type(&::IParameterized::printParameters)
- , default_printParameters_function_type(&LayerDecorator_wrapper::default_printParameters) );
-
- }
- { //::IParameterized::registerParameter
-
- typedef void ( *default_registerParameter_function_type )( ::IParameterized &,::std::string const &,long unsigned int );
-
- LayerDecorator_exposer.def(
- "registerParameter"
- , default_registerParameter_function_type( &LayerDecorator_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 ( LayerDecorator_wrapper::*default_setParameterValue_function_type )( ::std::string const &,double ) ;
-
- LayerDecorator_exposer.def(
- "setParameterValue"
- , setParameterValue_function_type(&::IParameterized::setParameterValue)
- , default_setParameterValue_function_type(&LayerDecorator_wrapper::default_setParameterValue)
- , ( bp::arg("name"), bp::arg("value") ) );
-
- }
- { //::IParameterized::setParametersAreChanged
-
- typedef void ( ::IParameterized::*setParametersAreChanged_function_type )( ) ;
- typedef void ( LayerDecorator_wrapper::*default_setParametersAreChanged_function_type )( ) ;
-
- LayerDecorator_exposer.def(
- "setParametersAreChanged"
- , setParametersAreChanged_function_type(&::IParameterized::setParametersAreChanged)
- , default_setParametersAreChanged_function_type(&LayerDecorator_wrapper::default_setParametersAreChanged) );
-
- }
- { //::ICompositeSample::size
-
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( LayerDecorator_wrapper::*default_size_function_type )( ) const;
-
- LayerDecorator_exposer.def(
- "size"
- , size_function_type(&::ICompositeSample::size)
- , default_size_function_type(&LayerDecorator_wrapper::default_size) );
-
- }
- }
-
-}
diff --git a/Core/PythonAPI/src/LayerInterface.pypp.cpp b/Core/PythonAPI/src/LayerInterface.pypp.cpp
index 267c7c1a6568fa243eaf04dbab058216cb7edc45..eefc2d00c61120952cf8780bbb985e37eab1f3a5 100644
--- a/Core/PythonAPI/src/LayerInterface.pypp.cpp
+++ b/Core/PythonAPI/src/LayerInterface.pypp.cpp
@@ -21,11 +21,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -33,11 +33,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -45,11 +45,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ICompositeSample * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ICompositeSample::clone( );
- }
}
+
::ICompositeSample * default_clone( ) const {
return ICompositeSample::clone( );
}
@@ -57,11 +57,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -69,11 +69,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -81,11 +81,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -93,11 +93,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -124,11 +124,11 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -136,24 +136,24 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -321,8 +321,8 @@ void register_LayerInterface_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( LayerInterface_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( LayerInterface_wrapper::*default_size_function_type )( ) const;
LayerInterface_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/LayerRoughness.pypp.cpp b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
index af4d30e3f8c51ea065f070dca389ea63ef09c9d3..9d820f21cca127abaaa0acf2946946a97bbba92e 100644
--- a/Core/PythonAPI/src/LayerRoughness.pypp.cpp
+++ b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
@@ -35,11 +35,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::LayerRoughness * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->LayerRoughness::clone( );
- }
}
+
::LayerRoughness * default_clone( ) const {
return LayerRoughness::clone( );
}
@@ -47,11 +47,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -83,11 +83,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ISample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ISample::getCompositeSample( );
}
@@ -95,11 +95,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -126,11 +126,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -138,11 +138,11 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/MesoCrystal.pypp.cpp b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
index cfb60d884f80a12e17d86b5c9262254b68f3ae0d..701324d6067d6b440192c928ab8f5df06f90556b 100644
--- a/Core/PythonAPI/src/MesoCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
@@ -28,11 +28,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -40,11 +40,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -52,11 +52,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -64,11 +64,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -76,11 +76,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -88,11 +88,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual ::complex_t const getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t const default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -100,11 +100,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -112,11 +112,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -143,11 +143,11 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -155,24 +155,24 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -310,8 +310,8 @@ void register_MesoCrystal_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( MesoCrystal_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( MesoCrystal_wrapper::*default_size_function_type )( ) const;
MesoCrystal_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/MultiLayer.pypp.cpp b/Core/PythonAPI/src/MultiLayer.pypp.cpp
index 0e4ca455a6b52b60d3d2e868fe8549a82a2eacef..92f25ce0a99fce40f1561180bbf21c9e5aad23df 100644
--- a/Core/PythonAPI/src/MultiLayer.pypp.cpp
+++ b/Core/PythonAPI/src/MultiLayer.pypp.cpp
@@ -28,11 +28,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::MultiLayer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->MultiLayer::clone( );
- }
}
+
::MultiLayer * default_clone( ) const {
return MultiLayer::clone( );
}
@@ -40,11 +40,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -76,11 +76,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -88,11 +88,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -100,11 +100,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -131,11 +131,11 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -143,24 +143,24 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -224,7 +224,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getCrossCorrSpectralFun
- typedef double ( ::MultiLayer::*getCrossCorrSpectralFun_function_type )( ::kvector_t const &,::size_t,::size_t ) const;
+ typedef double ( ::MultiLayer::*getCrossCorrSpectralFun_function_type )( ::kvector_t const &,::std::size_t,::std::size_t ) const;
MultiLayer_exposer.def(
"getCrossCorrSpectralFun"
@@ -234,7 +234,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayer
- typedef ::Layer const * ( ::MultiLayer::*getLayer_function_type )( ::size_t ) const;
+ typedef ::Layer const * ( ::MultiLayer::*getLayer_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayer"
@@ -245,7 +245,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerBottomInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerBottomInterface_function_type )( ::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerBottomInterface_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerBottomInterface"
@@ -256,7 +256,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerBottomZ
- typedef double ( ::MultiLayer::*getLayerBottomZ_function_type )( ::size_t ) const;
+ typedef double ( ::MultiLayer::*getLayerBottomZ_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerBottomZ"
@@ -266,7 +266,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerInterface_function_type )( ::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerInterface_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerInterface"
@@ -277,7 +277,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerThickness
- typedef double ( ::MultiLayer::*getLayerThickness_function_type )( ::size_t ) const;
+ typedef double ( ::MultiLayer::*getLayerThickness_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerThickness"
@@ -287,7 +287,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getLayerTopInterface
- typedef ::LayerInterface const * ( ::MultiLayer::*getLayerTopInterface_function_type )( ::size_t ) const;
+ typedef ::LayerInterface const * ( ::MultiLayer::*getLayerTopInterface_function_type )( ::std::size_t ) const;
MultiLayer_exposer.def(
"getLayerTopInterface"
@@ -298,7 +298,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getNumberOfInterfaces
- typedef ::size_t ( ::MultiLayer::*getNumberOfInterfaces_function_type )( ) const;
+ typedef ::std::size_t ( ::MultiLayer::*getNumberOfInterfaces_function_type )( ) const;
MultiLayer_exposer.def(
"getNumberOfInterfaces"
@@ -307,7 +307,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::getNumberOfLayers
- typedef ::size_t ( ::MultiLayer::*getNumberOfLayers_function_type )( ) const;
+ typedef ::std::size_t ( ::MultiLayer::*getNumberOfLayers_function_type )( ) const;
MultiLayer_exposer.def(
"getNumberOfLayers"
@@ -326,7 +326,7 @@ void register_MultiLayer_class(){
}
{ //::MultiLayer::setLayerThickness
- typedef void ( ::MultiLayer::*setLayerThickness_function_type )( ::size_t,double ) ;
+ typedef void ( ::MultiLayer::*setLayerThickness_function_type )( ::std::size_t,double ) ;
MultiLayer_exposer.def(
"setLayerThickness"
@@ -438,8 +438,8 @@ void register_MultiLayer_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( MultiLayer_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( MultiLayer_wrapper::*default_size_function_type )( ) const;
MultiLayer_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParameterPool.pypp.cpp b/Core/PythonAPI/src/ParameterPool.pypp.cpp
index 914cffcceb87c743ab97a780af190e5900711dce..88a890adef42f8d7457b59117ee8e8606bba2a3c 100644
--- a/Core/PythonAPI/src/ParameterPool.pypp.cpp
+++ b/Core/PythonAPI/src/ParameterPool.pypp.cpp
@@ -26,11 +26,11 @@ struct ParameterPool_wrapper : ParameterPool, bp::wrapper< ParameterPool > {
virtual ::ParameterPool * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ParameterPool::clone( );
- }
}
+
::ParameterPool * default_clone( ) const {
return ParameterPool::clone( );
}
@@ -127,7 +127,7 @@ void register_ParameterPool_class(){
}
{ //::ParameterPool::size
- typedef ::size_t ( ::ParameterPool::*size_function_type )( ) const;
+ typedef ::std::size_t ( ::ParameterPool::*size_function_type )( ) const;
ParameterPool_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/Particle.pypp.cpp b/Core/PythonAPI/src/Particle.pypp.cpp
index 3171b00202308237e29c212329981f62cfa160ed..067f884861ab45fc2e275c49fd6195974f5829b0 100644
--- a/Core/PythonAPI/src/Particle.pypp.cpp
+++ b/Core/PythonAPI/src/Particle.pypp.cpp
@@ -28,11 +28,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::Particle * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Particle::clone( );
- }
}
+
::Particle * default_clone( ) const {
return Particle::clone( );
}
@@ -40,11 +40,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IFormFactor * createFormFactor( ) const {
if( bp::override func_createFormFactor = this->get_override( "createFormFactor" ) )
return func_createFormFactor( );
- else{
+ else
return this->Particle::createFormFactor( );
- }
}
+
::IFormFactor * default_createFormFactor( ) const {
return Particle::createFormFactor( );
}
@@ -52,11 +52,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::complex_t const getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t const default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -64,11 +64,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::IFormFactor const * getSimpleFormFactor( ) const {
if( bp::override func_getSimpleFormFactor = this->get_override( "getSimpleFormFactor" ) )
return func_getSimpleFormFactor( );
- else{
+ else
return this->Particle::getSimpleFormFactor( );
- }
}
+
::IFormFactor const * default_getSimpleFormFactor( ) const {
return Particle::getSimpleFormFactor( );
}
@@ -76,11 +76,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -88,11 +88,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void setAmbientRefractiveIndex( ::complex_t refractive_index ) {
if( bp::override func_setAmbientRefractiveIndex = this->get_override( "setAmbientRefractiveIndex" ) )
func_setAmbientRefractiveIndex( refractive_index );
- else{
+ else
this->Particle::setAmbientRefractiveIndex( refractive_index );
- }
}
+
void default_setAmbientRefractiveIndex( ::complex_t refractive_index ) {
Particle::setAmbientRefractiveIndex( refractive_index );
}
@@ -100,11 +100,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -136,11 +136,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -160,11 +160,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -191,11 +191,11 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,24 +203,24 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -406,8 +406,8 @@ void register_Particle_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( Particle_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( Particle_wrapper::*default_size_function_type )( ) const;
Particle_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
index b6dc83f2ff707cacd1f48e63edcab8edf96a8438..79959588ca7e23e03a6a9a5f328410763284e469 100644
--- a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
@@ -28,11 +28,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -40,11 +40,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -52,11 +52,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -64,11 +64,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -76,11 +76,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -88,11 +88,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual ::complex_t const getRefractiveIndex( ) const {
if( bp::override func_getRefractiveIndex = this->get_override( "getRefractiveIndex" ) )
return func_getRefractiveIndex( );
- else{
+ else
return this->Particle::getRefractiveIndex( );
- }
}
+
::complex_t const default_getRefractiveIndex( ) const {
return Particle::getRefractiveIndex( );
}
@@ -100,11 +100,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool hasDistributedFormFactor( ) const {
if( bp::override func_hasDistributedFormFactor = this->get_override( "hasDistributedFormFactor" ) )
return func_hasDistributedFormFactor( );
- else{
+ else
return this->Particle::hasDistributedFormFactor( );
- }
}
+
bool default_hasDistributedFormFactor( ) const {
return Particle::hasDistributedFormFactor( );
}
@@ -112,11 +112,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -143,11 +143,11 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -155,24 +155,24 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -310,8 +310,8 @@ void register_ParticleCoreShell_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ParticleCoreShell_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ParticleCoreShell_wrapper::*default_size_function_type )( ) const;
ParticleCoreShell_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
index 742bfa395f4b9536f359d940418f96d385fa40b0..8c36b9d269ea680dbbaafe18f5ff8adfb0f18ab5 100644
--- a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
@@ -28,83 +28,83 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParticleDecoration * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ParticleDecoration::clone( );
- }
}
+
::ParticleDecoration * default_clone( ) const {
return ParticleDecoration::clone( );
}
- virtual double getAbundanceFractionOfParticle( ::size_t index ) const {
+ virtual double getAbundanceFractionOfParticle( ::std::size_t index ) const {
if( bp::override func_getAbundanceFractionOfParticle = this->get_override( "getAbundanceFractionOfParticle" ) )
return func_getAbundanceFractionOfParticle( index );
- else{
+ else
return this->ParticleDecoration::getAbundanceFractionOfParticle( index );
- }
}
- double default_getAbundanceFractionOfParticle( ::size_t index ) const {
+
+ double default_getAbundanceFractionOfParticle( ::std::size_t index ) const {
return ParticleDecoration::getAbundanceFractionOfParticle( index );
}
virtual ::SafePointerVector< IInterferenceFunction > getInterferenceFunctions( ) const {
if( bp::override func_getInterferenceFunctions = this->get_override( "getInterferenceFunctions" ) )
return func_getInterferenceFunctions( );
- else{
+ else
return this->ParticleDecoration::getInterferenceFunctions( );
- }
}
+
::SafePointerVector< IInterferenceFunction > default_getInterferenceFunctions( ) const {
return ParticleDecoration::getInterferenceFunctions( );
}
- virtual ::size_t getNumberOfInterferenceFunctions( ) const {
+ virtual ::std::size_t getNumberOfInterferenceFunctions( ) const {
if( bp::override func_getNumberOfInterferenceFunctions = this->get_override( "getNumberOfInterferenceFunctions" ) )
return func_getNumberOfInterferenceFunctions( );
- else{
+ else
return this->ParticleDecoration::getNumberOfInterferenceFunctions( );
- }
}
- ::size_t default_getNumberOfInterferenceFunctions( ) const {
+
+ ::std::size_t default_getNumberOfInterferenceFunctions( ) const {
return ParticleDecoration::getNumberOfInterferenceFunctions( );
}
- virtual ::size_t getNumberOfParticles( ) const {
+ virtual ::std::size_t getNumberOfParticles( ) const {
if( bp::override func_getNumberOfParticles = this->get_override( "getNumberOfParticles" ) )
return func_getNumberOfParticles( );
- else{
+ else
return this->ParticleDecoration::getNumberOfParticles( );
- }
}
- ::size_t default_getNumberOfParticles( ) const {
+
+ ::std::size_t default_getNumberOfParticles( ) const {
return ParticleDecoration::getNumberOfParticles( );
}
- virtual ::ParticleInfo const * getParticleInfo( ::size_t index ) const {
+ virtual ::ParticleInfo const * getParticleInfo( ::std::size_t index ) const {
if( bp::override func_getParticleInfo = this->get_override( "getParticleInfo" ) )
return func_getParticleInfo( index );
- else{
+ else
return this->ParticleDecoration::getParticleInfo( index );
- }
}
- ::ParticleInfo const * default_getParticleInfo( ::size_t index ) const {
+
+ ::ParticleInfo const * default_getParticleInfo( ::std::size_t index ) const {
return ParticleDecoration::getParticleInfo( index );
}
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -112,11 +112,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -124,11 +124,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -136,11 +136,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -148,11 +148,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -160,11 +160,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -191,11 +191,11 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -203,24 +203,24 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -286,8 +286,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getAbundanceFractionOfParticle
- typedef double ( ::ParticleDecoration::*getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
- typedef double ( ParticleDecoration_wrapper::*default_getAbundanceFractionOfParticle_function_type )( ::size_t ) const;
+ typedef double ( ::ParticleDecoration::*getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
+ typedef double ( ParticleDecoration_wrapper::*default_getAbundanceFractionOfParticle_function_type )( ::std::size_t ) const;
ParticleDecoration_exposer.def(
"getAbundanceFractionOfParticle"
@@ -298,7 +298,7 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getInterferenceFunction
- typedef ::IInterferenceFunction const * ( ::ParticleDecoration::*getInterferenceFunction_function_type )( ::size_t ) const;
+ typedef ::IInterferenceFunction const * ( ::ParticleDecoration::*getInterferenceFunction_function_type )( ::std::size_t ) const;
ParticleDecoration_exposer.def(
"getInterferenceFunction"
@@ -320,8 +320,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getNumberOfInterferenceFunctions
- typedef ::size_t ( ::ParticleDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
- typedef ::size_t ( ParticleDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( ::ParticleDecoration::*getNumberOfInterferenceFunctions_function_type )( ) const;
+ typedef ::std::size_t ( ParticleDecoration_wrapper::*default_getNumberOfInterferenceFunctions_function_type )( ) const;
ParticleDecoration_exposer.def(
"getNumberOfInterferenceFunctions"
@@ -331,8 +331,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getNumberOfParticles
- typedef ::size_t ( ::ParticleDecoration::*getNumberOfParticles_function_type )( ) const;
- typedef ::size_t ( ParticleDecoration_wrapper::*default_getNumberOfParticles_function_type )( ) const;
+ typedef ::std::size_t ( ::ParticleDecoration::*getNumberOfParticles_function_type )( ) const;
+ typedef ::std::size_t ( ParticleDecoration_wrapper::*default_getNumberOfParticles_function_type )( ) const;
ParticleDecoration_exposer.def(
"getNumberOfParticles"
@@ -342,8 +342,8 @@ void register_ParticleDecoration_class(){
}
{ //::ParticleDecoration::getParticleInfo
- typedef ::ParticleInfo const * ( ::ParticleDecoration::*getParticleInfo_function_type )( ::size_t ) const;
- typedef ::ParticleInfo const * ( ParticleDecoration_wrapper::*default_getParticleInfo_function_type )( ::size_t ) const;
+ typedef ::ParticleInfo const * ( ::ParticleDecoration::*getParticleInfo_function_type )( ::std::size_t ) const;
+ typedef ::ParticleInfo const * ( ParticleDecoration_wrapper::*default_getParticleInfo_function_type )( ::std::size_t ) const;
ParticleDecoration_exposer.def(
"getParticleInfo"
@@ -457,8 +457,8 @@ void register_ParticleDecoration_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ParticleDecoration_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ParticleDecoration_wrapper::*default_size_function_type )( ) const;
ParticleDecoration_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/ParticleInfo.pypp.cpp b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
index 99bdb2b15ab2c7d6e59242ed1169fea744595334..60727de0adcaae18eb118663763c763fff2ec97d 100644
--- a/Core/PythonAPI/src/ParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
@@ -35,11 +35,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParticleInfo * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ParticleInfo::clone( );
- }
}
+
::ParticleInfo * default_clone( ) const {
return ParticleInfo::clone( );
}
@@ -47,11 +47,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -83,11 +83,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -95,11 +95,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -107,11 +107,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -138,11 +138,11 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -150,24 +150,24 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -363,8 +363,8 @@ void register_ParticleInfo_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( ParticleInfo_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( ParticleInfo_wrapper::*default_size_function_type )( ) const;
ParticleInfo_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
index 3bf887b5e8a05890462982137d961704ea6cb65d..36adfaf26e3dd39db9e87528d65d52177d7622c1 100644
--- a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
@@ -35,11 +35,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::PositionParticleInfo * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->PositionParticleInfo::clone( );
- }
}
+
::PositionParticleInfo * default_clone( ) const {
return PositionParticleInfo::clone( );
}
@@ -47,11 +47,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -59,11 +59,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -71,11 +71,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -83,11 +83,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ICompositeSample * getCompositeSample( ) {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample * default_getCompositeSample( ) {
return ICompositeSample::getCompositeSample( );
}
@@ -95,11 +95,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual ::ICompositeSample const * getCompositeSample( ) const {
if( bp::override func_getCompositeSample = this->get_override( "getCompositeSample" ) )
return func_getCompositeSample( );
- else{
+ else
return this->ICompositeSample::getCompositeSample( );
- }
}
+
::ICompositeSample const * default_getCompositeSample( ) const {
return ICompositeSample::getCompositeSample( );
}
@@ -107,11 +107,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -138,11 +138,11 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -150,24 +150,24 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
- virtual ::size_t size( ) const {
+ virtual ::std::size_t size( ) const {
if( bp::override func_size = this->get_override( "size" ) )
return func_size( );
- else{
+ else
return this->ICompositeSample::size( );
- }
}
- ::size_t default_size( ) const {
+
+ ::std::size_t default_size( ) const {
return ICompositeSample::size( );
}
@@ -325,8 +325,8 @@ void register_PositionParticleInfo_class(){
}
{ //::ICompositeSample::size
- typedef ::size_t ( ::ICompositeSample::*size_function_type )( ) const;
- typedef ::size_t ( PositionParticleInfo_wrapper::*default_size_function_type )( ) const;
+ typedef ::std::size_t ( ::ICompositeSample::*size_function_type )( ) const;
+ typedef ::std::size_t ( PositionParticleInfo_wrapper::*default_size_function_type )( ) const;
PositionParticleInfo_exposer.def(
"size"
diff --git a/Core/PythonAPI/src/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index 70193c43aeb9bdd2d6c65ca515e397e1d0833d42..4fcc2fff62a0335cd417aee12dd9c9ed99e8851f 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -3,92 +3,91 @@
#include "numpy/arrayobject.h"
// the order of 3 guys above is important
-#include "Beam.pypp.h"
-#include "Bin1D.pypp.h"
-#include "Bin1DCVector.pypp.h"
-#include "Crystal.pypp.h"
-#include "cvector_t.pypp.h"
+#include "RotateZ_3D.pypp.h"
+#include "IFTDistribution2D.pypp.h"
#include "Detector.pypp.h"
-#include "FormFactorBox.pypp.h"
-#include "FormFactorCone.pypp.h"
-#include "FormFactorCrystal.pypp.h"
+#include "LatticeBasis.pypp.h"
+#include "ParticleCoreShell.pypp.h"
+#include "Beam.pypp.h"
+#include "Lattice.pypp.h"
#include "FormFactorCylinder.pypp.h"
-#include "FormFactorDecoratorDebyeWaller.pypp.h"
-#include "FormFactorEllipsoid.pypp.h"
-#include "FormFactorFullSphere.pypp.h"
-#include "FormFactorFullSpheroid.pypp.h"
-#include "FormFactorGauss.pypp.h"
-#include "FormFactorHemiSpheroid.pypp.h"
-#include "FormFactorLorentz.pypp.h"
+#include "ICloneable.pypp.h"
+#include "StochasticSampledParameter.pypp.h"
+#include "HomogeneousMaterial.pypp.h"
+#include "vector_integer_t.pypp.h"
+#include "IAxis.pypp.h"
+#include "Layer.pypp.h"
+#include "IFormFactor.pypp.h"
#include "FormFactorParallelepiped.pypp.h"
-#include "FormFactorPrism3.pypp.h"
+#include "RealParameterWrapper.pypp.h"
+#include "MaterialManager.pypp.h"
+#include "ResolutionFunction2DSimple.pypp.h"
+#include "SimulationParameters.pypp.h"
+#include "FormFactorGauss.pypp.h"
+#include "FormFactorFullSpheroid.pypp.h"
+#include "PythonInterface_global_variables.pypp.h"
+#include "ISampleBuilder.pypp.h"
+#include "StochasticParameter_t.pypp.h"
+#include "StochasticDoubleGaussian.pypp.h"
#include "FormFactorPrism6.pypp.h"
+#include "InterferenceFunction2DLattice.pypp.h"
#include "FormFactorPyramid.pypp.h"
-#include "FormFactorSphere.pypp.h"
-#include "FormFactorSphereGaussianRadius.pypp.h"
+#include "FormFactorBox.pypp.h"
+#include "IResolutionFunction2D.pypp.h"
+#include "IFormFactorBorn.pypp.h"
+#include "MultiLayer.pypp.h"
+#include "ITransform3D.pypp.h"
+#include "ParticleDecoration.pypp.h"
+#include "IDecoration.pypp.h"
#include "FTDistribution2DCauchy.pypp.h"
-#include "HomogeneousMaterial.pypp.h"
-#include "IAxis.pypp.h"
-#include "ICloneable.pypp.h"
-#include "IClusteredParticles.pypp.h"
#include "ICompositeSample.pypp.h"
-#include "IDecoration.pypp.h"
-#include "IDetectorResolution.pypp.h"
-#include "IFormFactor.pypp.h"
-#include "IFormFactorBorn.pypp.h"
-#include "IFormFactorDecorator.pypp.h"
-#include "IFTDistribution2D.pypp.h"
-#include "IInterferenceFunction.pypp.h"
+#include "cvector_t.pypp.h"
+#include "ParameterPool.pypp.h"
+#include "Particle.pypp.h"
+#include "FormFactorCone.pypp.h"
+#include "FormFactorPrism3.pypp.h"
+#include "InterferenceFunction2DParaCrystal.pypp.h"
+#include "vdouble1d_t.pypp.h"
+#include "MesoCrystal.pypp.h"
+#include "RotateY_3D.pypp.h"
+#include "FormFactorDecoratorDebyeWaller.pypp.h"
+#include "vector_IFormFactorPtr_t.pypp.h"
#include "IMaterial.pypp.h"
+#include "IFormFactorDecorator.pypp.h"
#include "Instrument.pypp.h"
-#include "InterferenceFunction1DParaCrystal.pypp.h"
-#include "InterferenceFunction2DLattice.pypp.h"
-#include "InterferenceFunction2DParaCrystal.pypp.h"
-#include "InterferenceFunctionNone.pypp.h"
-#include "IParameterized.pypp.h"
-#include "IResolutionFunction2D.pypp.h"
-#include "ISample.pypp.h"
-#include "ISampleBuilder.pypp.h"
+#include "IDetectorResolution.pypp.h"
#include "ISelectionRule.pypp.h"
-#include "ITransform3D.pypp.h"
-#include "kvector_t.pypp.h"
-#include "Lattice.pypp.h"
-#include "Lattice2DIFParameters.pypp.h"
-#include "LatticeBasis.pypp.h"
-#include "Layer.pypp.h"
-#include "LayerDecorator.pypp.h"
+#include "Bin1D.pypp.h"
+#include "ParticleInfo.pypp.h"
+#include "vector_longinteger_t.pypp.h"
+#include "FormFactorHemiSpheroid.pypp.h"
#include "LayerInterface.pypp.h"
+#include "FormFactorFullSphere.pypp.h"
+#include "PositionParticleInfo.pypp.h"
#include "LayerRoughness.pypp.h"
-#include "MaterialManager.pypp.h"
-#include "MesoCrystal.pypp.h"
-#include "MultiLayer.pypp.h"
+#include "FormFactorCrystal.pypp.h"
+#include "IParameterized.pypp.h"
+#include "Bin1DCVector.pypp.h"
+#include "StochasticDoubleGate.pypp.h"
+#include "IClusteredParticles.pypp.h"
+#include "IInterferenceFunction.pypp.h"
+#include "SimpleSelectionRule.pypp.h"
#include "ndimdata_t.pypp.h"
+#include "FormFactorLorentz.pypp.h"
#include "OutputDataIOFactory.pypp.h"
-#include "ParameterPool.pypp.h"
-#include "Particle.pypp.h"
-#include "ParticleBuilder.pypp.h"
-#include "ParticleCoreShell.pypp.h"
-#include "ParticleDecoration.pypp.h"
-#include "ParticleInfo.pypp.h"
-#include "PositionParticleInfo.pypp.h"
+#include "vector_kvector_t.pypp.h"
+#include "InterferenceFunction1DParaCrystal.pypp.h"
+#include "InterferenceFunctionNone.pypp.h"
+#include "Crystal.pypp.h"
#include "PythonInterface_free_functions.pypp.h"
-#include "PythonInterface_global_variables.pypp.h"
-#include "RealParameterWrapper.pypp.h"
-#include "ResolutionFunction2DSimple.pypp.h"
-#include "RotateY_3D.pypp.h"
-#include "RotateZ_3D.pypp.h"
-#include "SimpleSelectionRule.pypp.h"
+#include "kvector_t.pypp.h"
+#include "FormFactorEllipsoid.pypp.h"
#include "Simulation.pypp.h"
-#include "SimulationParameters.pypp.h"
-#include "StochasticDoubleGate.pypp.h"
-#include "StochasticDoubleGaussian.pypp.h"
-#include "StochasticParameter_t.pypp.h"
-#include "StochasticSampledParameter.pypp.h"
-#include "vdouble1d_t.pypp.h"
-#include "vector_IFormFactorPtr_t.pypp.h"
-#include "vector_integer_t.pypp.h"
-#include "vector_kvector_t.pypp.h"
-#include "vector_longinteger_t.pypp.h"
+#include "ISample.pypp.h"
+#include "ParticleBuilder.pypp.h"
+#include "FormFactorSphereGaussianRadius.pypp.h"
+#include "Lattice2DIFParameters.pypp.h"
+#include "FormFactorSphere.pypp.h"
#include "__call_policies.pypp.hpp"
#include "__convenience.pypp.hpp"
@@ -157,7 +156,6 @@ BOOST_PYTHON_MODULE(libBornAgainCore){
register_Particle_class();
register_LatticeBasis_class();
register_Layer_class();
- register_LayerDecorator_class();
register_LayerInterface_class();
register_LayerRoughness_class();
register_MaterialManager_class();
diff --git a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
index c607587eab0ffd99e151b0118fc973e1cf0132c8..ee1d7a797f57d200e23305cd031ec408cb794191 100644
--- a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
+++ b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
@@ -28,11 +28,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual ::ResolutionFunction2DSimple * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ResolutionFunction2DSimple::clone( );
- }
}
+
::ResolutionFunction2DSimple * default_clone( ) const {
return ResolutionFunction2DSimple::clone( );
}
@@ -40,11 +40,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual double evaluateCDF( double x, double y ) const {
if( bp::override func_evaluateCDF = this->get_override( "evaluateCDF" ) )
return func_evaluateCDF( x, y );
- else{
+ else
return this->ResolutionFunction2DSimple::evaluateCDF( x, y );
- }
}
+
double default_evaluateCDF( double x, double y ) const {
return ResolutionFunction2DSimple::evaluateCDF( x, y );
}
@@ -52,11 +52,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -64,11 +64,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -76,11 +76,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -88,11 +88,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -119,11 +119,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -131,11 +131,11 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
diff --git a/Core/PythonAPI/src/RotateY_3D.pypp.cpp b/Core/PythonAPI/src/RotateY_3D.pypp.cpp
index 6e5f4d29836e4457b904e226a981e7b3026df602..a82637d4c36c3fa80bfc6f9416549f80f307987a 100644
--- a/Core/PythonAPI/src/RotateY_3D.pypp.cpp
+++ b/Core/PythonAPI/src/RotateY_3D.pypp.cpp
@@ -33,11 +33,11 @@ struct RotateY_3D_wrapper : Geometry::RotateY_3D, bp::wrapper< Geometry::RotateY
virtual void print( ::std::ostream & ostr ) const {
if( bp::override func_print = this->get_override( "print" ) )
func_print( boost::ref(ostr) );
- else{
+ else
this->Geometry::RotateY_3D::print( boost::ref(ostr) );
- }
}
+
void default_print( ::std::ostream & ostr ) const {
Geometry::RotateY_3D::print( boost::ref(ostr) );
}
diff --git a/Core/PythonAPI/src/RotateZ_3D.pypp.cpp b/Core/PythonAPI/src/RotateZ_3D.pypp.cpp
index 659a51c1edbabe49952091a365e69788ea4664a8..e494b3136a38ebc4932bf7ba25844e088f12d5fb 100644
--- a/Core/PythonAPI/src/RotateZ_3D.pypp.cpp
+++ b/Core/PythonAPI/src/RotateZ_3D.pypp.cpp
@@ -33,11 +33,11 @@ struct RotateZ_3D_wrapper : Geometry::RotateZ_3D, bp::wrapper< Geometry::RotateZ
virtual void print( ::std::ostream & ostr ) const {
if( bp::override func_print = this->get_override( "print" ) )
func_print( boost::ref(ostr) );
- else{
+ else
this->Geometry::RotateZ_3D::print( boost::ref(ostr) );
- }
}
+
void default_print( ::std::ostream & ostr ) const {
Geometry::RotateZ_3D::print( boost::ref(ostr) );
}
diff --git a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
index cb07c7da7f228d0ed0627c2ad86dc6ba479e1229..b66737013bbb60b02e5b57ca8a9ffcc1cd795f14 100644
--- a/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
+++ b/Core/PythonAPI/src/SimpleSelectionRule.pypp.cpp
@@ -33,11 +33,11 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
virtual ::SimpleSelectionRule * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SimpleSelectionRule::clone( );
- }
}
+
::SimpleSelectionRule * default_clone( ) const {
return SimpleSelectionRule::clone( );
}
@@ -45,11 +45,11 @@ struct SimpleSelectionRule_wrapper : SimpleSelectionRule, bp::wrapper< SimpleSel
virtual bool coordinateSelected( ::IndexVector3D const & coordinate ) const {
if( bp::override func_coordinateSelected = this->get_override( "coordinateSelected" ) )
return func_coordinateSelected( boost::ref(coordinate) );
- else{
+ else
return this->SimpleSelectionRule::coordinateSelected( boost::ref(coordinate) );
- }
}
+
bool default_coordinateSelected( ::IndexVector3D const & coordinate ) const {
return SimpleSelectionRule::coordinateSelected( boost::ref(coordinate) );
}
diff --git a/Core/PythonAPI/src/Simulation.pypp.cpp b/Core/PythonAPI/src/Simulation.pypp.cpp
index 4a0a0b5b561ff3efd20fe0149a6807c07dfa9fc4..2162615cf1b3cedd5b72ff79461d735b6f8d7916 100644
--- a/Core/PythonAPI/src/Simulation.pypp.cpp
+++ b/Core/PythonAPI/src/Simulation.pypp.cpp
@@ -28,11 +28,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual ::Simulation * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->Simulation::clone( );
- }
}
+
::Simulation * default_clone( ) const {
return Simulation::clone( );
}
@@ -40,11 +40,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual bool areParametersChanged( ) {
if( bp::override func_areParametersChanged = this->get_override( "areParametersChanged" ) )
return func_areParametersChanged( );
- else{
+ else
return this->IParameterized::areParametersChanged( );
- }
}
+
bool default_areParametersChanged( ) {
return IParameterized::areParametersChanged( );
}
@@ -52,11 +52,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void clearParameterPool( ) {
if( bp::override func_clearParameterPool = this->get_override( "clearParameterPool" ) )
func_clearParameterPool( );
- else{
+ else
this->IParameterized::clearParameterPool( );
- }
}
+
void default_clearParameterPool( ) {
IParameterized::clearParameterPool( );
}
@@ -64,11 +64,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual ::ParameterPool * createParameterTree( ) const {
if( bp::override func_createParameterTree = this->get_override( "createParameterTree" ) )
return func_createParameterTree( );
- else{
+ else
return this->IParameterized::createParameterTree( );
- }
}
+
::ParameterPool * default_createParameterTree( ) const {
return IParameterized::createParameterTree( );
}
@@ -76,11 +76,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void printParameters( ) const {
if( bp::override func_printParameters = this->get_override( "printParameters" ) )
func_printParameters( );
- else{
+ else
this->IParameterized::printParameters( );
- }
}
+
void default_printParameters( ) const {
IParameterized::printParameters( );
}
@@ -107,11 +107,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual bool setParameterValue( ::std::string const & name, double value ) {
if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
return func_setParameterValue( name, value );
- else{
+ else
return this->IParameterized::setParameterValue( name, value );
- }
}
+
bool default_setParameterValue( ::std::string const & name, double value ) {
return IParameterized::setParameterValue( name, value );
}
@@ -119,11 +119,11 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
virtual void setParametersAreChanged( ) {
if( bp::override func_setParametersAreChanged = this->get_override( "setParametersAreChanged" ) )
func_setParametersAreChanged( );
- else{
+ else
this->IParameterized::setParametersAreChanged( );
- }
}
+
void default_setParametersAreChanged( ) {
IParameterized::setParametersAreChanged( );
}
@@ -226,7 +226,7 @@ void register_Simulation_class(){
}
{ //::Simulation::runSimulationElement
- typedef void ( ::Simulation::*runSimulationElement_function_type )( ::size_t ) ;
+ typedef void ( ::Simulation::*runSimulationElement_function_type )( ::std::size_t ) ;
Simulation_exposer.def(
"runSimulationElement"
@@ -266,7 +266,7 @@ void register_Simulation_class(){
}
{ //::Simulation::setDetectorParameters
- typedef void ( ::Simulation::*setDetectorParameters_function_type )( ::size_t,double,double,::size_t,double,double,bool ) ;
+ typedef void ( ::Simulation::*setDetectorParameters_function_type )( ::std::size_t,double,double,::std::size_t,double,double,bool ) ;
Simulation_exposer.def(
"setDetectorParameters"
@@ -333,6 +333,16 @@ void register_Simulation_class(){
, setSimulationParameters_function_type( &::Simulation::setSimulationParameters )
, ( bp::arg("sim_params") ) );
+ }
+ { //::Simulation::setThreadInfo
+
+ typedef void ( ::Simulation::*setThreadInfo_function_type )( ::ThreadInfo const & ) ;
+
+ Simulation_exposer.def(
+ "setThreadInfo"
+ , setThreadInfo_function_type( &::Simulation::setThreadInfo )
+ , ( bp::arg("thread_info") ) );
+
}
{ //::Simulation::smearIntensityFromZAxisTilting
diff --git a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
index ea0d2bcc00b58e26f953ab1f8c5b8d497e51565b..a2c2e6ca95bf639e8c92a7e2947e72283af1c1eb 100644
--- a/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGate.pypp.cpp
@@ -26,11 +26,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual ::StochasticDoubleGate * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->StochasticDoubleGate::clone( );
- }
}
+
::StochasticDoubleGate * default_clone( ) const {
return StochasticDoubleGate::clone( );
}
@@ -38,11 +38,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticDoubleGate::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticDoubleGate::getFWHM( );
}
@@ -50,11 +50,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else{
+ else
return this->StochasticDoubleGate::probabilityDensity( value );
- }
}
+
double default_probabilityDensity( double value ) const {
return StochasticDoubleGate::probabilityDensity( value );
}
@@ -62,11 +62,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else{
+ else
this->StochasticDoubleGate::setToRandom( );
- }
}
+
void default_setToRandom( ) {
StochasticDoubleGate::setToRandom( );
}
@@ -74,11 +74,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -86,11 +86,11 @@ struct StochasticDoubleGate_wrapper : StochasticDoubleGate, bp::wrapper< Stochas
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
index 820e29c3e451eda7af03306e5dd63852ca7c9913..ec0bb290500ff2041944e8335e9be278491390af 100644
--- a/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticDoubleGaussian.pypp.cpp
@@ -26,11 +26,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual ::StochasticDoubleGaussian * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->StochasticDoubleGaussian::clone( );
- }
}
+
::StochasticDoubleGaussian * default_clone( ) const {
return StochasticDoubleGaussian::clone( );
}
@@ -38,11 +38,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticDoubleGaussian::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticDoubleGaussian::getFWHM( );
}
@@ -50,11 +50,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else{
+ else
return this->StochasticDoubleGaussian::probabilityDensity( value );
- }
}
+
double default_probabilityDensity( double value ) const {
return StochasticDoubleGaussian::probabilityDensity( value );
}
@@ -62,11 +62,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else{
+ else
this->StochasticDoubleGaussian::setToRandom( );
- }
}
+
void default_setToRandom( ) {
StochasticDoubleGaussian::setToRandom( );
}
@@ -74,11 +74,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -86,11 +86,11 @@ struct StochasticDoubleGaussian_wrapper : StochasticDoubleGaussian, bp::wrapper<
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
index 1c7f4060708c9de5ed217052a0046dc0d45ae2ba..e6cd435ac44605b2a56bb0a5ef8f60d430c7f15d 100644
--- a/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticParameter_t.pypp.cpp
@@ -31,11 +31,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticParameter< double >::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticParameter< double >::getFWHM( );
}
@@ -43,11 +43,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -60,11 +60,11 @@ struct StochasticParameter_less__double__greater__wrapper : StochasticParameter<
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
diff --git a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
index 26fc062960c37ebca48c2c814e930d4a27534734..6868e315885f63e6e03aec579237a42e2dde5cfc 100644
--- a/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
+++ b/Core/PythonAPI/src/StochasticSampledParameter.pypp.cpp
@@ -16,14 +16,14 @@ namespace bp = boost::python;
struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrapper< StochasticSampledParameter > {
- StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::size_t nbins, double xmin, double xmax )
+ StochasticSampledParameter_wrapper(::StochasticParameter< double > const & par, ::std::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, ::std::size_t nbins, int nfwhm=3 )
: StochasticSampledParameter( boost::ref(par), nbins, nfwhm )
, bp::wrapper< StochasticSampledParameter >(){
// constructor
@@ -33,11 +33,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual ::StochasticSampledParameter * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->StochasticSampledParameter::clone( );
- }
}
+
::StochasticSampledParameter * default_clone( ) const {
return StochasticSampledParameter::clone( );
}
@@ -45,11 +45,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double probabilityDensity( double value ) const {
if( bp::override func_probabilityDensity = this->get_override( "probabilityDensity" ) )
return func_probabilityDensity( value );
- else{
+ else
return this->StochasticSampledParameter::probabilityDensity( value );
- }
}
+
double default_probabilityDensity( double value ) const {
return StochasticSampledParameter::probabilityDensity( value );
}
@@ -57,11 +57,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual void setToRandom( ) {
if( bp::override func_setToRandom = this->get_override( "setToRandom" ) )
func_setToRandom( );
- else{
+ else
this->StochasticSampledParameter::setToRandom( );
- }
}
+
void default_setToRandom( ) {
StochasticSampledParameter::setToRandom( );
}
@@ -69,11 +69,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double getFWHM( ) const {
if( bp::override func_getFWHM = this->get_override( "getFWHM" ) )
return func_getFWHM( );
- else{
+ else
return this->StochasticParameter< double >::getFWHM( );
- }
}
+
double default_getFWHM( ) const {
return StochasticParameter< double >::getFWHM( );
}
@@ -81,11 +81,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual double getRandom( ) {
if( bp::override func_getRandom = this->get_override( "getRandom" ) )
return func_getRandom( );
- else{
+ else
return this->StochasticParameter< double >::getRandom( );
- }
}
+
double default_getRandom( ) {
return StochasticParameter< double >::getRandom( );
}
@@ -93,11 +93,11 @@ struct StochasticSampledParameter_wrapper : StochasticSampledParameter, bp::wrap
virtual void setToAverage( ) {
if( bp::override func_setToAverage = this->get_override( "setToAverage" ) )
func_setToAverage( );
- else{
+ else
this->StochasticParameter< double >::setToAverage( );
- }
}
+
void default_setToAverage( ) {
StochasticParameter< double >::setToAverage( );
}
@@ -108,9 +108,9 @@ void register_StochasticSampledParameter_class(){
{ //::StochasticSampledParameter
typedef bp::class_< StochasticSampledParameter_wrapper, bp::bases< StochasticParameter< double > >, boost::noncopyable > StochasticSampledParameter_exposer_t;
- StochasticSampledParameter_exposer_t StochasticSampledParameter_exposer = StochasticSampledParameter_exposer_t( "StochasticSampledParameter", bp::init< StochasticParameter< double > const &, size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) );
+ StochasticSampledParameter_exposer_t StochasticSampledParameter_exposer = StochasticSampledParameter_exposer_t( "StochasticSampledParameter", bp::init< StochasticParameter< double > const &, std::size_t, double, double >(( bp::arg("par"), bp::arg("nbins"), bp::arg("xmin"), bp::arg("xmax") )) );
bp::scope StochasticSampledParameter_scope( StochasticSampledParameter_exposer );
- StochasticSampledParameter_exposer.def( bp::init< StochasticParameter< double > const &, size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) );
+ StochasticSampledParameter_exposer.def( bp::init< StochasticParameter< double > const &, std::size_t, bp::optional< int > >(( bp::arg("par"), bp::arg("nbins"), bp::arg("nfwhm")=(int)(3) )) );
{ //::StochasticSampledParameter::clone
typedef ::StochasticSampledParameter * ( ::StochasticSampledParameter::*clone_function_type )( ) const;
@@ -125,7 +125,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getBinValue
- typedef double ( ::StochasticSampledParameter::*getBinValue_function_type )( ::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*getBinValue_function_type )( ::std::size_t ) const;
StochasticSampledParameter_exposer.def(
"getBinValue"
@@ -135,7 +135,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getNbins
- typedef ::size_t ( ::StochasticSampledParameter::*getNbins_function_type )( ) const;
+ typedef ::std::size_t ( ::StochasticSampledParameter::*getNbins_function_type )( ) const;
StochasticSampledParameter_exposer.def(
"getNbins"
@@ -144,7 +144,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::getNormalizedProbability
- typedef double ( ::StochasticSampledParameter::*getNormalizedProbability_function_type )( ::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*getNormalizedProbability_function_type )( ::std::size_t ) const;
StochasticSampledParameter_exposer.def(
"getNormalizedProbability"
@@ -154,7 +154,7 @@ void register_StochasticSampledParameter_class(){
}
{ //::StochasticSampledParameter::probabilityBinDensity
- typedef double ( ::StochasticSampledParameter::*probabilityBinDensity_function_type )( ::size_t ) const;
+ typedef double ( ::StochasticSampledParameter::*probabilityBinDensity_function_type )( ::std::size_t ) const;
StochasticSampledParameter_exposer.def(
"probabilityBinDensity"
diff --git a/Core/PythonAPI/src/ndimdata_t.pypp.cpp b/Core/PythonAPI/src/ndimdata_t.pypp.cpp
index 2553ec6532b3ed04b86e96555a9e1504ea4820eb..15fcfc77c13c6ae1be9462dbbadc497093db8395 100644
--- a/Core/PythonAPI/src/ndimdata_t.pypp.cpp
+++ b/Core/PythonAPI/src/ndimdata_t.pypp.cpp
@@ -34,7 +34,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::addAxis
typedef OutputData< double > exported_class_t;
- typedef void ( exported_class_t::*addAxis_function_type )( ::std::string const &,::size_t,double,double ) ;
+ typedef void ( exported_class_t::*addAxis_function_type )( ::std::string const &,::std::size_t,double,double ) ;
ndimdata_t_exposer.def(
"addAxis"
@@ -87,7 +87,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::getAllocatedSize
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getAllocatedSize_function_type )( ) const;
+ typedef ::std::size_t ( exported_class_t::*getAllocatedSize_function_type )( ) const;
ndimdata_t_exposer.def(
"getAllocatedSize"
@@ -97,7 +97,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::getAxis
typedef OutputData< double > exported_class_t;
- typedef ::IAxis const * ( exported_class_t::*getAxis_function_type )( ::size_t ) const;
+ typedef ::IAxis const * ( exported_class_t::*getAxis_function_type )( ::std::size_t ) const;
ndimdata_t_exposer.def(
"getAxis"
@@ -121,7 +121,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::getAxisIndex
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getAxisIndex_function_type )( ::std::string const & ) const;
+ typedef ::std::size_t ( exported_class_t::*getAxisIndex_function_type )( ::std::string const & ) const;
ndimdata_t_exposer.def(
"getAxisIndex"
@@ -132,7 +132,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::getIndexOfAxis
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getIndexOfAxis_function_type )( ::std::string const &,::size_t ) const;
+ typedef ::std::size_t ( exported_class_t::*getIndexOfAxis_function_type )( ::std::string const &,::std::size_t ) const;
ndimdata_t_exposer.def(
"getIndexOfAxis"
@@ -143,7 +143,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::getRank
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*getRank_function_type )( ) const;
+ typedef ::std::size_t ( exported_class_t::*getRank_function_type )( ) const;
ndimdata_t_exposer.def(
"getRank"
@@ -163,7 +163,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::getValueOfAxis
typedef OutputData< double > exported_class_t;
- typedef double ( exported_class_t::*getValueOfAxis_function_type )( ::std::string const &,::size_t ) const;
+ typedef double ( exported_class_t::*getValueOfAxis_function_type )( ::std::string const &,::std::size_t ) const;
ndimdata_t_exposer.def(
"getValueOfAxis"
@@ -200,7 +200,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::operator[]
typedef OutputData< double > exported_class_t;
- typedef double & ( exported_class_t::*__getitem___function_type )( ::size_t ) ;
+ typedef double & ( exported_class_t::*__getitem___function_type )( ::std::size_t ) ;
ndimdata_t_exposer.def(
"__getitem__"
@@ -212,7 +212,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::operator[]
typedef OutputData< double > exported_class_t;
- typedef double const & ( exported_class_t::*__getitem___function_type )( ::size_t ) const;
+ typedef double const & ( exported_class_t::*__getitem___function_type )( ::std::size_t ) const;
ndimdata_t_exposer.def(
"__getitem__"
@@ -267,7 +267,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::toCoordinate
typedef OutputData< double > exported_class_t;
- typedef int ( exported_class_t::*toCoordinate_function_type )( ::size_t,::size_t ) const;
+ typedef int ( exported_class_t::*toCoordinate_function_type )( ::std::size_t,::std::size_t ) const;
ndimdata_t_exposer.def(
"toCoordinate"
@@ -278,7 +278,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::toCoordinates
typedef OutputData< double > exported_class_t;
- typedef ::std::vector< int > ( exported_class_t::*toCoordinates_function_type )( ::size_t ) const;
+ typedef ::std::vector< int > ( exported_class_t::*toCoordinates_function_type )( ::std::size_t ) const;
ndimdata_t_exposer.def(
"toCoordinates"
@@ -289,7 +289,7 @@ void register_ndimdata_t_class(){
{ //::OutputData< double >::toIndex
typedef OutputData< double > exported_class_t;
- typedef ::size_t ( exported_class_t::*toIndex_function_type )( ::std::vector< int > ) const;
+ typedef ::std::size_t ( exported_class_t::*toIndex_function_type )( ::std::vector< int > ) const;
ndimdata_t_exposer.def(
"toIndex"
diff --git a/Core/Samples/inc/Layer.h b/Core/Samples/inc/Layer.h
index 7c0180a8829712793d71e93d680c7f605718404e..767e6792426c0f85466d9a1a9beec086b2547c2e 100644
--- a/Core/Samples/inc/Layer.h
+++ b/Core/Samples/inc/Layer.h
@@ -16,13 +16,13 @@
#ifndef LAYER_H
#define LAYER_H
-#include "WinDllMacros.h"
+#include "DiffuseDWBASimulation.h"
+#include "HomogeneousMaterial.h"
#include "ICompositeSample.h"
#include "IMaterial.h"
-#include "HomogeneousMaterial.h"
#include "LayerDWBASimulation.h"
#include "ParticleDecoration.h"
-#include "LayerDecoratorDWBASimulation.h"
+#include "WinDllMacros.h"
//! A Layer with thickness and pointer to the material
@@ -32,8 +32,9 @@ class BA_CORE_API_ Layer : public ICompositeSample
//! Constructs empty layer.
Layer();
- //! Constructs layer made of _material_ with _thickness_ in nanometers.
- Layer(const IMaterial* material, double thickness=0);
+ //! Constructs layer made of _material_ with _thickness_ in nanometers and decoration
+ Layer(const IMaterial* material, double thickness=0, IDecoration *decoration=0);
+ Layer(const IMaterial* material, double thickness, const IDecoration &decoration);
virtual ~Layer();
@@ -61,8 +62,8 @@ class BA_CORE_API_ Layer : public ICompositeSample
virtual complex_t getRefractiveIndex() const;
//! sets particle decoration
- void setDecoration(IDecoration *decoration) { delete mp_decoration; mp_decoration = decoration; }
- void setDecoration(const IDecoration &decoration) { delete mp_decoration; mp_decoration = decoration.clone(); }
+ void setDecoration(IDecoration *decoration);
+ void setDecoration(const IDecoration &decoration);
//! returns particle decoration
const IDecoration* getDecoration() const { return mp_decoration; }
@@ -85,8 +86,8 @@ class BA_CORE_API_ Layer : public ICompositeSample
void print(std::ostream& ostr) const;
const IMaterial* mp_material; //!< pointer to the material
- IDecoration *mp_decoration; //!< particle decoration
double m_thickness; //!< layer thickness in nanometers
+ IDecoration *mp_decoration; //!< particle decoration
};
diff --git a/Core/Samples/src/Layer.cpp b/Core/Samples/src/Layer.cpp
index 97951050d2d2c7662ff43107bee1f4166cdf1101..fbfd18f2af67458db0a5fe08a2329508a5f5aa57 100644
--- a/Core/Samples/src/Layer.cpp
+++ b/Core/Samples/src/Layer.cpp
@@ -15,34 +15,50 @@
#include "Layer.h"
#include "Exceptions.h"
+#include "DecoratedLayerDWBASimulation.h"
+
#include <iomanip>
Layer::Layer()
: mp_material(0)
- , mp_decoration(0)
, m_thickness(0)
+ , mp_decoration(0)
{
setName("Layer");
init_parameters();
}
-Layer::Layer(const IMaterial* material, double thickness)
- : mp_decoration(0)
- , m_thickness(thickness)
+Layer::Layer(const IMaterial* material, double thickness, IDecoration *decoration)
+ : m_thickness(thickness)
+ , mp_decoration(0)
{
setName("Layer");
+ setDecoration(decoration);
setMaterial(material);
init_parameters();
}
+Layer::Layer(const IMaterial* material, double thickness, const IDecoration &decoration)
+ : m_thickness(thickness)
+ , mp_decoration(0)
+{
+ setName("Layer");
+ setDecoration(decoration);
+ setMaterial(material);
+ init_parameters();
+}
+
+
Layer::Layer(const Layer& other) : ICompositeSample()
{
mp_material = other.mp_material;
mp_decoration = 0;
- if(other.getDecoration()) mp_decoration = other.getDecoration()->clone();
+ if(other.getDecoration()) {
+ setDecoration(other.getDecoration()->clone());
+ }
m_thickness = other.m_thickness;
setName(other.getName());
init_parameters();
@@ -87,6 +103,25 @@ void Layer::setMaterial(const IMaterial* material, double thickness)
}
+
+void Layer::setDecoration(IDecoration *decoration)
+{
+ if( !decoration ) return;
+
+ if(mp_decoration) {
+ deregisterChild(mp_decoration);
+ delete mp_decoration;
+ }
+ mp_decoration = decoration;
+ registerChild(mp_decoration);
+}
+
+void Layer::setDecoration(const IDecoration &decoration)
+{
+ setDecoration(decoration.clone());
+}
+
+
//! Prints description.
void Layer::print(std::ostream& ostr) const
{
@@ -98,7 +133,7 @@ void Layer::print(std::ostream& ostr) const
LayerDWBASimulation *Layer::createDWBASimulation() const
{
if(mp_decoration) {
- return new LayerDecoratorDWBASimulation(this);
+ return new DecoratedLayerDWBASimulation(this);
}
return 0;
}
@@ -106,6 +141,8 @@ LayerDWBASimulation *Layer::createDWBASimulation() const
DiffuseDWBASimulation* Layer::createDiffuseDWBASimulation() const
{
+ if(!mp_decoration) return 0;
+
DiffuseDWBASimulation *p_sim = new DiffuseDWBASimulation;
size_t nbr_particles = mp_decoration->getNumberOfParticles();
double particle_density = mp_decoration->getTotalParticleSurfaceDensity();
diff --git a/Core/python_module.pri b/Core/python_module.pri
index 642092941e6a992a64d59701c8089d594b6243e0..cf37fe889d35b978fda134024cd45698a89b3003 100644
--- a/Core/python_module.pri
+++ b/Core/python_module.pri
@@ -4,92 +4,91 @@ HEADERS += \
PythonAPI/inc/PythonOutputData.h \
PythonAPI/inc/PythonCoreExposer.h \
PythonAPI/inc/PythonCoreList.h \
- PythonAPI/inc/Beam.pypp.h \
- PythonAPI/inc/Bin1D.pypp.h \
- PythonAPI/inc/Bin1DCVector.pypp.h \
- PythonAPI/inc/Crystal.pypp.h \
- PythonAPI/inc/cvector_t.pypp.h \
+ PythonAPI/inc/RotateZ_3D.pypp.h \
+ PythonAPI/inc/IFTDistribution2D.pypp.h \
PythonAPI/inc/Detector.pypp.h \
- PythonAPI/inc/FormFactorBox.pypp.h \
- PythonAPI/inc/FormFactorCone.pypp.h \
- PythonAPI/inc/FormFactorCrystal.pypp.h \
+ PythonAPI/inc/LatticeBasis.pypp.h \
+ PythonAPI/inc/ParticleCoreShell.pypp.h \
+ PythonAPI/inc/Beam.pypp.h \
+ PythonAPI/inc/Lattice.pypp.h \
PythonAPI/inc/FormFactorCylinder.pypp.h \
- PythonAPI/inc/FormFactorDecoratorDebyeWaller.pypp.h \
- PythonAPI/inc/FormFactorEllipsoid.pypp.h \
- PythonAPI/inc/FormFactorFullSphere.pypp.h \
- PythonAPI/inc/FormFactorFullSpheroid.pypp.h \
- PythonAPI/inc/FormFactorGauss.pypp.h \
- PythonAPI/inc/FormFactorHemiSpheroid.pypp.h \
- PythonAPI/inc/FormFactorLorentz.pypp.h \
+ PythonAPI/inc/ICloneable.pypp.h \
+ PythonAPI/inc/StochasticSampledParameter.pypp.h \
+ PythonAPI/inc/HomogeneousMaterial.pypp.h \
+ PythonAPI/inc/vector_integer_t.pypp.h \
+ PythonAPI/inc/IAxis.pypp.h \
+ PythonAPI/inc/Layer.pypp.h \
+ PythonAPI/inc/IFormFactor.pypp.h \
PythonAPI/inc/FormFactorParallelepiped.pypp.h \
- PythonAPI/inc/FormFactorPrism3.pypp.h \
+ PythonAPI/inc/RealParameterWrapper.pypp.h \
+ PythonAPI/inc/MaterialManager.pypp.h \
+ PythonAPI/inc/ResolutionFunction2DSimple.pypp.h \
+ PythonAPI/inc/SimulationParameters.pypp.h \
+ PythonAPI/inc/FormFactorGauss.pypp.h \
+ PythonAPI/inc/FormFactorFullSpheroid.pypp.h \
+ PythonAPI/inc/PythonInterface_global_variables.pypp.h \
+ PythonAPI/inc/ISampleBuilder.pypp.h \
+ PythonAPI/inc/StochasticParameter_t.pypp.h \
+ PythonAPI/inc/StochasticDoubleGaussian.pypp.h \
PythonAPI/inc/FormFactorPrism6.pypp.h \
+ PythonAPI/inc/InterferenceFunction2DLattice.pypp.h \
PythonAPI/inc/FormFactorPyramid.pypp.h \
- PythonAPI/inc/FormFactorSphere.pypp.h \
- PythonAPI/inc/FormFactorSphereGaussianRadius.pypp.h \
+ PythonAPI/inc/FormFactorBox.pypp.h \
+ PythonAPI/inc/IResolutionFunction2D.pypp.h \
+ PythonAPI/inc/IFormFactorBorn.pypp.h \
+ PythonAPI/inc/MultiLayer.pypp.h \
+ PythonAPI/inc/ITransform3D.pypp.h \
+ PythonAPI/inc/ParticleDecoration.pypp.h \
+ PythonAPI/inc/IDecoration.pypp.h \
PythonAPI/inc/FTDistribution2DCauchy.pypp.h \
- PythonAPI/inc/HomogeneousMaterial.pypp.h \
- PythonAPI/inc/IAxis.pypp.h \
- PythonAPI/inc/ICloneable.pypp.h \
- PythonAPI/inc/IClusteredParticles.pypp.h \
PythonAPI/inc/ICompositeSample.pypp.h \
- PythonAPI/inc/IDecoration.pypp.h \
- PythonAPI/inc/IDetectorResolution.pypp.h \
- PythonAPI/inc/IFormFactor.pypp.h \
- PythonAPI/inc/IFormFactorBorn.pypp.h \
- PythonAPI/inc/IFormFactorDecorator.pypp.h \
- PythonAPI/inc/IFTDistribution2D.pypp.h \
- PythonAPI/inc/IInterferenceFunction.pypp.h \
+ PythonAPI/inc/cvector_t.pypp.h \
+ PythonAPI/inc/ParameterPool.pypp.h \
+ PythonAPI/inc/Particle.pypp.h \
+ PythonAPI/inc/FormFactorCone.pypp.h \
+ PythonAPI/inc/FormFactorPrism3.pypp.h \
+ PythonAPI/inc/InterferenceFunction2DParaCrystal.pypp.h \
+ PythonAPI/inc/vdouble1d_t.pypp.h \
+ PythonAPI/inc/MesoCrystal.pypp.h \
+ PythonAPI/inc/RotateY_3D.pypp.h \
+ PythonAPI/inc/FormFactorDecoratorDebyeWaller.pypp.h \
+ PythonAPI/inc/vector_IFormFactorPtr_t.pypp.h \
PythonAPI/inc/IMaterial.pypp.h \
+ PythonAPI/inc/IFormFactorDecorator.pypp.h \
PythonAPI/inc/Instrument.pypp.h \
- PythonAPI/inc/InterferenceFunction1DParaCrystal.pypp.h \
- PythonAPI/inc/InterferenceFunction2DLattice.pypp.h \
- PythonAPI/inc/InterferenceFunction2DParaCrystal.pypp.h \
- PythonAPI/inc/InterferenceFunctionNone.pypp.h \
- PythonAPI/inc/IParameterized.pypp.h \
- PythonAPI/inc/IResolutionFunction2D.pypp.h \
- PythonAPI/inc/ISample.pypp.h \
- PythonAPI/inc/ISampleBuilder.pypp.h \
+ PythonAPI/inc/IDetectorResolution.pypp.h \
PythonAPI/inc/ISelectionRule.pypp.h \
- PythonAPI/inc/ITransform3D.pypp.h \
- PythonAPI/inc/kvector_t.pypp.h \
- PythonAPI/inc/Lattice.pypp.h \
- PythonAPI/inc/Lattice2DIFParameters.pypp.h \
- PythonAPI/inc/LatticeBasis.pypp.h \
- PythonAPI/inc/Layer.pypp.h \
- PythonAPI/inc/LayerDecorator.pypp.h \
+ PythonAPI/inc/Bin1D.pypp.h \
+ PythonAPI/inc/ParticleInfo.pypp.h \
+ PythonAPI/inc/vector_longinteger_t.pypp.h \
+ PythonAPI/inc/FormFactorHemiSpheroid.pypp.h \
PythonAPI/inc/LayerInterface.pypp.h \
+ PythonAPI/inc/FormFactorFullSphere.pypp.h \
+ PythonAPI/inc/PositionParticleInfo.pypp.h \
PythonAPI/inc/LayerRoughness.pypp.h \
- PythonAPI/inc/MaterialManager.pypp.h \
- PythonAPI/inc/MesoCrystal.pypp.h \
- PythonAPI/inc/MultiLayer.pypp.h \
+ PythonAPI/inc/FormFactorCrystal.pypp.h \
+ PythonAPI/inc/IParameterized.pypp.h \
+ PythonAPI/inc/Bin1DCVector.pypp.h \
+ PythonAPI/inc/StochasticDoubleGate.pypp.h \
+ PythonAPI/inc/IClusteredParticles.pypp.h \
+ PythonAPI/inc/IInterferenceFunction.pypp.h \
+ PythonAPI/inc/SimpleSelectionRule.pypp.h \
PythonAPI/inc/ndimdata_t.pypp.h \
+ PythonAPI/inc/FormFactorLorentz.pypp.h \
PythonAPI/inc/OutputDataIOFactory.pypp.h \
- PythonAPI/inc/ParameterPool.pypp.h \
- PythonAPI/inc/Particle.pypp.h \
- PythonAPI/inc/ParticleBuilder.pypp.h \
- PythonAPI/inc/ParticleCoreShell.pypp.h \
- PythonAPI/inc/ParticleDecoration.pypp.h \
- PythonAPI/inc/ParticleInfo.pypp.h \
- PythonAPI/inc/PositionParticleInfo.pypp.h \
+ PythonAPI/inc/vector_kvector_t.pypp.h \
+ PythonAPI/inc/InterferenceFunction1DParaCrystal.pypp.h \
+ PythonAPI/inc/InterferenceFunctionNone.pypp.h \
+ PythonAPI/inc/Crystal.pypp.h \
PythonAPI/inc/PythonInterface_free_functions.pypp.h \
- PythonAPI/inc/PythonInterface_global_variables.pypp.h \
- PythonAPI/inc/RealParameterWrapper.pypp.h \
- PythonAPI/inc/ResolutionFunction2DSimple.pypp.h \
- PythonAPI/inc/RotateY_3D.pypp.h \
- PythonAPI/inc/RotateZ_3D.pypp.h \
- PythonAPI/inc/SimpleSelectionRule.pypp.h \
+ PythonAPI/inc/kvector_t.pypp.h \
+ PythonAPI/inc/FormFactorEllipsoid.pypp.h \
PythonAPI/inc/Simulation.pypp.h \
- PythonAPI/inc/SimulationParameters.pypp.h \
- PythonAPI/inc/StochasticDoubleGate.pypp.h \
- PythonAPI/inc/StochasticDoubleGaussian.pypp.h \
- PythonAPI/inc/StochasticParameter_t.pypp.h \
- PythonAPI/inc/StochasticSampledParameter.pypp.h \
- PythonAPI/inc/vdouble1d_t.pypp.h \
- PythonAPI/inc/vector_IFormFactorPtr_t.pypp.h \
- PythonAPI/inc/vector_integer_t.pypp.h \
- PythonAPI/inc/vector_kvector_t.pypp.h \
- PythonAPI/inc/vector_longinteger_t.pypp.h \
+ PythonAPI/inc/ISample.pypp.h \
+ PythonAPI/inc/ParticleBuilder.pypp.h \
+ PythonAPI/inc/FormFactorSphereGaussianRadius.pypp.h \
+ PythonAPI/inc/Lattice2DIFParameters.pypp.h \
+ PythonAPI/inc/FormFactorSphere.pypp.h \
PythonAPI/inc/__call_policies.pypp.hpp \
PythonAPI/inc/__convenience.pypp.hpp
@@ -98,92 +97,91 @@ SOURCES += \
PythonAPI/src/PythonListConverter.cpp \
PythonAPI/src/PythonOutputData.cpp \
PythonAPI/src/PythonCoreExposer.cpp \
- PythonAPI/src/Beam.pypp.cpp \
- PythonAPI/src/Bin1D.pypp.cpp \
- PythonAPI/src/Bin1DCVector.pypp.cpp \
- PythonAPI/src/Crystal.pypp.cpp \
- PythonAPI/src/cvector_t.pypp.cpp \
- PythonAPI/src/Detector.pypp.cpp \
- PythonAPI/src/FormFactorBox.pypp.cpp \
- PythonAPI/src/FormFactorCone.pypp.cpp \
- PythonAPI/src/FormFactorCrystal.pypp.cpp \
- PythonAPI/src/FormFactorCylinder.pypp.cpp \
- PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp \
- PythonAPI/src/FormFactorEllipsoid.pypp.cpp \
- PythonAPI/src/FormFactorFullSphere.pypp.cpp \
- PythonAPI/src/FormFactorFullSpheroid.pypp.cpp \
- PythonAPI/src/FormFactorGauss.pypp.cpp \
- PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp \
+ PythonAPI/src/ParticleCoreShell.pypp.cpp \
+ PythonAPI/src/kvector_t.pypp.cpp \
+ PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp \
+ PythonAPI/src/FormFactorSphere.pypp.cpp \
PythonAPI/src/FormFactorLorentz.pypp.cpp \
+ PythonAPI/src/FormFactorCylinder.pypp.cpp \
+ PythonAPI/src/ISelectionRule.pypp.cpp \
+ PythonAPI/src/InterferenceFunctionNone.pypp.cpp \
+ PythonAPI/src/IResolutionFunction2D.pypp.cpp \
+ PythonAPI/src/ITransform3D.pypp.cpp \
+ PythonAPI/src/Layer.pypp.cpp \
+ PythonAPI/src/Lattice2DIFParameters.pypp.cpp \
PythonAPI/src/FormFactorParallelepiped.pypp.cpp \
- PythonAPI/src/FormFactorPrism3.pypp.cpp \
+ PythonAPI/src/ISample.pypp.cpp \
+ PythonAPI/src/MultiLayer.pypp.cpp \
PythonAPI/src/FormFactorPrism6.pypp.cpp \
PythonAPI/src/FormFactorPyramid.pypp.cpp \
- PythonAPI/src/FormFactorSphere.pypp.cpp \
- PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp \
- PythonAPI/src/FTDistribution2DCauchy.pypp.cpp \
- PythonAPI/src/HomogeneousMaterial.pypp.cpp \
PythonAPI/src/IAxis.pypp.cpp \
- PythonAPI/src/ICloneable.pypp.cpp \
- PythonAPI/src/IClusteredParticles.pypp.cpp \
- PythonAPI/src/ICompositeSample.pypp.cpp \
- PythonAPI/src/IDecoration.pypp.cpp \
- PythonAPI/src/IDetectorResolution.pypp.cpp \
- PythonAPI/src/IFormFactor.pypp.cpp \
- PythonAPI/src/IFormFactorBorn.pypp.cpp \
+ PythonAPI/src/vdouble1d_t.pypp.cpp \
PythonAPI/src/IFormFactorDecorator.pypp.cpp \
- PythonAPI/src/IFTDistribution2D.pypp.cpp \
- PythonAPI/src/IInterferenceFunction.pypp.cpp \
- PythonAPI/src/IMaterial.pypp.cpp \
- PythonAPI/src/Instrument.pypp.cpp \
- PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp \
- PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp \
- PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp \
- PythonAPI/src/InterferenceFunctionNone.pypp.cpp \
+ PythonAPI/src/Bin1D.pypp.cpp \
PythonAPI/src/IParameterized.pypp.cpp \
- PythonAPI/src/IResolutionFunction2D.pypp.cpp \
- PythonAPI/src/ISample.pypp.cpp \
+ PythonAPI/src/PythonInterface_global_variables.pypp.cpp \
+ PythonAPI/src/IInterferenceFunction.pypp.cpp \
+ PythonAPI/src/RealParameterWrapper.pypp.cpp \
+ PythonAPI/src/PythonInterface_free_functions.pypp.cpp \
+ PythonAPI/src/MesoCrystal.pypp.cpp \
+ PythonAPI/src/FormFactorCrystal.pypp.cpp \
PythonAPI/src/ISampleBuilder.pypp.cpp \
- PythonAPI/src/ISelectionRule.pypp.cpp \
- PythonAPI/src/ITransform3D.pypp.cpp \
- PythonAPI/src/kvector_t.pypp.cpp \
+ PythonAPI/src/StochasticSampledParameter.pypp.cpp \
+ PythonAPI/src/FormFactorFullSphere.pypp.cpp \
+ PythonAPI/src/StochasticParameter_t.pypp.cpp \
+ PythonAPI/src/SimpleSelectionRule.pypp.cpp \
+ PythonAPI/src/IDecoration.pypp.cpp \
+ PythonAPI/src/FTDistribution2DCauchy.pypp.cpp \
+ PythonAPI/src/IFTDistribution2D.pypp.cpp \
+ PythonAPI/src/ICloneable.pypp.cpp \
+ PythonAPI/src/ParticleInfo.pypp.cpp \
+ PythonAPI/src/ParticleDecoration.pypp.cpp \
+ PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp \
+ PythonAPI/src/IClusteredParticles.pypp.cpp \
+ PythonAPI/src/Particle.pypp.cpp \
PythonAPI/src/Lattice.pypp.cpp \
- PythonAPI/src/Lattice2DIFParameters.pypp.cpp \
- PythonAPI/src/LatticeBasis.pypp.cpp \
- PythonAPI/src/Layer.pypp.cpp \
- PythonAPI/src/LayerDecorator.pypp.cpp \
- PythonAPI/src/LayerInterface.pypp.cpp \
- PythonAPI/src/LayerRoughness.pypp.cpp \
- PythonAPI/src/MaterialManager.pypp.cpp \
- PythonAPI/src/MesoCrystal.pypp.cpp \
- PythonAPI/src/MultiLayer.pypp.cpp \
- PythonAPI/src/ndimdata_t.pypp.cpp \
+ PythonAPI/src/vector_longinteger_t.pypp.cpp \
+ PythonAPI/src/IMaterial.pypp.cpp \
+ PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp \
+ PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp \
+ PythonAPI/src/Detector.pypp.cpp \
+ PythonAPI/src/Bin1DCVector.pypp.cpp \
+ PythonAPI/src/HomogeneousMaterial.pypp.cpp \
+ PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp \
+ PythonAPI/src/vector_integer_t.pypp.cpp \
PythonAPI/src/OutputDataIOFactory.pypp.cpp \
PythonAPI/src/ParameterPool.pypp.cpp \
- PythonAPI/src/Particle.pypp.cpp \
+ PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp \
+ PythonAPI/src/FormFactorCone.pypp.cpp \
+ PythonAPI/src/Simulation.pypp.cpp \
+ PythonAPI/src/FormFactorFullSpheroid.pypp.cpp \
+ PythonAPI/src/MaterialManager.pypp.cpp \
PythonAPI/src/ParticleBuilder.pypp.cpp \
- PythonAPI/src/ParticleCoreShell.pypp.cpp \
- PythonAPI/src/ParticleDecoration.pypp.cpp \
- PythonAPI/src/ParticleInfo.pypp.cpp \
+ PythonAPI/src/Instrument.pypp.cpp \
+ PythonAPI/src/FormFactorGauss.pypp.cpp \
+ PythonAPI/src/FormFactorPrism3.pypp.cpp \
PythonAPI/src/PositionParticleInfo.pypp.cpp \
- PythonAPI/src/PythonInterface_free_functions.pypp.cpp \
- PythonAPI/src/PythonInterface_global_variables.pypp.cpp \
- PythonAPI/src/RealParameterWrapper.pypp.cpp \
- PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp \
- PythonAPI/src/RotateY_3D.pypp.cpp \
+ PythonAPI/src/ICompositeSample.pypp.cpp \
+ PythonAPI/src/ndimdata_t.pypp.cpp \
+ PythonAPI/src/Beam.pypp.cpp \
+ PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp \
+ PythonAPI/src/IFormFactor.pypp.cpp \
+ PythonAPI/src/FormFactorBox.pypp.cpp \
+ PythonAPI/src/IDetectorResolution.pypp.cpp \
PythonAPI/src/RotateZ_3D.pypp.cpp \
- PythonAPI/src/SimpleSelectionRule.pypp.cpp \
- PythonAPI/src/Simulation.pypp.cpp \
- PythonAPI/src/SimulationParameters.pypp.cpp \
+ PythonAPI/src/LayerInterface.pypp.cpp \
+ PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp \
+ PythonAPI/src/RotateY_3D.pypp.cpp \
PythonAPI/src/StochasticDoubleGate.pypp.cpp \
- PythonAPI/src/StochasticDoubleGaussian.pypp.cpp \
- PythonAPI/src/StochasticParameter_t.pypp.cpp \
- PythonAPI/src/StochasticSampledParameter.pypp.cpp \
- PythonAPI/src/vdouble1d_t.pypp.cpp \
- PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp \
- PythonAPI/src/vector_integer_t.pypp.cpp \
+ PythonAPI/src/cvector_t.pypp.cpp \
+ PythonAPI/src/SimulationParameters.pypp.cpp \
+ PythonAPI/src/IFormFactorBorn.pypp.cpp \
PythonAPI/src/vector_kvector_t.pypp.cpp \
- PythonAPI/src/vector_longinteger_t.pypp.cpp
+ PythonAPI/src/FormFactorEllipsoid.pypp.cpp \
+ PythonAPI/src/LayerRoughness.pypp.cpp \
+ PythonAPI/src/LatticeBasis.pypp.cpp \
+ PythonAPI/src/StochasticDoubleGaussian.pypp.cpp \
+ PythonAPI/src/Crystal.pypp.cpp
INCLUDEPATH += ./PythonAPI/inc
DEPENDPATH += ./PythonAPI/inc
diff --git a/Examples/python/ex001_CylindersAndPrisms/CylindersAndPrisms.py b/Examples/python/ex001_CylindersAndPrisms/CylindersAndPrisms.py
index 48c574c10eca8b8fe5a1e0e0064bfc24ed8ef164..3dc904bc4fd5bf616bdde9b14e8d79cafefb3d01 100644
--- a/Examples/python/ex001_CylindersAndPrisms/CylindersAndPrisms.py
+++ b/Examples/python/ex001_CylindersAndPrisms/CylindersAndPrisms.py
@@ -31,10 +31,10 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
# air layer with particles and substrate form multi layer
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Examples/python/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py b/Examples/python/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py
index abc5e19adff66173523c82cd11cd8268cb12855e..8f4000f5da0004c20ba60c0744c063327c62d171 100644
--- a/Examples/python/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py
+++ b/Examples/python/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py
@@ -50,10 +50,12 @@ def RunSimulation():
interference = InterferenceFunctionNone()
particle_decoration.addInterferenceFunction(interference)
#making layer holding all whose nano particles
+
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBA.py b/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBA.py
index ae428e74d3eac6bc9beb10c3a9f3d1032e039a8e..5f323babfb4add4aa4f5370e072d54bd2e126a5c 100644
--- a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBA.py
+++ b/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBA.py
@@ -29,10 +29,11 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py b/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py
index b463f34d90380e20f088b459cacc88ed6ca50b34..8f09efd5d78bc47a663e5ec741f8d31f6a00461f 100644
--- a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py
+++ b/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py
@@ -42,8 +42,8 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
- multi_layer.addLayer(air_layer_decorator)
+ air_layer.setDecoration(particle_decoration)
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py b/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py
index 51213dca37841a4aa890de3fe8f15bac8986e20c..b9820a6b1171967a814ea7c765e3ed8a82f6e8ef 100644
--- a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py
+++ b/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py
@@ -30,11 +30,12 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
# air layer with particles and substrate form multi layer
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py b/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py
index 9a323852f71b6ba3d126264a3ac00b924fcef77b..fb13f47931ad32ef9f1996edf80acdb8d280bfce 100644
--- a/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py
+++ b/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py
@@ -28,11 +28,12 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py b/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py
index 1556da88dc585170f761679a0c125502a4ee27f0..2cab1a776f25577e063a62fa1d9fb8a784a937b3 100644
--- a/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py
+++ b/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py
@@ -33,11 +33,12 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder1.py b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder1.py
index 4fdbd148cac6a66a56fd789f91519f3b7849e988..dc7099565110f0e45a95b5a70c007c3c77841e48 100644
--- a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder1.py
+++ b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder1.py
@@ -44,10 +44,11 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder2.py b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder2.py
index ca000cd9547cb4ae3426112491935235eb5cc6cc..15fe033d9ac8e9b006199220c18da033ad8d1183 100644
--- a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder2.py
+++ b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder2.py
@@ -49,10 +49,11 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder3.py b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder3.py
index 4d521e8a0cbd076e4251d265168060d830300360..189df50280b97a9d0f6b473d16f216aa1f6502f7 100644
--- a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder3.py
+++ b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder3.py
@@ -44,10 +44,11 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder4.py b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder4.py
index 126bf6551e431b6f73a1676fa0c993b66ea0dd8e..baa13cad49b95a979eb52bda1fe1a0b513a35375 100644
--- a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder4.py
+++ b/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder4.py
@@ -78,10 +78,11 @@ def buildSample(xi_value):
particle_info = PositionParticleInfo( cylinder, position, 1.0)
particle_decoration.addParticleInfo(particle_info)
particle_decoration.addInterferenceFunction(p_interference_function)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+
+ air_layer.setDecoration(particle_decoration)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Examples/python/ex009_RotatedPyramids/Pyramids.py b/Examples/python/ex009_RotatedPyramids/Pyramids.py
index 8c8e1a90dbd4ff5454e6632671f9adf16abb6b45..7a1bf2494405f1cb0c1f6778cc2cee7b6b0af79e 100644
--- a/Examples/python/ex009_RotatedPyramids/Pyramids.py
+++ b/Examples/python/ex009_RotatedPyramids/Pyramids.py
@@ -28,11 +28,12 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Examples/python/ex009_RotatedPyramids/RotatedPyramids.py b/Examples/python/ex009_RotatedPyramids/RotatedPyramids.py
index 45cfccaec40d03f6ad26d13afc1622d050eae1b5..74054b5895ceb728f548289d6817a3049d583b39 100644
--- a/Examples/python/ex009_RotatedPyramids/RotatedPyramids.py
+++ b/Examples/python/ex009_RotatedPyramids/RotatedPyramids.py
@@ -32,11 +32,12 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Fit/PythonAPI/src/AttLimits.pypp.cpp b/Fit/PythonAPI/src/AttLimits.pypp.cpp
index e9ebeee424eb2c646fdbec7c49aea06ddc19540b..9faa92236e7264e872e5aa990419aca05dc8b399 100644
--- a/Fit/PythonAPI/src/AttLimits.pypp.cpp
+++ b/Fit/PythonAPI/src/AttLimits.pypp.cpp
@@ -33,11 +33,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual double getLowerLimit( ) const {
if( bp::override func_getLowerLimit = this->get_override( "getLowerLimit" ) )
return func_getLowerLimit( );
- else{
+ else
return this->AttLimits::getLowerLimit( );
- }
}
+
double default_getLowerLimit( ) const {
return AttLimits::getLowerLimit( );
}
@@ -45,11 +45,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual double getUpperLimit( ) const {
if( bp::override func_getUpperLimit = this->get_override( "getUpperLimit" ) )
return func_getUpperLimit( );
- else{
+ else
return this->AttLimits::getUpperLimit( );
- }
}
+
double default_getUpperLimit( ) const {
return AttLimits::getUpperLimit( );
}
@@ -57,11 +57,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasLowerAndUpperLimits( ) const {
if( bp::override func_hasLowerAndUpperLimits = this->get_override( "hasLowerAndUpperLimits" ) )
return func_hasLowerAndUpperLimits( );
- else{
+ else
return this->AttLimits::hasLowerAndUpperLimits( );
- }
}
+
bool default_hasLowerAndUpperLimits( ) const {
return AttLimits::hasLowerAndUpperLimits( );
}
@@ -69,11 +69,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasLowerLimit( ) const {
if( bp::override func_hasLowerLimit = this->get_override( "hasLowerLimit" ) )
return func_hasLowerLimit( );
- else{
+ else
return this->AttLimits::hasLowerLimit( );
- }
}
+
bool default_hasLowerLimit( ) const {
return AttLimits::hasLowerLimit( );
}
@@ -81,11 +81,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool hasUpperLimit( ) const {
if( bp::override func_hasUpperLimit = this->get_override( "hasUpperLimit" ) )
return func_hasUpperLimit( );
- else{
+ else
return this->AttLimits::hasUpperLimit( );
- }
}
+
bool default_hasUpperLimit( ) const {
return AttLimits::hasUpperLimit( );
}
@@ -93,11 +93,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual bool isFixed( ) const {
if( bp::override func_isFixed = this->get_override( "isFixed" ) )
return func_isFixed( );
- else{
+ else
return this->AttLimits::isFixed( );
- }
}
+
bool default_isFixed( ) const {
return AttLimits::isFixed( );
}
@@ -105,11 +105,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeLimits( ) {
if( bp::override func_removeLimits = this->get_override( "removeLimits" ) )
func_removeLimits( );
- else{
+ else
this->AttLimits::removeLimits( );
- }
}
+
void default_removeLimits( ) {
AttLimits::removeLimits( );
}
@@ -117,11 +117,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeLowerLimit( ) {
if( bp::override func_removeLowerLimit = this->get_override( "removeLowerLimit" ) )
func_removeLowerLimit( );
- else{
+ else
this->AttLimits::removeLowerLimit( );
- }
}
+
void default_removeLowerLimit( ) {
AttLimits::removeLowerLimit( );
}
@@ -129,11 +129,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void removeUpperLimit( ) {
if( bp::override func_removeUpperLimit = this->get_override( "removeUpperLimit" ) )
func_removeUpperLimit( );
- else{
+ else
this->AttLimits::removeUpperLimit( );
- }
}
+
void default_removeUpperLimit( ) {
AttLimits::removeUpperLimit( );
}
@@ -141,11 +141,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setFixed( bool is_fixed ) {
if( bp::override func_setFixed = this->get_override( "setFixed" ) )
func_setFixed( is_fixed );
- else{
+ else
this->AttLimits::setFixed( is_fixed );
- }
}
+
void default_setFixed( bool is_fixed ) {
AttLimits::setFixed( is_fixed );
}
@@ -153,11 +153,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setLimits( double xmin, double xmax ) {
if( bp::override func_setLimits = this->get_override( "setLimits" ) )
func_setLimits( xmin, xmax );
- else{
+ else
this->AttLimits::setLimits( xmin, xmax );
- }
}
+
void default_setLimits( double xmin, double xmax ) {
AttLimits::setLimits( xmin, xmax );
}
@@ -165,11 +165,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setLowerLimit( double value ) {
if( bp::override func_setLowerLimit = this->get_override( "setLowerLimit" ) )
func_setLowerLimit( value );
- else{
+ else
this->AttLimits::setLowerLimit( value );
- }
}
+
void default_setLowerLimit( double value ) {
AttLimits::setLowerLimit( value );
}
@@ -177,11 +177,11 @@ struct AttLimits_wrapper : AttLimits, bp::wrapper< AttLimits > {
virtual void setUpperLimit( double value ) {
if( bp::override func_setUpperLimit = this->get_override( "setUpperLimit" ) )
func_setUpperLimit( value );
- else{
+ else
this->AttLimits::setUpperLimit( value );
- }
}
+
void default_setUpperLimit( double value ) {
AttLimits::setUpperLimit( value );
}
diff --git a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
index 85ec4492f73bcc75250442d5e346b3def2042761..b2e416fca359015f2890a5d361248bb319b20c11 100644
--- a/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/ChiSquaredModule.pypp.cpp
@@ -33,11 +33,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual double calculateChiSquared( ) {
if( bp::override func_calculateChiSquared = this->get_override( "calculateChiSquared" ) )
return func_calculateChiSquared( );
- else{
+ else
return this->ChiSquaredModule::calculateChiSquared( );
- }
}
+
double default_calculateChiSquared( ) {
return ChiSquaredModule::calculateChiSquared( );
}
@@ -45,11 +45,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::ChiSquaredModule * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->ChiSquaredModule::clone( );
- }
}
+
::ChiSquaredModule * default_clone( ) const {
return ChiSquaredModule::clone( );
}
@@ -57,35 +57,35 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::OutputData< double > * createChi2DifferenceMap( ) const {
if( bp::override func_createChi2DifferenceMap = this->get_override( "createChi2DifferenceMap" ) )
return func_createChi2DifferenceMap( );
- else{
+ else
return this->ChiSquaredModule::createChi2DifferenceMap( );
- }
}
+
::OutputData< double > * default_createChi2DifferenceMap( ) const {
return ChiSquaredModule::createChi2DifferenceMap( );
}
- virtual double getResidualValue( ::size_t index ) const {
+ virtual double getResidualValue( ::std::size_t index ) const {
if( bp::override func_getResidualValue = this->get_override( "getResidualValue" ) )
return func_getResidualValue( index );
- else{
+ else
return this->ChiSquaredModule::getResidualValue( index );
- }
}
- double default_getResidualValue( ::size_t index ) const {
+
+ double default_getResidualValue( ::std::size_t index ) const {
return ChiSquaredModule::getResidualValue( index );
}
virtual ::IFittingDataSelector const * getFittingDataSelector( ) const {
if( bp::override func_getFittingDataSelector = this->get_override( "getFittingDataSelector" ) )
return func_getFittingDataSelector( );
- else{
+ else
return this->IChiSquaredModule::getFittingDataSelector( );
- }
}
+
::IFittingDataSelector const * default_getFittingDataSelector( ) const {
return IChiSquaredModule::getFittingDataSelector( );
}
@@ -93,11 +93,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IIntensityFunction const * getIntensityFunction( ) const {
if( bp::override func_getIntensityFunction = this->get_override( "getIntensityFunction" ) )
return func_getIntensityFunction( );
- else{
+ else
return this->IChiSquaredModule::getIntensityFunction( );
- }
}
+
::IIntensityFunction const * default_getIntensityFunction( ) const {
return IChiSquaredModule::getIntensityFunction( );
}
@@ -105,11 +105,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IOutputDataNormalizer const * getOutputDataNormalizer( ) const {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer const * default_getOutputDataNormalizer( ) const {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -117,11 +117,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual ::IOutputDataNormalizer * getOutputDataNormalizer( ) {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer * default_getOutputDataNormalizer( ) {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -129,11 +129,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
- else{
+ else
this->IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
- }
}
+
void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
@@ -141,11 +141,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
- else{
+ else
this->IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
- }
}
+
void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
@@ -153,11 +153,11 @@ struct ChiSquaredModule_wrapper : ChiSquaredModule, bp::wrapper< ChiSquaredModul
virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
- else{
+ else
this->IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
- }
}
+
void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -208,8 +208,8 @@ void register_ChiSquaredModule_class(){
}
{ //::ChiSquaredModule::getResidualValue
- typedef double ( ::ChiSquaredModule::*getResidualValue_function_type )( ::size_t ) const;
- typedef double ( ChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::size_t ) const;
+ typedef double ( ::ChiSquaredModule::*getResidualValue_function_type )( ::std::size_t ) const;
+ typedef double ( ChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::std::size_t ) const;
ChiSquaredModule_exposer.def(
"getResidualValue"
diff --git a/Fit/PythonAPI/src/FitSuite.pypp.cpp b/Fit/PythonAPI/src/FitSuite.pypp.cpp
index d7d4ba051dfa20b45e02d8e546a232e2501d3c16..15b46b56cf11d8ca2b34c5980527c8ffeb4f4db8 100644
--- a/Fit/PythonAPI/src/FitSuite.pypp.cpp
+++ b/Fit/PythonAPI/src/FitSuite.pypp.cpp
@@ -26,11 +26,11 @@ struct FitSuite_wrapper : FitSuite, bp::wrapper< FitSuite > {
virtual void runFit( ) {
if( bp::override func_runFit = this->get_override( "runFit" ) )
func_runFit( );
- else{
+ else
this->FitSuite::runFit( );
- }
}
+
void default_runFit( ) {
FitSuite::runFit( );
}
@@ -96,7 +96,7 @@ void register_FitSuite_class(){
}
{ //::FitSuite::getNCalls
- typedef ::size_t ( ::FitSuite::*getNCalls_function_type )( ) const;
+ typedef ::std::size_t ( ::FitSuite::*getNCalls_function_type )( ) const;
FitSuite_exposer.def(
"getNCalls"
diff --git a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
index 5952056df869de4fc60756008917ad0859e6a21c..2d8c14cad8db365d3eb2da910988874caa6c3c49 100644
--- a/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
+++ b/Fit/PythonAPI/src/IChiSquaredModule.pypp.cpp
@@ -41,11 +41,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IFittingDataSelector const * getFittingDataSelector( ) const {
if( bp::override func_getFittingDataSelector = this->get_override( "getFittingDataSelector" ) )
return func_getFittingDataSelector( );
- else{
+ else
return this->IChiSquaredModule::getFittingDataSelector( );
- }
}
+
::IFittingDataSelector const * default_getFittingDataSelector( ) const {
return IChiSquaredModule::getFittingDataSelector( );
}
@@ -53,11 +53,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IIntensityFunction const * getIntensityFunction( ) const {
if( bp::override func_getIntensityFunction = this->get_override( "getIntensityFunction" ) )
return func_getIntensityFunction( );
- else{
+ else
return this->IChiSquaredModule::getIntensityFunction( );
- }
}
+
::IIntensityFunction const * default_getIntensityFunction( ) const {
return IChiSquaredModule::getIntensityFunction( );
}
@@ -65,11 +65,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IOutputDataNormalizer const * getOutputDataNormalizer( ) const {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer const * default_getOutputDataNormalizer( ) const {
return IChiSquaredModule::getOutputDataNormalizer( );
}
@@ -77,35 +77,35 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual ::IOutputDataNormalizer * getOutputDataNormalizer( ) {
if( bp::override func_getOutputDataNormalizer = this->get_override( "getOutputDataNormalizer" ) )
return func_getOutputDataNormalizer( );
- else{
+ else
return this->IChiSquaredModule::getOutputDataNormalizer( );
- }
}
+
::IOutputDataNormalizer * default_getOutputDataNormalizer( ) {
return IChiSquaredModule::getOutputDataNormalizer( );
}
- virtual double getResidualValue( ::size_t arg0 ) const {
+ virtual double getResidualValue( ::std::size_t arg0 ) const {
if( bp::override func_getResidualValue = this->get_override( "getResidualValue" ) )
return func_getResidualValue( arg0 );
- else{
+ else
return this->IChiSquaredModule::getResidualValue( arg0 );
- }
}
- double default_getResidualValue( ::size_t arg0 ) const {
+
+ double default_getResidualValue( ::std::size_t arg0 ) const {
return IChiSquaredModule::getResidualValue( arg0 );
}
virtual void setFittingDataSelector( ::IFittingDataSelector const & selector ) {
if( bp::override func_setFittingDataSelector = this->get_override( "setFittingDataSelector" ) )
func_setFittingDataSelector( boost::ref(selector) );
- else{
+ else
this->IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
- }
}
+
void default_setFittingDataSelector( ::IFittingDataSelector const & selector ) {
IChiSquaredModule::setFittingDataSelector( boost::ref(selector) );
}
@@ -113,11 +113,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual void setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
if( bp::override func_setIntensityFunction = this->get_override( "setIntensityFunction" ) )
func_setIntensityFunction( boost::ref(intensity_function) );
- else{
+ else
this->IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
- }
}
+
void default_setIntensityFunction( ::IIntensityFunction const & intensity_function ) {
IChiSquaredModule::setIntensityFunction( boost::ref(intensity_function) );
}
@@ -125,11 +125,11 @@ struct IChiSquaredModule_wrapper : IChiSquaredModule, bp::wrapper< IChiSquaredMo
virtual void setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
if( bp::override func_setOutputDataNormalizer = this->get_override( "setOutputDataNormalizer" ) )
func_setOutputDataNormalizer( boost::ref(data_normalizer) );
- else{
+ else
this->IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
- }
}
+
void default_setOutputDataNormalizer( ::IOutputDataNormalizer const & data_normalizer ) {
IChiSquaredModule::setOutputDataNormalizer( boost::ref(data_normalizer) );
}
@@ -231,8 +231,8 @@ void register_IChiSquaredModule_class(){
}
{ //::IChiSquaredModule::getResidualValue
- typedef double ( ::IChiSquaredModule::*getResidualValue_function_type )( ::size_t ) const;
- typedef double ( IChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::size_t ) const;
+ typedef double ( ::IChiSquaredModule::*getResidualValue_function_type )( ::std::size_t ) const;
+ typedef double ( IChiSquaredModule_wrapper::*default_getResidualValue_function_type )( ::std::size_t ) const;
IChiSquaredModule_exposer.def(
"getResidualValue"
diff --git a/Fit/PythonAPI/src/IMinimizer.pypp.cpp b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
index d93ae8bf65b4706aed797efc8586dd2d7f9e1ee1..71eb0ec9621804aed1eee489710ed4b84f5d4e74 100644
--- a/Fit/PythonAPI/src/IMinimizer.pypp.cpp
+++ b/Fit/PythonAPI/src/IMinimizer.pypp.cpp
@@ -26,83 +26,83 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void clear( ) {
if( bp::override func_clear = this->get_override( "clear" ) )
func_clear( );
- else{
+ else
this->IMinimizer::clear( );
- }
}
+
void default_clear( ) {
IMinimizer::clear( );
}
- virtual double getErrorOfVariable( ::size_t index ) const {
+ virtual double getErrorOfVariable( ::std::size_t index ) const {
if( bp::override func_getErrorOfVariable = this->get_override( "getErrorOfVariable" ) )
return func_getErrorOfVariable( index );
- else{
+ else
return this->IMinimizer::getErrorOfVariable( index );
- }
}
- double default_getErrorOfVariable( ::size_t index ) const {
+
+ double default_getErrorOfVariable( ::std::size_t index ) const {
return IMinimizer::getErrorOfVariable( index );
}
virtual double getMinValue( ) const {
if( bp::override func_getMinValue = this->get_override( "getMinValue" ) )
return func_getMinValue( );
- else{
+ else
return this->IMinimizer::getMinValue( );
- }
}
+
double default_getMinValue( ) const {
return IMinimizer::getMinValue( );
}
- virtual ::size_t getNCalls( ) const {
+ virtual ::std::size_t getNCalls( ) const {
if( bp::override func_getNCalls = this->get_override( "getNCalls" ) )
return func_getNCalls( );
- else{
+ else
return this->IMinimizer::getNCalls( );
- }
}
- ::size_t default_getNCalls( ) const {
+
+ ::std::size_t default_getNCalls( ) const {
return IMinimizer::getNCalls( );
}
- virtual ::size_t getNumberOfVariables( ) const {
+ virtual ::std::size_t getNumberOfVariables( ) const {
if( bp::override func_getNumberOfVariables = this->get_override( "getNumberOfVariables" ) )
return func_getNumberOfVariables( );
- else{
+ else
return this->IMinimizer::getNumberOfVariables( );
- }
}
- ::size_t default_getNumberOfVariables( ) const {
+
+ ::std::size_t default_getNumberOfVariables( ) const {
return IMinimizer::getNumberOfVariables( );
}
- virtual double getValueOfVariableAtMinimum( ::size_t index ) const {
+ virtual double getValueOfVariableAtMinimum( ::std::size_t index ) const {
if( bp::override func_getValueOfVariableAtMinimum = this->get_override( "getValueOfVariableAtMinimum" ) )
return func_getValueOfVariableAtMinimum( index );
- else{
+ else
return this->IMinimizer::getValueOfVariableAtMinimum( index );
- }
}
- double default_getValueOfVariableAtMinimum( ::size_t index ) const {
+
+ double default_getValueOfVariableAtMinimum( ::std::size_t index ) const {
return IMinimizer::getValueOfVariableAtMinimum( index );
}
virtual ::std::vector< double > getValueOfVariablesAtMinimum( ) const {
if( bp::override func_getValueOfVariablesAtMinimum = this->get_override( "getValueOfVariablesAtMinimum" ) )
return func_getValueOfVariablesAtMinimum( );
- else{
+ else
return this->IMinimizer::getValueOfVariablesAtMinimum( );
- }
}
+
::std::vector< double > default_getValueOfVariablesAtMinimum( ) const {
return IMinimizer::getValueOfVariablesAtMinimum( );
}
@@ -115,11 +115,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void printResults( ) const {
if( bp::override func_printResults = this->get_override( "printResults" ) )
func_printResults( );
- else{
+ else
this->IMinimizer::printResults( );
- }
}
+
void default_printResults( ) const {
IMinimizer::printResults( );
}
@@ -127,11 +127,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setOptions( ::std::string const & options ) {
if( bp::override func_setOptions = this->get_override( "setOptions" ) )
func_setOptions( options );
- else{
+ else
this->IMinimizer::setOptions( options );
- }
}
+
void default_setOptions( ::std::string const & options ) {
IMinimizer::setOptions( options );
}
@@ -139,11 +139,11 @@ struct IMinimizer_wrapper : IMinimizer, bp::wrapper< IMinimizer > {
virtual void setParameters( ::FitSuiteParameters const & parameters ) {
if( bp::override func_setParameters = this->get_override( "setParameters" ) )
func_setParameters( boost::ref(parameters) );
- else{
+ else
this->IMinimizer::setParameters( boost::ref(parameters) );
- }
}
+
void default_setParameters( ::FitSuiteParameters const & parameters ) {
IMinimizer::setParameters( boost::ref(parameters) );
}
@@ -169,8 +169,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getErrorOfVariable
- typedef double ( ::IMinimizer::*getErrorOfVariable_function_type )( ::size_t ) const;
- typedef double ( IMinimizer_wrapper::*default_getErrorOfVariable_function_type )( ::size_t ) const;
+ typedef double ( ::IMinimizer::*getErrorOfVariable_function_type )( ::std::size_t ) const;
+ typedef double ( IMinimizer_wrapper::*default_getErrorOfVariable_function_type )( ::std::size_t ) const;
IMinimizer_exposer.def(
"getErrorOfVariable"
@@ -192,8 +192,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getNCalls
- typedef ::size_t ( ::IMinimizer::*getNCalls_function_type )( ) const;
- typedef ::size_t ( IMinimizer_wrapper::*default_getNCalls_function_type )( ) const;
+ typedef ::std::size_t ( ::IMinimizer::*getNCalls_function_type )( ) const;
+ typedef ::std::size_t ( IMinimizer_wrapper::*default_getNCalls_function_type )( ) const;
IMinimizer_exposer.def(
"getNCalls"
@@ -203,8 +203,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getNumberOfVariables
- typedef ::size_t ( ::IMinimizer::*getNumberOfVariables_function_type )( ) const;
- typedef ::size_t ( IMinimizer_wrapper::*default_getNumberOfVariables_function_type )( ) const;
+ typedef ::std::size_t ( ::IMinimizer::*getNumberOfVariables_function_type )( ) const;
+ typedef ::std::size_t ( IMinimizer_wrapper::*default_getNumberOfVariables_function_type )( ) const;
IMinimizer_exposer.def(
"getNumberOfVariables"
@@ -214,8 +214,8 @@ void register_IMinimizer_class(){
}
{ //::IMinimizer::getValueOfVariableAtMinimum
- typedef double ( ::IMinimizer::*getValueOfVariableAtMinimum_function_type )( ::size_t ) const;
- typedef double ( IMinimizer_wrapper::*default_getValueOfVariableAtMinimum_function_type )( ::size_t ) const;
+ typedef double ( ::IMinimizer::*getValueOfVariableAtMinimum_function_type )( ::std::size_t ) const;
+ typedef double ( IMinimizer_wrapper::*default_getValueOfVariableAtMinimum_function_type )( ::std::size_t ) const;
IMinimizer_exposer.def(
"getValueOfVariableAtMinimum"
diff --git a/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
index d3102be1a4b8578ccb595113353c8de045bf2187..03961fd42f54edf9f09a3ad4ce233f78b6345e0e 100644
--- a/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
+++ b/Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
@@ -31,11 +31,11 @@ struct ISquaredFunction_wrapper : ISquaredFunction, bp::wrapper< ISquaredFunctio
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else{
+ else
return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
- }
}
+
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
}
diff --git a/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
index 1f174b834df98ba7427c89851fdabb962ea652c5..e73f1c904aa56c1d756dddd015373eae70f6340c 100644
--- a/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
+++ b/Fit/PythonAPI/src/OutputDataNormalizer.pypp.cpp
@@ -33,11 +33,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual ::OutputDataNormalizer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->OutputDataNormalizer::clone( );
- }
}
+
::OutputDataNormalizer * default_clone( ) const {
return OutputDataNormalizer::clone( );
}
@@ -45,11 +45,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual ::OutputData< double > * createNormalizedData( ::OutputData< double > const & data ) const {
if( bp::override func_createNormalizedData = this->get_override( "createNormalizedData" ) )
return func_createNormalizedData( boost::ref(data) );
- else{
+ else
return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
- }
}
+
::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
}
@@ -57,11 +57,11 @@ struct OutputDataNormalizer_wrapper : OutputDataNormalizer, bp::wrapper< OutputD
virtual void setMaximumIntensity( double max_intensity ) {
if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
func_setMaximumIntensity( max_intensity );
- else{
+ else
this->OutputDataNormalizer::setMaximumIntensity( max_intensity );
- }
}
+
void default_setMaximumIntensity( double max_intensity ) {
OutputDataNormalizer::setMaximumIntensity( max_intensity );
}
diff --git a/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
index 70b59588290d8d49c637096863ec5648dc3965f9..0bce6f350de766396e59c1525029ee93dd8f3714 100644
--- a/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
+++ b/Fit/PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp
@@ -33,11 +33,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual ::OutputDataSimpleNormalizer * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->OutputDataSimpleNormalizer::clone( );
- }
}
+
::OutputDataSimpleNormalizer * default_clone( ) const {
return OutputDataSimpleNormalizer::clone( );
}
@@ -45,11 +45,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual void setMaximumIntensity( double max_intensity ) {
if( bp::override func_setMaximumIntensity = this->get_override( "setMaximumIntensity" ) )
func_setMaximumIntensity( max_intensity );
- else{
+ else
this->OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
- }
}
+
void default_setMaximumIntensity( double max_intensity ) {
OutputDataSimpleNormalizer::setMaximumIntensity( max_intensity );
}
@@ -57,11 +57,11 @@ struct OutputDataSimpleNormalizer_wrapper : OutputDataSimpleNormalizer, bp::wrap
virtual ::OutputData< double > * createNormalizedData( ::OutputData< double > const & data ) const {
if( bp::override func_createNormalizedData = this->get_override( "createNormalizedData" ) )
return func_createNormalizedData( boost::ref(data) );
- else{
+ else
return this->OutputDataNormalizer::createNormalizedData( boost::ref(data) );
- }
}
+
::OutputData< double > * default_createNormalizedData( ::OutputData< double > const & data ) const {
return OutputDataNormalizer::createNormalizedData( boost::ref(data) );
}
diff --git a/Fit/PythonAPI/src/PythonModule.cpp b/Fit/PythonAPI/src/PythonModule.cpp
index c07346ae29958b52dfa4432a5d92272c21403dcc..f91603a5761fd4464f4161e900b803ec09a80cb6 100644
--- a/Fit/PythonAPI/src/PythonModule.cpp
+++ b/Fit/PythonAPI/src/PythonModule.cpp
@@ -6,21 +6,21 @@ GCC_DIAG_OFF(missing-field-initializers);
GCC_DIAG_ON(unused-parameter);
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 "SquaredFunctionWithGaussianError.pypp.h"
+#include "OutputDataSimpleNormalizer.pypp.h"
#include "ISquaredFunction.pypp.h"
#include "MinimizerFactory.pypp.h"
#include "OutputDataNormalizer.pypp.h"
-#include "OutputDataSimpleNormalizer.pypp.h"
-#include "SquaredFunctionDefault.pypp.h"
-#include "SquaredFunctionWhichOnlyWorks.pypp.h"
-#include "SquaredFunctionWithGaussianError.pypp.h"
#include "SquaredFunctionWithSystematicError.pypp.h"
+#include "IOutputDataNormalizer.pypp.h"
+#include "SquaredFunctionWhichOnlyWorks.pypp.h"
+#include "IMinimizer.pypp.h"
+#include "SquaredFunctionDefault.pypp.h"
+#include "ChiSquaredModule.pypp.h"
+#include "FitSuite.pypp.h"
+#include "AttLimits.pypp.h"
+#include "IChiSquaredModule.pypp.h"
+#include "FitSuiteParameters.pypp.h"
BOOST_PYTHON_MODULE(libBornAgainFit){
diff --git a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
index 24c1031d440dfb73a3a0f7df006e34d0ea02bb61..3b0b52c824aaccf828d36061a7c0a4ba77a587a3 100644
--- a/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionDefault::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionDefault::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual double calculateSquaredError( double real_value, double arg1 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, arg1 );
- else{
+ else
return this->SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
- }
}
+
double default_calculateSquaredError( double real_value, double arg1 ) const {
return SquaredFunctionDefault::calculateSquaredError( real_value, arg1 );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionDefault_wrapper : SquaredFunctionDefault, bp::wrapper< Squ
virtual ::SquaredFunctionDefault * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionDefault::clone( );
- }
}
+
::SquaredFunctionDefault * default_clone( ) const {
return SquaredFunctionDefault::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
index bbb302b394a39e8dbddda31cd8b59120bf12a96c..378918ee7ee2be818a1e7e61ee959902551042b7 100644
--- a/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionWhichOnlyWorks_wrapper : SquaredFunctionWhichOnlyWorks, bp
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionWhichOnlyWorks::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionWhichOnlyWorks::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionWhichOnlyWorks_wrapper : SquaredFunctionWhichOnlyWorks, bp
virtual ::SquaredFunctionWhichOnlyWorks * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionWhichOnlyWorks::clone( );
- }
}
+
::SquaredFunctionWhichOnlyWorks * default_clone( ) const {
return SquaredFunctionWhichOnlyWorks::clone( );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionWhichOnlyWorks_wrapper : SquaredFunctionWhichOnlyWorks, bp
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else{
+ else
return this->ISquaredFunction::calculateSquaredError( real_value, simulated_value );
- }
}
+
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return ISquaredFunction::calculateSquaredError( real_value, simulated_value );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
index 87abc082ddab8fe0715b108485d9918c947bae3c..6d869a72a869ab3957b46ac5c9d8a469bc25395d 100644
--- a/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionWithGaussianError_wrapper : SquaredFunctionWithGaussianErr
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionWithGaussianError::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionWithGaussianError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionWithGaussianError_wrapper : SquaredFunctionWithGaussianErr
virtual double calculateSquaredError( double arg0, double arg1 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( arg0, arg1 );
- else{
+ else
return this->SquaredFunctionWithGaussianError::calculateSquaredError( arg0, arg1 );
- }
}
+
double default_calculateSquaredError( double arg0, double arg1 ) const {
return SquaredFunctionWithGaussianError::calculateSquaredError( arg0, arg1 );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionWithGaussianError_wrapper : SquaredFunctionWithGaussianErr
virtual ::SquaredFunctionWithGaussianError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionWithGaussianError::clone( );
- }
}
+
::SquaredFunctionWithGaussianError * default_clone( ) const {
return SquaredFunctionWithGaussianError::clone( );
}
diff --git a/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp b/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
index 1129f605a5790a1f9349c749d78ddce6dd9e3e5d..37b0378963542325d24c0bfba602a6189dff1f24 100644
--- a/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
+++ b/Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
@@ -33,11 +33,11 @@ struct SquaredFunctionWithSystematicError_wrapper : SquaredFunctionWithSystemati
virtual double calculateSquaredDifference( double real_value, double simulated_value ) const {
if( bp::override func_calculateSquaredDifference = this->get_override( "calculateSquaredDifference" ) )
return func_calculateSquaredDifference( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionWithSystematicError::calculateSquaredDifference( real_value, simulated_value );
- }
}
+
double default_calculateSquaredDifference( double real_value, double simulated_value ) const {
return SquaredFunctionWithSystematicError::calculateSquaredDifference( real_value, simulated_value );
}
@@ -45,11 +45,11 @@ struct SquaredFunctionWithSystematicError_wrapper : SquaredFunctionWithSystemati
virtual double calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
if( bp::override func_calculateSquaredError = this->get_override( "calculateSquaredError" ) )
return func_calculateSquaredError( real_value, simulated_value );
- else{
+ else
return this->SquaredFunctionWithSystematicError::calculateSquaredError( real_value, simulated_value );
- }
}
+
double default_calculateSquaredError( double real_value, double simulated_value=0.0 ) const {
return SquaredFunctionWithSystematicError::calculateSquaredError( real_value, simulated_value );
}
@@ -57,11 +57,11 @@ struct SquaredFunctionWithSystematicError_wrapper : SquaredFunctionWithSystemati
virtual ::SquaredFunctionWithSystematicError * clone( ) const {
if( bp::override func_clone = this->get_override( "clone" ) )
return func_clone( );
- else{
+ else
return this->SquaredFunctionWithSystematicError::clone( );
- }
}
+
::SquaredFunctionWithSystematicError * default_clone( ) const {
return SquaredFunctionWithSystematicError::clone( );
}
diff --git a/Fit/python_module.pri b/Fit/python_module.pri
index c12606a3c3329b794180f574274794b23b94bf55..c6699b4472f92e150b919e96b62663199e61d56f 100644
--- a/Fit/python_module.pri
+++ b/Fit/python_module.pri
@@ -1,39 +1,39 @@
HEADERS += \
PythonAPI/inc/PythonFitExposer.h \
PythonAPI/inc/PythonFitList.h \
- 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/SquaredFunctionWithGaussianError.pypp.h \
+ PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h \
PythonAPI/inc/ISquaredFunction.pypp.h \
PythonAPI/inc/MinimizerFactory.pypp.h \
PythonAPI/inc/OutputDataNormalizer.pypp.h \
- PythonAPI/inc/OutputDataSimpleNormalizer.pypp.h \
- PythonAPI/inc/SquaredFunctionDefault.pypp.h \
+ PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h \
+ PythonAPI/inc/IOutputDataNormalizer.pypp.h \
PythonAPI/inc/SquaredFunctionWhichOnlyWorks.pypp.h \
- PythonAPI/inc/SquaredFunctionWithGaussianError.pypp.h \
- PythonAPI/inc/SquaredFunctionWithSystematicError.pypp.h
+ PythonAPI/inc/IMinimizer.pypp.h \
+ PythonAPI/inc/SquaredFunctionDefault.pypp.h \
+ PythonAPI/inc/ChiSquaredModule.pypp.h \
+ PythonAPI/inc/FitSuite.pypp.h \
+ PythonAPI/inc/AttLimits.pypp.h \
+ PythonAPI/inc/IChiSquaredModule.pypp.h \
+ PythonAPI/inc/FitSuiteParameters.pypp.h
SOURCES += \
PythonAPI/src/PythonModule.cpp \
+ PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp \
+ PythonAPI/src/SquaredFunctionWithSystematicError.pypp.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/OutputDataNormalizer.pypp.cpp \
- PythonAPI/src/OutputDataSimpleNormalizer.pypp.cpp \
PythonAPI/src/SquaredFunctionDefault.pypp.cpp \
PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp \
+ PythonAPI/src/OutputDataNormalizer.pypp.cpp \
+ PythonAPI/src/FitSuite.pypp.cpp \
+ PythonAPI/src/IMinimizer.pypp.cpp \
PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp \
- PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp
+ PythonAPI/src/MinimizerFactory.pypp.cpp \
+ PythonAPI/src/ISquaredFunction.pypp.cpp \
+ PythonAPI/src/IOutputDataNormalizer.pypp.cpp \
+ PythonAPI/src/FitSuiteParameters.pypp.cpp
INCLUDEPATH += ./PythonAPI/inc
DEPENDPATH += ./PythonAPI/inc
diff --git a/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp b/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp
index b4c456b49f15426cb406f2d7d981e938bdc8fb99..48cc710c12be5f58b0091ef649992bce4b985794 100644
--- a/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp
+++ b/Tests/FunctionalTests/TestFit/TestFit01/TestFit01.cpp
@@ -111,7 +111,7 @@ bool TestFit01::run_fitting(const std::string &minimizer_name, const std::string
ISample *TestFit01::buildSample()
{
MultiLayer *multi_layer = new MultiLayer();
- const IMaterial *air_material = MaterialManager::getHomogeneousMaterial("Air", 1.0, 0.0);
+ const IMaterial *air_material = MaterialManager::getHomogeneousMaterial("Air", 0.0, 0.0);
Layer air_layer(air_material);
complex_t n_particle(1.0-6e-4, 2e-8);
ParticleDecoration particle_decoration( new Particle(n_particle, new FormFactorCylinder(m_cylinder_height, m_cylinder_radius)));
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs01.py b/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
index 7f257cbd5d0a14016db003f6ad11af4a7703b995..694ad59ab15a921d720d73e909711e0fd259120c 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs01.py
@@ -32,10 +32,10 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
# air layer with particles and substrate form multi layer
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
index a6db44bb9e461f6de37dd7ef38adc22449b02c0e..3a53531f363348787af3bd3a4a3cf5ef341d3825 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs02.py
@@ -53,9 +53,9 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
#making layer holding all whose nano particles
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs03.py b/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
index 410b667468dc6d7252ce0895c070b7e77612074e..f103e77e3b094399afe98eb530ae6aa58989e9a5 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs03.py
@@ -28,11 +28,11 @@ def RunSimulationDWBA():
particle_decoration.addInterferenceFunction(interference)
# air layer with particles and substrate form multi layer
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
@@ -62,10 +62,11 @@ def RunSimulationBA():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
@@ -106,8 +107,9 @@ def RunSimulationBA_Size():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
- multi_layer.addLayer(air_layer_decorator)
+ air_layer.setDecoration(particle_decoration)
+
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs04.py b/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
index bb161e3c5d3ca634a76418bfbcc4d7f720483a08..f177477bdbc8994aabb15f440b1cd411bf91d92c 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs04.py
@@ -27,11 +27,12 @@ def RunSimulation1():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
@@ -65,11 +66,12 @@ def RunSimulation2():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
#gsl_set_error_handler_off()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs06.py b/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
index 605be3d7855533e4ed180eeec81e469c4d0cde04..60b72802ecb0cadf5f6e60df365dff26720d6ead 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs06.py
@@ -44,10 +44,10 @@ def RunSimulation_lattice():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
@@ -102,10 +102,10 @@ def RunSimulation_centered():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
@@ -155,10 +155,10 @@ def RunSimulation_rotated():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
@@ -242,10 +242,11 @@ def buildSample(xi_value):
particle_info = PositionParticleInfo( cylinder, position, 1.0)
particle_decoration.addParticleInfo(particle_info)
particle_decoration.addInterferenceFunction(p_interference_function)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+
+ air_layer.setDecoration(particle_decoration)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
return multi_layer
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs07.py b/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
index 384f43118b0f27d1cb5fb495cc210e7cb652884c..7e6402b901270b8f0ceefe29465e1db3baf19403 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs07.py
@@ -115,9 +115,10 @@ def RunSimulation():
# air layer with particles and substrate form multi layer
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
#build and run experiment
simulation = Simulation()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs08.py b/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
index 0449a0669bd3ef5ab2f442465d070f0ff9344405..de6f8261cbc4404fb9dedfa27aad720c3f6a9023 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs08.py
@@ -32,11 +32,11 @@ def RunSimulation1():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
@@ -70,11 +70,11 @@ def RunSimulation2():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs09.py b/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
index 29f71aecbb514f9bdf77890b2501be70bf4bc412..513d77d3400bdeb459bdbd1d957cf154f7a5dbf7 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs09.py
@@ -27,11 +27,12 @@ def RunSimulation1():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
@@ -65,11 +66,12 @@ def RunSimulation2():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs10.py b/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
index c83888e98e9361d9af7c4b9ff728821b6db55b93..a1f8aa78cc445aefb6c6e3eaa1797c718ba3feea 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs10.py
@@ -28,10 +28,10 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
# air layer with particles and substrate form multi layer
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
substrate_layer = Layer(mSubstrate, 0)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs11.py b/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
index efa5ad14c6f3b09dfe3832121d599cac8b3bb1e1..22cbc8ea22d969b9303a4937ca8e75c3894f3826 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs11.py
@@ -34,9 +34,10 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
+
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Tests/FunctionalTests/TestPyCore/isgisaxs15.py b/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
index 6fcae8df89ebedfe52ce28c46efcf24de3636e31..d51b0d64531abe42148aba3f2b3752ffdfa78d02 100644
--- a/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
+++ b/Tests/FunctionalTests/TestPyCore/isgisaxs15.py
@@ -36,9 +36,9 @@ def RunSimulation():
particle_decoration.addInterferenceFunction(interference)
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
# build and run experiment
simulation = Simulation()
diff --git a/Tests/FunctionalTests/TestPyCore/mesocrystal1.py b/Tests/FunctionalTests/TestPyCore/mesocrystal1.py
index c87d27eb8c35b0c78c74bc4bda76d099d7af0719..7ef713e027559e320eeba131c72aa6858c738664 100644
--- a/Tests/FunctionalTests/TestPyCore/mesocrystal1.py
+++ b/Tests/FunctionalTests/TestPyCore/mesocrystal1.py
@@ -92,12 +92,13 @@ class MySampleBuilder(ISampleBuilder):
particle_decoration.setTotalParticleSurfaceDensity(surface_density)
particle_decoration.addInterferenceFunction(p_interference_funtion)
- avg_layer_decorator = LayerDecorator(avg_layer, particle_decoration)
+
+ avg_layer.setDecoration(particle_decoration)
roughness = LayerRoughness(self.roughness.value, 0.3, 500.0*nanometer)
p_multi_layer.addLayer(air_layer)
- p_multi_layer.addLayer(avg_layer_decorator)
+ p_multi_layer.addLayer(avg_layer)
p_multi_layer.addLayerWithTopRoughness(substrate_layer, roughness)
self.sample = p_multi_layer
diff --git a/Tests/FunctionalTests/TestPyFit/testfit01.py b/Tests/FunctionalTests/TestPyFit/testfit01.py
index c3ad27e7f266f40c575633748b9ea6558db9ae33..e19d8dd05c68ba6b9c8ebb783701ba76427a3f9d 100644
--- a/Tests/FunctionalTests/TestPyFit/testfit01.py
+++ b/Tests/FunctionalTests/TestPyFit/testfit01.py
@@ -59,7 +59,7 @@ def runTest():
# run fitting specified minimizer
# -----------------------------------------------------------------------------
def run_fitting(minimizer_name, minimizer_algorithm):
- sample = buildSample()
+ sample = buildSample()
simulation = createSimulation()
simulation.setSample(sample)
@@ -111,9 +111,9 @@ def buildSample():
mAmbience = MaterialManager.getHomogeneousMaterial("Air", 0.0, 0.0 )
air_layer = Layer(mAmbience)
- air_layer_decorator = LayerDecorator(air_layer, particle_decoration)
+ air_layer.setDecoration(particle_decoration)
multi_layer = MultiLayer()
- multi_layer.addLayer(air_layer_decorator)
+ multi_layer.addLayer(air_layer)
return multi_layer
diff --git a/Tests/FunctionalTests/TestPyFit/testfit02.py b/Tests/FunctionalTests/TestPyFit/testfit02.py
index 3e14d7767eae5f045efd92a9b49d95f6145e10cb..ae6504a32cd596ad6a95834277cd44b06c2e12c7 100644
--- a/Tests/FunctionalTests/TestPyFit/testfit02.py
+++ b/Tests/FunctionalTests/TestPyFit/testfit02.py
@@ -139,8 +139,8 @@ class MySampleBuilder(ISampleBuilder):
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)
+ air_layer.setDecoration(particle_decoration)
+ multi_layer.addLayer(air_layer)
multi_layer.addLayer(substrate_layer)
self.sample = multi_layer
return self.sample
diff --git a/Tests/UnitTests/TestCore/LayerTest.h b/Tests/UnitTests/TestCore/LayerTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..038668fb304311c372d9490659d9ec9a7c1f72ae
--- /dev/null
+++ b/Tests/UnitTests/TestCore/LayerTest.h
@@ -0,0 +1,111 @@
+#ifndef LAYERTEST_H
+#define LAYERTEST_H
+
+#include "Layer.h"
+#include "HomogeneousMaterial.h"
+#include "MaterialManager.h"
+#include "Units.h"
+#include "ParticleDecoration.h"
+
+class LayerTest : public ::testing::Test
+{
+ protected:
+ LayerTest(){}
+ virtual ~LayerTest(){}
+
+};
+
+
+
+TEST_F(LayerTest, LayerInitialState)
+{
+ Layer layer;
+
+ EXPECT_EQ(NULL, layer.getMaterial());
+ EXPECT_EQ(NULL, layer.getDecoration());
+ EXPECT_EQ(0, layer.getThickness());
+ EXPECT_FALSE(layer.hasDWBASimulation());
+ EXPECT_EQ(complex_t(0,0), layer.getRefractiveIndex());
+ EXPECT_EQ(0.0, layer.getTotalParticleSurfaceDensity());
+ EXPECT_EQ("Layer", layer.getName());
+ EXPECT_EQ(NULL, layer.createDWBASimulation());
+ EXPECT_EQ(NULL, layer.createDiffuseDWBASimulation());
+
+ Layer *new_layer = layer.clone();
+
+ EXPECT_EQ(NULL, new_layer->getMaterial());
+ EXPECT_EQ(NULL, new_layer->getDecoration());
+ EXPECT_EQ(0, new_layer->getThickness());
+ EXPECT_FALSE(new_layer->hasDWBASimulation());
+ EXPECT_EQ(complex_t(0,0), new_layer->getRefractiveIndex());
+ EXPECT_EQ(0.0, new_layer->getTotalParticleSurfaceDensity());
+ EXPECT_EQ("Layer", new_layer->getName());
+ EXPECT_EQ(NULL, new_layer->createDWBASimulation());
+ EXPECT_EQ(NULL, new_layer->createDiffuseDWBASimulation());
+
+ delete new_layer;
+}
+
+
+TEST_F(LayerTest, LayerGetAndSet)
+{
+ const IMaterial *air = MaterialManager::getHomogeneousMaterial("air",0,0);
+ const IMaterial *something = MaterialManager::getHomogeneousMaterial("something",0,0.5);
+
+ Layer layer(air, 10*Units::nanometer);
+ EXPECT_EQ(air, layer.getMaterial());
+ EXPECT_EQ(NULL, layer.getDecoration());
+ EXPECT_EQ(10, layer.getThickness());
+ EXPECT_FALSE(layer.hasDWBASimulation());
+ EXPECT_EQ(complex_t(1,0), layer.getRefractiveIndex());
+ EXPECT_EQ(0.0, layer.getTotalParticleSurfaceDensity());
+ EXPECT_EQ("Layer", layer.getName());
+ EXPECT_EQ(NULL, layer.createDWBASimulation());
+ EXPECT_EQ(NULL, layer.createDiffuseDWBASimulation());
+
+ layer.setThickness(20.0);
+ EXPECT_EQ(20, layer.getThickness());
+ layer.setMaterial(something);
+ EXPECT_EQ(something, layer.getMaterial());
+ layer.setName("NONAME");
+ EXPECT_EQ("NONAME", layer.getName());
+ EXPECT_EQ(complex_t(1,0.5), layer.getRefractiveIndex());
+
+ Layer *new_layer = layer.clone();
+ EXPECT_EQ(something, new_layer->getMaterial());
+ EXPECT_EQ(NULL, new_layer->getDecoration());
+ EXPECT_EQ(20, new_layer->getThickness());
+ EXPECT_FALSE(new_layer->hasDWBASimulation());
+ EXPECT_EQ(complex_t(1,0.5), new_layer->getRefractiveIndex());
+ EXPECT_EQ(0.0, new_layer->getTotalParticleSurfaceDensity());
+ EXPECT_EQ("NONAME", new_layer->getName());
+ EXPECT_EQ(NULL, new_layer->createDWBASimulation());
+ EXPECT_EQ(NULL, new_layer->createDiffuseDWBASimulation());
+ delete new_layer;
+}
+
+
+TEST_F(LayerTest, LayerAndDecoration)
+{
+ const IMaterial *air = MaterialManager::getHomogeneousMaterial("air",0,0);
+ ParticleDecoration *decoration1 = new ParticleDecoration();
+
+ Layer layer(air, 10*Units::nanometer, decoration1);
+ EXPECT_EQ(decoration1, layer.getDecoration());
+ EXPECT_TRUE(layer.hasDWBASimulation());
+
+ ParticleDecoration *decoration2 = new ParticleDecoration();
+ layer.setDecoration(decoration2);
+ EXPECT_EQ(decoration2, layer.getDecoration());
+
+ ParticleDecoration decoration3;
+ decoration3.setName("NONAME");
+ layer.setDecoration(decoration3);
+ EXPECT_EQ("NONAME", layer.getDecoration()->getName());
+
+ EXPECT_EQ(NULL, layer.createDiffuseDWBASimulation());
+
+}
+
+
+#endif // LAYERTEST_H
diff --git a/Tests/UnitTests/TestCore/TestCore.pro b/Tests/UnitTests/TestCore/TestCore.pro
index 4b9a73f5b6e55b0b0dadda54abcbffdf5747d848..4587fc15bb4aa94dfdb22dd2dca155fff4d02f8b 100644
--- a/Tests/UnitTests/TestCore/TestCore.pro
+++ b/Tests/UnitTests/TestCore/TestCore.pro
@@ -29,6 +29,7 @@ HEADERS += \
RealParameterWrapperTest.h \
SimulationTest.h \
ThreadInfoTest.h \
+ LayerTest.h
#OBJECTS_DIR = obj
diff --git a/Tests/UnitTests/TestCore/main.cpp b/Tests/UnitTests/TestCore/main.cpp
index 5b8c5ad5c156590ebd739c8c6505f2c4192e9c5c..2a4a4291a0e706a8a9c9a3de753da1dbf91d64f1 100644
--- a/Tests/UnitTests/TestCore/main.cpp
+++ b/Tests/UnitTests/TestCore/main.cpp
@@ -5,17 +5,19 @@
#include "ChiSquaredModuleTest.h"
#include "CVectorTest.h"
#include "DetectorTest.h"
-#include "SimulationTest.h"
#include "InstrumentTest.h"
#include "IParameterizedTest.h"
#include "KVectorTest.h"
+#include "LayerTest.h"
#include "MaskTest.h"
#include "OutputDataIteratorTest.h"
#include "OutputDataTest.h"
#include "ParameterPoolTest.h"
#include "RealParameterWrapperTest.h"
+#include "SimulationTest.h"
#include "ThreadInfoTest.h"
+
struct ErrorStreamRedirect {
ErrorStreamRedirect( std::streambuf * new_buffer )
: old( std::cerr.rdbuf( new_buffer ) )
diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
index 443e1e040be88e0e4d0bbfdea644f88cacffe62c..b0b14e2b25ac10f4605634a50c58aa93e4ebe897 100644
--- a/cmake/modules/SearchInstalledSoftware.cmake
+++ b/cmake/modules/SearchInstalledSoftware.cmake
@@ -50,6 +50,8 @@ if(BORNAGAIN_PYTHON)
find_package(PythonInterp)
+ set(PythonLibs_FIND_VERSION ${PYTHON_VERSION_STRING})
+
find_package(PythonLibs REQUIRED)
if(PYTHONLIBS_FOUND)
include_directories(${PYTHON_INCLUDE_DIRS})
diff --git a/dev-tools/log/perf_history.txt b/dev-tools/log/perf_history.txt
index 306d058cefeda267c98e8931c5850429f92f3d69..3f598ccd929ca1ef583d94171c03047df98b39fc 100644
--- a/dev-tools/log/perf_history.txt
+++ b/dev-tools/log/perf_history.txt
@@ -260,4 +260,9 @@
2013-07-25 13:11:27 | jcnsopc126 | linuxx8664gcc, 1600 MHz | 160000 | 4.37637 | 4.36681 | 1.37931 | 357143 |
2013-07-25 13:12:38 | jcnsopc126 | linuxx8664gcc, 1600 MHz | 158730 | 4.37637 | 4.36681 | 1.37931 | 357143 |
+# after removal of LayerDecorator
+# (and ./App --mesocrystal2 gives 23.3 (8 threads), 126.8 sec (1 thread))
+2013-07-25 13:51:26 | jcnsopc126 | linuxx8664gcc, 1600 MHz | 173913 | 4.78469 | 4.75059 | 1.50376 | 392157 |
+2013-07-25 13:51:54 | jcnsopc126 | linuxx8664gcc, 1600 MHz | 173913 | 4.75059 | 4.73934 | 1.49254 | 400000 |
+
diff --git a/dev-tools/python-bindings/MakePyCore.py b/dev-tools/python-bindings/MakePyCore.py
index f7b8b5b2a58747cd6f73656c2c880283aad0c092..cc6916b06a7751f0b2bcb34deec4b7f0acce24e6 100644
--- a/dev-tools/python-bindings/MakePyCore.py
+++ b/dev-tools/python-bindings/MakePyCore.py
@@ -27,7 +27,7 @@ include_dirs = [
'../../Core/Tools/inc',
'../../Core/PythonAPI/inc',
'../../Core/Geometry/inc',
- '../../ThirdParty/eigen3'
+# '../../ThirdParty/eigen3'
]
include_classes = [
@@ -251,7 +251,8 @@ def MakePythonAPI(OutputTempDir):
print "NOTE: If you update the source library code you need to manually delete the cache_core.xml file, or run 'python codegenerator.py clean'"
xml_cached_fc = parser.create_cached_source_fc( "PythonCoreList.h", "cache_core.xml" )
#xml_cached_fc = parser.create_cached_source_fc( ["PythonCoreList.h","PythonCoreExposer.h"], "cache_core.xml" )
- mb = module_builder.module_builder_t( [xml_cached_fc], include_paths=include_dirs, gccxml_path=mygccxml, cflags="-m64 -msse -msse2 -fno-strict-aliasing -msse3")
+ #mb = module_builder.module_builder_t( [xml_cached_fc], include_paths=include_dirs, gccxml_path=mygccxml, cflags="-m64 -msse -msse2 -fno-strict-aliasing -msse3")
+ mb = module_builder.module_builder_t( [xml_cached_fc], include_paths=include_dirs, gccxml_path=mygccxml, cflags="-m64 -DGCCXML_SKIP_THIS")
# -----------------
# general rules
diff --git a/dev-tools/python-bindings/MakePyFit.py b/dev-tools/python-bindings/MakePyFit.py
index b765bb902530092b9364c286147ab747e85bada1..76c46ca9d68cccaff92fa0b087fac68592a0560e 100644
--- a/dev-tools/python-bindings/MakePyFit.py
+++ b/dev-tools/python-bindings/MakePyFit.py
@@ -27,7 +27,7 @@ include_dirs = [
'../../Core/Geometry/inc',
'../../Fit/Factory/inc',
'../../Fit/PythonAPI/inc',
-'../../ThirdParty/eigen3',
+#'../../ThirdParty/eigen3',
]
include_classes = [
@@ -100,7 +100,7 @@ def MakePythonAPI(OutputTempDir):
#If the cache file cache_core.xml doesn't exist it gets created, otherwise it just gets loaded
print "NOTE: If you update the source library code you need to manually delete the cache_fit.xml file, or run 'python codegenerator.py clean'"
xml_cached_fc = parser.create_cached_source_fc( "PythonFitList.h", "cache_fit.xml" )
- mb = module_builder.module_builder_t( [xml_cached_fc], include_paths=include_dirs, gccxml_path=mygccxml, cflags="-m64 -msse3")
+ mb = module_builder.module_builder_t( [xml_cached_fc], include_paths=include_dirs, gccxml_path=mygccxml, cflags="-m64 -DGCCXML_SKIP_THIS")
# -----------------
# general rules
diff --git a/shared.pri b/shared.pri
index 8e044455a20645a562ccaacd37071cc0428dd38b..1522cf4785acac49b81cda88294683fe717cf310 100644
--- a/shared.pri
+++ b/shared.pri
@@ -2,7 +2,7 @@
# Common settings for all BornAgain compilations
# -----------------------------------------------------------------------------
-#CONFIG += BORNAGAIN_PYTHON # provide python bindings compilation
+CONFIG += BORNAGAIN_PYTHON # provide python bindings compilation
win32 {
MAKE_COMMAND = mingw32-make