diff --git a/Core/Binning/SimulationElement.cpp b/Core/Binning/SimulationElement.cpp
index 307c4f012f74f335ebaf624633686852b59aa4d7..8aef522613003862b6d46313304e3aed235b9af4 100644
--- a/Core/Binning/SimulationElement.cpp
+++ b/Core/Binning/SimulationElement.cpp
@@ -25,25 +25,28 @@ SimulationElement::SimulationElement(double wavelength, double alpha_i, double p
, m_phi_i(phi_i)
, m_intensity(0.0)
, mP_pixel(std::move(pixel))
- , m_contains_specular(false)
{
initPolarization();
}
SimulationElement::SimulationElement(const SimulationElement& other)
: m_wavelength(other.m_wavelength), m_alpha_i(other.m_alpha_i), m_phi_i(other.m_phi_i)
- , m_intensity(other.m_intensity), m_contains_specular(other.m_contains_specular)
+ , m_intensity(other.m_intensity)
{
mP_pixel.reset(other.mP_pixel->clone());
+ if (other.m_specular_data)
+ m_specular_data.reset(new SpecularData(*other.m_specular_data));
m_polarization = other.m_polarization;
m_analyzer_operator = other.m_analyzer_operator;
}
SimulationElement::SimulationElement(const SimulationElement& other, double x, double y)
: m_wavelength(other.m_wavelength), m_alpha_i(other.m_alpha_i), m_phi_i(other.m_phi_i)
- , m_intensity(other.m_intensity), m_contains_specular(other.m_contains_specular)
+ , m_intensity(other.m_intensity)
{
mP_pixel.reset(other.mP_pixel->createZeroSizePixel(x, y));
+ if (other.m_specular_data)
+ m_specular_data.reset(new SpecularData(*other.m_specular_data));
m_polarization = other.m_polarization;
m_analyzer_operator = other.m_analyzer_operator;
}
@@ -56,7 +59,7 @@ SimulationElement::SimulationElement(SimulationElement&& other) noexcept
, m_polarization(std::move(other.m_polarization))
, m_analyzer_operator(std::move(other.m_analyzer_operator))
, mP_pixel(std::move(other.mP_pixel))
- , m_contains_specular(other.m_contains_specular)
+ , m_specular_data(std::move(other.m_specular_data))
{
}
@@ -108,7 +111,7 @@ void SimulationElement::swapContent(SimulationElement &other)
std::swap(m_polarization, other.m_polarization);
std::swap(m_analyzer_operator, other.m_analyzer_operator);
std::swap(mP_pixel, other.mP_pixel);
- std::swap(m_contains_specular, other.m_contains_specular);
+ std::swap(m_specular_data, other.m_specular_data);
}
void SimulationElement::initPolarization()
@@ -127,14 +130,14 @@ double SimulationElement::getPhi(double x, double y) const
return getKf(x,y).phi();
}
-bool SimulationElement::containsSpecularWavevector() const
+void SimulationElement::setSpecular()
{
- return m_contains_specular;
+ m_specular_data.reset(new SpecularData);
}
-void SimulationElement::setSpecular(bool contains_specular)
+void SimulationElement::setSpecular(std::unique_ptr<SpecularData> specular_data)
{
- m_contains_specular = contains_specular;
+ m_specular_data = std::move(specular_data);
}
double SimulationElement::getIntegrationFactor(double x, double y) const {
@@ -152,3 +155,26 @@ void addElementsWithWeight(std::vector<SimulationElement>::const_iterator first,
for (std::vector<SimulationElement>::const_iterator it = first; it != last; ++it, ++result)
result->addIntensity(it->getIntensity() * weight);
}
+
+SpecularData::SpecularData() : data_type_used(DATA_TYPE::Invalid) {}
+
+SpecularData::SpecularData(MatrixVector coefficients)
+ : data(std::move(coefficients))
+ , data_type_used(DATA_TYPE::Matrix)
+{}
+
+SpecularData::SpecularData(ScalarVector coefficients)
+ : data(std::move(coefficients))
+ , data_type_used(DATA_TYPE::Scalar)
+{}
+
+const ILayerRTCoefficients& SpecularData::operator[](size_t index) const
+{
+ if (data_type_used == DATA_TYPE::Invalid)
+ throw std::runtime_error(
+ "Error in SpecularData::operator[]: attempt to access uninitialized data");
+ if (data_type_used == DATA_TYPE::Scalar)
+ return (*boost::get<ScalarVector>(&data))[index];
+ else
+ return (*boost::get<MatrixVector>(&data))[index];
+}
diff --git a/Core/Binning/SimulationElement.h b/Core/Binning/SimulationElement.h
index 09017df9ad2540da692fa095b9aed4eb660e87a9..eec843b2b454ff22989b5c8b8c60f3159ed91d3e 100644
--- a/Core/Binning/SimulationElement.h
+++ b/Core/Binning/SimulationElement.h
@@ -20,10 +20,14 @@
#include "EigenCore.h"
#include "Vectors3D.h"
#include "IPixel.h"
+#include "MatrixRTCoefficients.h"
+#include "ScalarRTCoefficients.h"
+#include <boost/variant.hpp>
#include <memory>
#include <vector>
class IPixel;
+class SpecularData;
//! Data stucture containing both input and output of a single detector cell.
//! @ingroup simulation
@@ -80,11 +84,12 @@ public:
double getAlpha(double x, double y) const;
double getPhi(double x, double y) const;
- //! check if element contains given wavevector
- bool containsSpecularWavevector() const;
+ //! check if element corresponds to specular peak
+ SpecularData* specularData() const {return m_specular_data.get();}
- //! indicate that this element contains the specular wavevector
- void setSpecular(bool contains_specular);
+ //! Turn on specular data
+ void setSpecular();
+ void setSpecular(std::unique_ptr<SpecularData> specular_data);
private:
void swapContent(SimulationElement &other);
@@ -99,7 +104,7 @@ private:
Eigen::Matrix2cd m_analyzer_operator; //!< polarization analyzer operator
#endif
std::unique_ptr<IPixel> mP_pixel;
- bool m_contains_specular;
+ std::unique_ptr<SpecularData> m_specular_data;
};
@@ -109,4 +114,29 @@ void addElementsWithWeight(std::vector<SimulationElement>::const_iterator first,
std::vector<SimulationElement>::iterator result,
double weight);
+//! Helper class for SimulationElement to carry specular information
+//! @ingroup simulation
+
+class BA_CORE_API_ SpecularData
+{
+ // FIXME: find a better way to carry the specular data in SimulationElement
+ using ScalarVector = std::vector<ScalarRTCoefficients>;
+ using MatrixVector = std::vector<MatrixRTCoefficients>;
+public:
+ SpecularData();
+
+ SpecularData(MatrixVector coefficients);
+
+ SpecularData(ScalarVector coefficients);
+
+ const ILayerRTCoefficients& operator[](size_t index) const;
+
+ bool isInited() const {return data_type_used != DATA_TYPE::Invalid;}
+
+private:
+ enum class DATA_TYPE { Invalid = -1, Scalar, Matrix };
+ boost::variant<ScalarVector, MatrixVector> data;
+ DATA_TYPE data_type_used;
+};
+
#endif // SIMULATIONELEMENT_H
diff --git a/Core/Computation/DWBAComputation.cpp b/Core/Computation/DWBAComputation.cpp
index dd9810f6f96b19cbad3597ca09abcce79367e0f0..90a4c93f270035f6b18aeb0b7a35e13ad626d277 100644
--- a/Core/Computation/DWBAComputation.cpp
+++ b/Core/Computation/DWBAComputation.cpp
@@ -20,28 +20,24 @@
#include "MatrixFresnelMap.h"
#include "MultiLayer.h"
#include "RoughMultiLayerComputation.h"
-#include "SpecularComputation.h"
#include "ScalarFresnelMap.h"
#include "ProgressHandler.h"
#include "SimulationElement.h"
#include "MaterialFactoryFuncs.h"
+#include "NormalizingSpecularComputationTerm.h"
static_assert(std::is_copy_constructible<DWBAComputation>::value == false,
"DWBAComputation should not be copy constructable");
static_assert(std::is_copy_assignable<DWBAComputation>::value == false,
"DWBAComputation should not be copy assignable");
-DWBAComputation::DWBAComputation(
- const MultiLayer& multilayer,
- const SimulationOptions& options,
- ProgressHandler& progress,
- const std::vector<SimulationElement>::iterator& begin_it,
- const std::vector<SimulationElement>::iterator& end_it)
- : IComputation (progress, begin_it, end_it)
- , mP_multi_layer(multilayer.cloneSliced(options.useAvgMaterials()))
- , m_sim_options(options)
+DWBAComputation::DWBAComputation(const MultiLayer& multilayer, const SimulationOptions& options,
+ ProgressHandler& progress,
+ const std::vector<SimulationElement>::iterator& begin_it,
+ const std::vector<SimulationElement>::iterator& end_it)
+ : IComputation(options, progress, begin_it, end_it, multilayer)
{
- mP_fresnel_map.reset(createFresnelMap());
+ mP_fresnel_map = createFresnelMap();
bool polarized = mP_multi_layer->containsMagneticMaterial();
size_t nLayers = mP_multi_layer->numberOfLayers();
for (size_t i=0; i<nLayers; ++i) {
@@ -57,24 +53,12 @@ DWBAComputation::DWBAComputation(
m_computation_terms.emplace_back(new RoughMultiLayerComputation(mP_multi_layer.get(),
mP_fresnel_map.get()));
if (m_sim_options.includeSpecular())
- m_computation_terms.emplace_back(new SpecularComputation(mP_multi_layer.get(),
+ m_computation_terms.emplace_back(new NormalizingSpecularComputationTerm(mP_multi_layer.get(),
mP_fresnel_map.get()));
initFresnelMap();
}
-DWBAComputation::~DWBAComputation() {}
-
-void DWBAComputation::run()
-{
- m_status.setRunning();
- try {
- runProtected();
- m_status.setCompleted();
- } catch(const std::exception &ex) {
- m_status.setErrorMessage(std::string(ex.what()));
- m_status.setFailed();
- }
-}
+DWBAComputation::~DWBAComputation() = default;
// The normalization of the calculated scattering intensities is:
// For nanoparticles: rho * (scattering cross-section/scattering particle)
@@ -91,7 +75,7 @@ void DWBAComputation::runProtected()
}
}
-IFresnelMap* DWBAComputation::createFresnelMap()
+std::unique_ptr<IFresnelMap> DWBAComputation::createFresnelMap()
{
std::unique_ptr<IFresnelMap> P_result;
if (!mP_multi_layer->requiresMatrixRTCoefficients())
@@ -102,7 +86,7 @@ IFresnelMap* DWBAComputation::createFresnelMap()
if (P_result && m_sim_options.isIntegrate()) {
P_result->disableCaching();
}
- return P_result.release();
+ return P_result;
}
std::unique_ptr<MultiLayer> DWBAComputation::getAveragedMultilayer() const
diff --git a/Core/Computation/DWBAComputation.h b/Core/Computation/DWBAComputation.h
index c39a1dc7216fc40dff5d885591b49843b47e7133..ccf472ffbf7145918feb4fe64a656750cfce57c0 100644
--- a/Core/Computation/DWBAComputation.h
+++ b/Core/Computation/DWBAComputation.h
@@ -45,8 +45,8 @@ public:
void run();
private:
- void runProtected();
- IFresnelMap* createFresnelMap();
+ virtual void runProtected() override;
+ std::unique_ptr<IFresnelMap> createFresnelMap();
// creates a multilayer that contains averaged materials, for use in Fresnel calculations
std::unique_ptr<MultiLayer> getAveragedMultilayer() const;
// creates a multilayer for use in Fresnel calculations; if needed, it calculates average
@@ -56,12 +56,7 @@ private:
void initFresnelMap();
bool checkRegions(const std::vector<HomogeneousRegion>& regions) const;
- std::unique_ptr<MultiLayer> mP_multi_layer;
- SimulationOptions m_sim_options;
-
- //! contains the information, necessary to calculate the Fresnel coefficients
- std::unique_ptr<IFresnelMap> mP_fresnel_map;
-
+ std::unique_ptr<IFresnelMap> mP_fresnel_map; //!< Contains the information, necessary to calculate the Fresnel coefficients.
std::vector<std::unique_ptr<IComputationTerm>> m_computation_terms;
};
diff --git a/Core/Computation/IComputation.cpp b/Core/Computation/IComputation.cpp
index c368465c0b4e9e4ce6cf528b15790f4f72d6e99c..a7e1a1c8e9d65b60447df5edfa861535dfeb391c 100644
--- a/Core/Computation/IComputation.cpp
+++ b/Core/Computation/IComputation.cpp
@@ -14,15 +14,34 @@
// ************************************************************************** //
#include "IComputation.h"
+#include "MultiLayer.h"
#include "ProgressHandler.h"
#include "SimulationElement.h"
-IComputation::IComputation(ProgressHandler& progress,
+IComputation::IComputation(const SimulationOptions& options, ProgressHandler& progress,
const std::vector<SimulationElement>::iterator& start,
- const std::vector<SimulationElement>::iterator& end)
- : m_progress(&progress)
+ const std::vector<SimulationElement>::iterator& end,
+ const MultiLayer& sample)
+ : m_sim_options(options)
+ , m_progress(&progress)
, m_begin_it(start)
, m_end_it(end)
-{}
+ , mP_multi_layer(sample.cloneSliced(options.useAvgMaterials()))
+{
+ if (!mP_multi_layer)
+ throw std::runtime_error("Error in IComputation: empty sample passed.");
+}
-IComputation::~IComputation() {}
+IComputation::~IComputation() = default;
+
+void IComputation::run()
+{
+ m_status.setRunning();
+ try {
+ runProtected();
+ m_status.setCompleted();
+ } catch(const std::exception &ex) {
+ m_status.setErrorMessage(std::string(ex.what()));
+ m_status.setFailed();
+ }
+}
diff --git a/Core/Computation/IComputation.h b/Core/Computation/IComputation.h
index a06604f22a78652ccb39070b0cac821d2fbeaf8d..8278899bc76d190efecb7d5ca86c70f6a5c41442 100644
--- a/Core/Computation/IComputation.h
+++ b/Core/Computation/IComputation.h
@@ -17,9 +17,11 @@
#define ICOMPUTATION_H
#include "ComputationStatus.h"
+#include "SimulationOptions.h"
#include <memory>
#include <vector>
+class MultiLayer;
class ProgressHandler;
class SimulationElement;
@@ -33,23 +35,25 @@ class SimulationElement;
class IComputation
{
public:
- IComputation(ProgressHandler& progress,
+ IComputation(const SimulationOptions& options, ProgressHandler& progress,
const std::vector<SimulationElement>::iterator& start,
- const std::vector<SimulationElement>::iterator& end);
+ const std::vector<SimulationElement>::iterator& end,
+ const MultiLayer& sample);
virtual ~IComputation();
- virtual void run() =0;
+ void run();
bool isCompleted() const { return m_status.isCompleted(); }
std::string errorMessage() const { return m_status.errorMessage(); }
protected:
- ProgressHandler* m_progress;
-
- //! these iterators define the span of detector bins this simulation will work on
- std::vector<SimulationElement>::iterator m_begin_it, m_end_it;
+ virtual void runProtected() = 0;
+ SimulationOptions m_sim_options;
+ ProgressHandler* m_progress;
+ std::vector<SimulationElement>::iterator m_begin_it, m_end_it; //!< these iterators define the span of detector bins this simulation will work on
ComputationStatus m_status;
+ std::unique_ptr<MultiLayer> mP_multi_layer;
};
#endif // ICOMPUTATION_H
diff --git a/Core/Computation/NormalizingSpecularComputationTerm.cpp b/Core/Computation/NormalizingSpecularComputationTerm.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ed9c092c61b5472fb85b5b994dbe819fe5699d43
--- /dev/null
+++ b/Core/Computation/NormalizingSpecularComputationTerm.cpp
@@ -0,0 +1,22 @@
+#include "NormalizingSpecularComputationTerm.h"
+#include "SimulationElement.h"
+#include "IFresnelMap.h"
+#include "ILayerRTCoefficients.h"
+
+NormalizingSpecularComputationTerm::NormalizingSpecularComputationTerm(const MultiLayer* p_multi_layer,
+ const IFresnelMap* p_fresnel_map)
+ : SpecularComputationTerm(p_multi_layer, p_fresnel_map)
+{}
+
+void NormalizingSpecularComputationTerm::evalSingle(const std::vector<SimulationElement>::iterator& iter) const
+{
+ complex_t R = mp_fresnel_map->getInCoefficients(*iter, 0)->getScalarR();
+ double sin_alpha_i = std::abs(std::sin(iter->getAlphaI()));
+ if (sin_alpha_i == 0.0)
+ sin_alpha_i = 1.0;
+ const double solid_angle = iter->getSolidAngle();
+ if (solid_angle <= 0.0)
+ return;
+ const double intensity = std::norm(R) * sin_alpha_i / solid_angle;
+ iter->setIntensity(intensity);
+}
diff --git a/Core/Computation/NormalizingSpecularComputationTerm.h b/Core/Computation/NormalizingSpecularComputationTerm.h
new file mode 100644
index 0000000000000000000000000000000000000000..27856f3ee71acd754142c7f5ceb7b022d9342054
--- /dev/null
+++ b/Core/Computation/NormalizingSpecularComputationTerm.h
@@ -0,0 +1,35 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/Computation/NormalizingSpecularComputationTerm.h
+//! @brief Defines class NormalizingSpecularComputationTerm.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @authors Scientific Computing Group at MLZ Garching
+//! @authors M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
+#ifndef NORMALIZINGSPECULARCOMPUTATIONTERM_H
+#define NORMALIZINGSPECULARCOMPUTATIONTERM_H
+
+#include "SpecularComputationTerm.h"
+
+//! Computes the specular scattering.
+//! Used by DWBAComputation. Differs from SpecularComputationTerm by multilying intensity by
+//! normalization factor \f$sin \alpha / \Omega\f$.
+//! @ingroup algorithms_internal
+
+class NormalizingSpecularComputationTerm final : public SpecularComputationTerm
+{
+public:
+ NormalizingSpecularComputationTerm(const MultiLayer* p_multi_layer, const IFresnelMap* p_fresnel_map);
+
+private:
+ virtual void evalSingle(const std::vector<SimulationElement>::iterator& iter) const override;
+};
+
+#endif // NORMALIZINGSPECULARCOMPUTATIONTERM_H
diff --git a/Core/Computation/SpecularComputation.cpp b/Core/Computation/SpecularComputation.cpp
index 7392d9f6066eb6eac6e2690a95d3eb96faf6c61c..da6bb354239185e96b4adb286b2d44f7fb456a47 100644
--- a/Core/Computation/SpecularComputation.cpp
+++ b/Core/Computation/SpecularComputation.cpp
@@ -1,47 +1,55 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/Computation/SpecularComputation.cpp
-//! @brief Implements class SpecularComputation.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2016
-//! @authors Scientific Computing Group at MLZ Garching
-//! @authors M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
-//
-// ************************************************************************** //
-
#include "SpecularComputation.h"
-#include "SimulationElement.h"
+#include "Layer.h"
#include "IFresnelMap.h"
-#include "ILayerRTCoefficients.h"
+#include "MatrixFresnelMap.h"
#include "MultiLayer.h"
+#include "ScalarFresnelMap.h"
+#include "ProgressHandler.h"
+#include "SimulationElement.h"
+#include "SpecularComputationTerm.h"
+
+static_assert(std::is_copy_constructible<SpecularComputation>::value == false,
+ "SpecularComputation should not be copy constructible");
+static_assert(std::is_copy_assignable<SpecularComputation>::value == false,
+ "SpecularComputation should not be copy assignable");
+
+SpecularComputation::SpecularComputation(const MultiLayer& multilayer,
+ const SimulationOptions& options,
+ ProgressHandler& progress,
+ const std::vector<SimulationElement>::iterator& begin_it,
+ const std::vector<SimulationElement>::iterator& end_it)
+ : IComputation(options, progress, begin_it, end_it, multilayer)
+{
+ mP_fresnel_map = createFresnelMap();
+ m_computation_term.reset(new SpecularComputationTerm(mP_multi_layer.get(), mP_fresnel_map.get()));
+}
-SpecularComputation::SpecularComputation(const MultiLayer* p_multi_layer,
- const IFresnelMap* p_fresnel_map)
- : IComputationTerm(p_multi_layer, p_fresnel_map)
-{}
+SpecularComputation::~SpecularComputation() = default;
-void SpecularComputation::eval(ProgressHandler*,
- const std::vector<SimulationElement>::iterator& begin_it,
- const std::vector<SimulationElement>::iterator& end_it) const
+void SpecularComputation::runProtected()
{
- if (mp_multilayer->requiresMatrixRTCoefficients())
+ if (!m_progress->alive())
return;
+ m_computation_term->eval(m_progress, m_begin_it, m_end_it);
+}
+
+std::unique_ptr<IFresnelMap> SpecularComputation::createFresnelMap()
+{
+ std::unique_ptr<IFresnelMap> P_result;
+
+ if (!mP_multi_layer->requiresMatrixRTCoefficients())
+ P_result.reset(new ScalarFresnelMap());
+ else
+ P_result.reset(new MatrixFresnelMap());
- for (auto it = begin_it; it != end_it; ++it) {
- if (it->containsSpecularWavevector()) {
- complex_t R = mp_fresnel_map->getInCoefficients(*it, 0)->getScalarR();
- double sin_alpha_i = std::abs(std::sin(it->getAlphaI()));
- if (sin_alpha_i==0.0)
- sin_alpha_i = 1.0;
- double solid_angle = it->getSolidAngle();
- if (solid_angle<=0.0)
- continue;
- double intensity = std::norm(R)*sin_alpha_i/solid_angle;
- it->setIntensity(intensity);
- }
- }
+ if (m_sim_options.isIntegrate())
+ P_result->disableCaching();
+
+ if (m_sim_options.useAvgMaterials())
+ throw std::runtime_error("Error in SpecularComputation::createFresnelMap: using averaged "
+ "materials is not implemented");
+
+ P_result->setMultilayer(*mP_multi_layer);
+ return P_result;
}
+
diff --git a/Core/Computation/SpecularComputation.h b/Core/Computation/SpecularComputation.h
index 16f8766312bfcacf611880cdbd139907c16103a6..0d97368d9383116fb1dac3530093a15750776d0a 100644
--- a/Core/Computation/SpecularComputation.h
+++ b/Core/Computation/SpecularComputation.h
@@ -3,33 +3,52 @@
// BornAgain: simulate and fit scattering at grazing incidence
//
//! @file Core/Computation/SpecularComputation.h
-//! @brief Defines class SpecularComputation.
+//! @brief Implements class SpecularComputation.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @copyright Forschungszentrum Jülich GmbH 2015
//! @authors Scientific Computing Group at MLZ Garching
-//! @authors M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @authors C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
//
// ************************************************************************** //
-#ifndef SPECULARCOMPUTATION_H
-#define SPECULARCOMPUTATION_H
+#ifndef SPECULARCOMPUTATION_H_
+#define SPECULARCOMPUTATION_H_
-#include "IComputationTerm.h"
+#include "IComputation.h"
+#include "Complex.h"
+#include "SimulationOptions.h"
-//! Computes the specular scattering.
-//! Used by DWBAComputation.
+class IFresnelMap;
+class MultiLayer;
+struct HomogeneousRegion;
+class IComputationTerm;
+class SpecularComputationTerm;
+
+//! Performs a single-threaded specular computation with given sample.
+//!
+//! Controlled by the multi-threading machinery in Simulation::runSingleSimulation().
+//!
//! @ingroup algorithms_internal
-class SpecularComputation final : public IComputationTerm
+class SpecularComputation : public IComputation
{
public:
- SpecularComputation(const MultiLayer* p_multi_layer, const IFresnelMap* p_fresnel_map);
+ SpecularComputation(const MultiLayer& multilayer, const SimulationOptions& options,
+ ProgressHandler& progress,
+ const std::vector<SimulationElement>::iterator& begin_it,
+ const std::vector<SimulationElement>::iterator& end_it);
+ virtual ~SpecularComputation();
+
+ void run();
+
+private:
+ virtual void runProtected() override;
+ std::unique_ptr<IFresnelMap> createFresnelMap();
- void eval(ProgressHandler* progress,
- const std::vector<SimulationElement>::iterator& begin_it,
- const std::vector<SimulationElement>::iterator& end_it) const override;
+ std::unique_ptr<IFresnelMap> mP_fresnel_map;
+ std::unique_ptr<SpecularComputationTerm> m_computation_term;
};
-#endif // SPECULARCOMPUTATION_H
+#endif /* SPECULARCOMPUTATION_H_ */
diff --git a/Core/Computation/SpecularComputationTerm.cpp b/Core/Computation/SpecularComputationTerm.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..954e51680477c30c66fd18e89a00290db2a720d1
--- /dev/null
+++ b/Core/Computation/SpecularComputationTerm.cpp
@@ -0,0 +1,29 @@
+#include "SpecularComputationTerm.h"
+#include "SimulationElement.h"
+#include "IFresnelMap.h"
+#include "ILayerRTCoefficients.h"
+#include "MultiLayer.h"
+
+SpecularComputationTerm::SpecularComputationTerm(const MultiLayer* p_multi_layer,
+ const IFresnelMap* p_fresnel_map)
+ : IComputationTerm(p_multi_layer, p_fresnel_map)
+{}
+
+void SpecularComputationTerm::eval(ProgressHandler*,
+ const std::vector<SimulationElement>::iterator& begin_it,
+ const std::vector<SimulationElement>::iterator& end_it) const
+{
+ if (mp_multilayer->requiresMatrixRTCoefficients())
+ return;
+
+ for (auto it = begin_it; it != end_it; ++it)
+ if (it->specularData())
+ evalSingle(it);
+}
+
+void SpecularComputationTerm::evalSingle(const std::vector<SimulationElement>::iterator& iter) const
+{
+ mp_fresnel_map->fillSpecularData(*iter);
+ const ILayerRTCoefficients& layer_data = (*iter->specularData())[0];
+ iter->setIntensity(std::norm(layer_data.getScalarR()));
+}
diff --git a/Core/Computation/SpecularComputationTerm.h b/Core/Computation/SpecularComputationTerm.h
new file mode 100644
index 0000000000000000000000000000000000000000..1f42108502df866eea0d93117feece43a0c1445d
--- /dev/null
+++ b/Core/Computation/SpecularComputationTerm.h
@@ -0,0 +1,38 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/Computation/SpecularComputationTerm.h
+//! @brief Defines class SpecularComputationTerm.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @authors Scientific Computing Group at MLZ Garching
+//! @authors M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//
+// ************************************************************************** //
+
+#ifndef SPECULARCOMPUTATIONTERM_H_
+#define SPECULARCOMPUTATIONTERM_H_
+
+#include "IComputationTerm.h"
+
+//! Computes the specular scattering.
+//! Used by SpecularComputation.
+//! @ingroup algorithms_internal
+
+class SpecularComputationTerm : public IComputationTerm
+{
+public:
+ SpecularComputationTerm(const MultiLayer* p_multi_layer, const IFresnelMap* p_fresnel_map);
+
+ virtual void eval(ProgressHandler* progress,
+ const std::vector<SimulationElement>::iterator& begin_it,
+ const std::vector<SimulationElement>::iterator& end_it) const override;
+
+private:
+ virtual void evalSingle(const std::vector<SimulationElement>::iterator& iter) const;
+};
+
+#endif /* SPECULARCOMPUTATIONTERM_H_ */
diff --git a/Core/Instrument/IDetector2D.cpp b/Core/Instrument/IDetector2D.cpp
index d4e807e8b1f53fddc96152f8ce2f6e57e3697793..7f933e97896b54bca6aa310d5fcfddb349fa47e8 100644
--- a/Core/Instrument/IDetector2D.cpp
+++ b/Core/Instrument/IDetector2D.cpp
@@ -111,7 +111,7 @@ std::vector<SimulationElement> IDetector2D::createSimulationElements(const Beam
sim_element.setPolarization(beam_polarization);
sim_element.setAnalyzerOperator(analyzer_operator);
if (it.index()==spec_index) {
- sim_element.setSpecular(true);
+ sim_element.setSpecular();
}
result.push_back(std::move(sim_element));
}
diff --git a/Core/Instrument/SpecularDetector1D.cpp b/Core/Instrument/SpecularDetector1D.cpp
index bb6013eaa643ec12a7b048dbf1577e530eb1821e..5aa6d7bd47c051a8a9322a4e28d626a190a00efc 100644
--- a/Core/Instrument/SpecularDetector1D.cpp
+++ b/Core/Instrument/SpecularDetector1D.cpp
@@ -80,7 +80,7 @@ std::vector<SimulationElement> SpecularDetector1D::createSimulationElements(cons
std::make_unique<SpecularPixel>(alpha_i));
sim_element.setPolarization(beam_polarization);
sim_element.setAnalyzerOperator(analyzer_operator);
- sim_element.setSpecular(true);
+ sim_element.setSpecular();
result.push_back(std::move(sim_element));
}
diff --git a/Core/Material/MaterialBySLDImpl.h b/Core/Material/MaterialBySLDImpl.h
index e7d3df780922eecabe33756eda7ad6d0f8387eb0..9b732f207f75a928bab7092f3d487c64f618e4c8 100644
--- a/Core/Material/MaterialBySLDImpl.h
+++ b/Core/Material/MaterialBySLDImpl.h
@@ -25,7 +25,8 @@
class BA_CORE_API_ MaterialBySLDImpl : public MagneticMaterialImpl
{
public:
- friend BA_CORE_API_ Material MaterialBySLD(const std::string&, double, double, kvector_t);
+ friend BA_CORE_API_ Material MaterialBySLD(const std::string& name, double sld, double abs_term,
+ kvector_t magnetization);
virtual ~MaterialBySLDImpl() = default;
diff --git a/Core/Material/MaterialFactoryFuncs.h b/Core/Material/MaterialFactoryFuncs.h
index 7bbd47200756462a2d5d93aabb9a21b07a7c635e..052c28d08ed8af308249f24110af618fc7cfba80 100644
--- a/Core/Material/MaterialFactoryFuncs.h
+++ b/Core/Material/MaterialFactoryFuncs.h
@@ -22,23 +22,24 @@ struct HomogeneousRegion;
//! @ingroup materials
-//! Constructs a material with _name_ and _refractive_index_.
-//! @param magnetization: magnetization (in A/m)
-BA_CORE_API_ Material HomogeneousMaterial(const std::string& name, complex_t refractive_index,
- kvector_t magnetization = kvector_t());
+BA_CORE_API_ Material HomogeneousMaterial();
//! @ingroup materials
-//! Constructs a material with _name_ and refractive_index parameters
-//! \f$\delta\f$ and \f$\beta\f$ for refractive index \f$n = 1 - \delta + i \beta\f$.
-//! @param magnetization: magnetization (in A/m)
BA_CORE_API_ Material HomogeneousMaterial(const std::string& name, double delta, double beta,
kvector_t magnetization = kvector_t());
//! @ingroup materials
-//! Constructs material with zero refractive coefficients and zero magnetization.
-BA_CORE_API_ Material HomogeneousMaterial();
+//! Constructs a material with _name_, _refractive_index_ and _magnetization_ (in A/m). Alternatively,
+//! \f$\delta\f$ and \f$\beta\f$ for refractive index \f$n = 1 - \delta + i \beta\f$ can be passed directly.
+//! With no parameters given, constructs default (vacuum) material with \f$n = 1\f$ and zero magnetization.
+BA_CORE_API_ Material HomogeneousMaterial(const std::string& name, complex_t refractive_index,
+ kvector_t magnetization = kvector_t());
+
+//! @ingroup materials
+
+BA_CORE_API_ Material MaterialBySLD();
//! @ingroup materials
@@ -48,7 +49,9 @@ BA_CORE_API_ Material HomogeneousMaterial();
//! \f$ SLD = (N b_{coh}, N \sigma_{abs}(\lambda_0) / \lambda_0) \f$
//! Here \f$ N \f$ - material number density,
//! \f$ b_{coh} \f$ - bound coherent scattering length
-//! \f$ \sigma_{abs}(\lambda_0) \f$ - absorption cross-section at \f$ \lambda_0 \f$ wavelength
+//! \f$ \sigma_{abs}(\lambda_0) \f$ - absorption cross-section at \f$ \lambda_0 \f$ wavelength.
+//! With no parameters given, constructs default (vacuum) material with zero sld and zero magnetization.
+//! @param name: material name
//! @param sld: scattering length density, \f$ nm^{-2} \f$
//! @param abs_term: wavelength-independent absorptive term, \f$ nm^{-2} \f$
//! @param magnetization: magnetization (in A/m)
@@ -61,6 +64,7 @@ BA_CORE_API_ Material MaterialBySLD(const std::string& name, double sld, double
//! As opposed to MaterialBySLD, absorptive term is the product of number density and
//! absorptive cross-section \f$ \sigma_0 \f$ at \f$ \lambda = 1.798197\f$ Angstroms.
//! The latter corresponds to 2200 m/s neutrons.
+//! @param name: material name
//! @param sld: scattering length density, \f$ nm^{-2} \f$
//! @param abs_cx: absorptive term at \f$ \lambda = 1.798197\f$ Angstroms, \f$ nm^{-1} \f$
//! @param magnetization: magnetization (in A/m)
@@ -69,11 +73,6 @@ BA_CORE_API_ Material MaterialByAbsCX(const std::string& name, double sld, doubl
//! @ingroup materials
-//! Constructs wavelength-independent material with zero sld and zero magnetization.
-BA_CORE_API_ Material MaterialBySLD();
-
-//! @ingroup materials
-
//! Creates averaged material. Square refractive index of returned material is arithmetic mean over
//! _regions_ and _layer_mat_. Magnetization (if present) is averaged linearly.
BA_CORE_API_ Material createAveragedMaterial(const Material& layer_mat, const std::vector<HomogeneousRegion>& regions);
diff --git a/Core/Multilayer/IFresnelMap.h b/Core/Multilayer/IFresnelMap.h
index ab72fc3cf60fca0955c3367ab96c0fd1494a9a7c..63df5a4deac5454fff120cbd3cf537b4c4bb3c9a 100644
--- a/Core/Multilayer/IFresnelMap.h
+++ b/Core/Multilayer/IFresnelMap.h
@@ -43,6 +43,9 @@ public:
virtual const ILayerRTCoefficients* getInCoefficients(
const SimulationElement& sim_element, size_t layer_index) const =0;
+ //! Fills simulation element specular data
+ virtual void fillSpecularData(SimulationElement& sim_element) const = 0;
+
//! Sets the multilayer to be used for the Fresnel calculations.
virtual void setMultilayer(const MultiLayer& multilayer);
diff --git a/Core/Multilayer/MatrixFresnelMap.cpp b/Core/Multilayer/MatrixFresnelMap.cpp
index 6ecc004a8bc67f0cf600b842e112bcf418cd0ae5..546bebf2d4cbc2e61d86e202d4a648247f58258c 100644
--- a/Core/Multilayer/MatrixFresnelMap.cpp
+++ b/Core/Multilayer/MatrixFresnelMap.cpp
@@ -23,52 +23,50 @@
namespace {
std::vector<MatrixRTCoefficients> calculateCoefficients(const MultiLayer& multilayer,
kvector_t kvec);
+
+const std::vector<MatrixRTCoefficients>&
+getCoefficientsFromCache(kvector_t kvec, const MultiLayer& multilayer,
+ MatrixFresnelMap::CoefficientHash& hash_table);
}
-MatrixFresnelMap::MatrixFresnelMap()
-{}
+MatrixFresnelMap::MatrixFresnelMap() = default;
-MatrixFresnelMap::~MatrixFresnelMap()
-{}
+MatrixFresnelMap::~MatrixFresnelMap() = default;
-const ILayerRTCoefficients* MatrixFresnelMap::getOutCoefficients(
- const SimulationElement& sim_element, size_t layer_index) const
+const ILayerRTCoefficients*
+MatrixFresnelMap::getOutCoefficients(const SimulationElement& sim_element, size_t layer_index) const
{
- kvector_t kvec = -sim_element.getMeanKf();
- if (!m_use_cache) {
- auto coeffs { calculateCoefficients(*mP_inverted_multilayer, kvec) };
- return new MatrixRTCoefficients(coeffs[layer_index]);
- }
- MatrixRTCoefficients* result;
- auto it = m_hash_table_out.find(kvec);
- if (it != m_hash_table_out.end())
- result = new MatrixRTCoefficients(it->second[layer_index]);
- else {
- auto coeffs { calculateCoefficients(*mP_inverted_multilayer, kvec) };
- result = new MatrixRTCoefficients(coeffs[layer_index]);
- m_hash_table_out[kvec] = std::move(coeffs);
- }
- return result;
+ return getCoefficients(-sim_element.getMeanKf(), layer_index, *mP_inverted_multilayer,
+ m_hash_table_out);
+}
+
+const ILayerRTCoefficients*
+MatrixFresnelMap::getInCoefficients(const SimulationElement& sim_element, size_t layer_index) const
+{
+ return getCoefficients(sim_element.getKi(), layer_index, *mP_multilayer, m_hash_table_in);
}
-const ILayerRTCoefficients* MatrixFresnelMap::getInCoefficients(
- const SimulationElement& sim_element, size_t layer_index) const
+void MatrixFresnelMap::fillSpecularData(SimulationElement& sim_element) const
+{
+ const auto& kvec = sim_element.getKi();
+ std::vector<MatrixRTCoefficients> coef_vector;
+ if (m_use_cache)
+ coef_vector = getCoefficientsFromCache(kvec, *mP_multilayer, m_hash_table_in);
+ else
+ coef_vector = calculateCoefficients(*mP_multilayer, kvec);
+ sim_element.setSpecular(std::make_unique<SpecularData>(std::move(coef_vector)));
+}
+
+const ILayerRTCoefficients* MatrixFresnelMap::getCoefficients(kvector_t kvec, size_t layer_index,
+ const MultiLayer& multilayer,
+ CoefficientHash& hash_table) const
{
- kvector_t kvec = sim_element.getKi();
if (!m_use_cache) {
- auto coeffs { calculateCoefficients(*mP_multilayer, kvec) };
+ auto coeffs = calculateCoefficients(multilayer, kvec);
return new MatrixRTCoefficients(coeffs[layer_index]);
}
- MatrixRTCoefficients* result;
- auto it = m_hash_table_in.find(kvec);
- if (it != m_hash_table_in.end())
- result = new MatrixRTCoefficients(it->second[layer_index]);
- else {
- auto coeffs { calculateCoefficients(*mP_multilayer, kvec) };
- result = new MatrixRTCoefficients(coeffs[layer_index]);
- m_hash_table_in[kvec] = std::move(coeffs);
- }
- return result;
+ const auto& coef_vector = getCoefficientsFromCache(kvec, multilayer, hash_table);
+ return new MatrixRTCoefficients(coef_vector[layer_index]);
}
void MatrixFresnelMap::setMultilayer(const MultiLayer& multilayer)
@@ -85,5 +83,15 @@ std::vector<MatrixRTCoefficients> calculateCoefficients(const MultiLayer& multil
SpecularMagnetic::execute(multilayer, kvec, coeffs);
return coeffs;
}
+
+const std::vector<MatrixRTCoefficients>&
+getCoefficientsFromCache(kvector_t kvec, const MultiLayer& multilayer,
+ MatrixFresnelMap::CoefficientHash& hash_table)
+{
+ auto it = hash_table.find(kvec);
+ if (it == hash_table.end())
+ it = hash_table.insert({kvec, calculateCoefficients(multilayer, kvec)}).first;
+ return it->second;
+}
}
diff --git a/Core/Multilayer/MatrixFresnelMap.h b/Core/Multilayer/MatrixFresnelMap.h
index b74b12feea9c9572197f476ddffac5f73a79d9c1..bbbb5cd6520f4e09c02d5abd9a91e6a5fe7deb6f 100644
--- a/Core/Multilayer/MatrixFresnelMap.h
+++ b/Core/Multilayer/MatrixFresnelMap.h
@@ -34,22 +34,30 @@ class BA_CORE_API_ MatrixFresnelMap : public IFresnelMap
{
public:
MatrixFresnelMap();
- ~MatrixFresnelMap() final;
+ virtual ~MatrixFresnelMap();
- const ILayerRTCoefficients* getOutCoefficients(
+ virtual const ILayerRTCoefficients* getOutCoefficients(
const SimulationElement& sim_element, size_t layer_index) const final override;
- const ILayerRTCoefficients* getInCoefficients(
+ virtual const ILayerRTCoefficients* getInCoefficients(
const SimulationElement& sim_element, size_t layer_index) const final override;
void setMultilayer(const MultiLayer& multilayer) final override;
+ //! Fills simulation element specular data
+ virtual void fillSpecularData(SimulationElement& sim_element) const override;
+
+ typedef std::unordered_map<kvector_t, std::vector<MatrixRTCoefficients>, HashKVector>
+ CoefficientHash;
+
private:
+ const ILayerRTCoefficients* getCoefficients(kvector_t kvec, size_t layer_index,
+ const MultiLayer& multilayer,
+ CoefficientHash& hash_table) const;
+
std::unique_ptr<MultiLayer> mP_inverted_multilayer;
- mutable std::unordered_map<kvector_t, std::vector<MatrixRTCoefficients>,
- HashKVector> m_hash_table_out;
- mutable std::unordered_map<kvector_t, std::vector<MatrixRTCoefficients>,
- HashKVector> m_hash_table_in;
+ mutable CoefficientHash m_hash_table_out;
+ mutable CoefficientHash m_hash_table_in;
};
#endif // MATRIXFRESNELMAP_H
diff --git a/Core/Multilayer/MultiLayer.cpp b/Core/Multilayer/MultiLayer.cpp
index 8534310ac90b07f8b3607efc6b31e63469464774..2b412b4e838dc03ee2f1eab48c82bfe5e1334a3d 100644
--- a/Core/Multilayer/MultiLayer.cpp
+++ b/Core/Multilayer/MultiLayer.cpp
@@ -53,10 +53,10 @@ MultiLayer* MultiLayer::cloneInvertB() const
return genericClone( [](const Layer* p_layer) { return p_layer->cloneInvertB(); } );
}
-MultiLayer* MultiLayer::cloneSliced(bool use_average_layers) const
+std::unique_ptr<MultiLayer> MultiLayer::cloneSliced(bool use_average_layers) const
{
if (!use_average_layers || numberOfLayers()==0)
- return clone();
+ return std::unique_ptr<MultiLayer>(clone());
auto layer_limits = calculateLayerZLimits();
std::unique_ptr<MultiLayer> P_result(new MultiLayer());
P_result->setCrossCorrLength(crossCorrLength());
@@ -80,7 +80,7 @@ MultiLayer* MultiLayer::cloneSliced(bool use_average_layers) const
for (size_t j=1; j<sliced_layers.size(); ++j)
P_result->addLayer(*sliced_layers[j]);
}
- return P_result.release();
+ return P_result;
}
//! Returns pointer to the top interface of the layer.
diff --git a/Core/Multilayer/MultiLayer.h b/Core/Multilayer/MultiLayer.h
index a7cc1a5deed4ca64329425ebe10aa42700371cec..1efd0fa97f75f07a5a3dfd543f6a06777d0f0027 100644
--- a/Core/Multilayer/MultiLayer.h
+++ b/Core/Multilayer/MultiLayer.h
@@ -93,9 +93,11 @@ public:
//! Returns a clone with inverted magnetic fields
MultiLayer* cloneInvertB() const;
+#ifndef SWIG
//! Returns a clone of multilayer where the original layers may be sliced into several sublayers
//! for usage with the graded layer approximation
- MultiLayer* cloneSliced(bool use_average_layers) const;
+ std::unique_ptr<MultiLayer> cloneSliced(bool use_average_layers) const;
+#endif // SWIG
//! Sets cross correlation length of roughnesses between interfaces
void setCrossCorrLength(double crossCorrLength);
diff --git a/Core/Multilayer/ScalarFresnelMap.cpp b/Core/Multilayer/ScalarFresnelMap.cpp
index 54729f4a64a2445294a7f7cbb6f52803e9a37b56..1276f51cf72a1ae22bd5bcf6238159e7657f22c8 100644
--- a/Core/Multilayer/ScalarFresnelMap.cpp
+++ b/Core/Multilayer/ScalarFresnelMap.cpp
@@ -42,24 +42,36 @@ const ILayerRTCoefficients* ScalarFresnelMap::getInCoefficients(
return getCoefficients(sim_element.getKi(), layer_index);
}
+void ScalarFresnelMap::fillSpecularData(SimulationElement& sim_element) const
+{
+ const auto& kvec = sim_element.getKi();
+ std::vector<ScalarRTCoefficients> coef_vector;
+ if (m_use_cache)
+ coef_vector = getCoefficientsFromCache(kvec);
+ else
+ coef_vector = calculateCoefficients(*mP_multilayer, kvec);
+ sim_element.setSpecular(std::make_unique<SpecularData>(std::move(coef_vector)));
+}
+
const ScalarRTCoefficients* ScalarFresnelMap::getCoefficients(
kvector_t kvec, size_t layer_index) const
{
if (!m_use_cache) {
- auto coeffs { calculateCoefficients(*mP_multilayer, kvec) };
+ auto coeffs = calculateCoefficients(*mP_multilayer, kvec);
return new ScalarRTCoefficients(coeffs[layer_index]);
}
- ScalarRTCoefficients* result;
+ const auto& coef_vector = getCoefficientsFromCache(kvec);
+ return new ScalarRTCoefficients(coef_vector[layer_index]);
+}
+
+const std::vector<ScalarRTCoefficients>&
+ScalarFresnelMap::getCoefficientsFromCache(kvector_t kvec) const
+{
std::pair<double, double> k2_theta(kvec.mag2(), kvec.theta());
auto it = m_hash_table.find(k2_theta);
- if (it != m_hash_table.end())
- result = new ScalarRTCoefficients(it->second[layer_index]);
- else {
- auto coeffs { calculateCoefficients(*mP_multilayer, kvec) };
- result = new ScalarRTCoefficients(coeffs[layer_index]);
- m_hash_table[k2_theta] = std::move(coeffs);
- }
- return result;
+ if (it == m_hash_table.end())
+ it = m_hash_table.insert({k2_theta, calculateCoefficients(*mP_multilayer, kvec)}).first;
+ return it->second;
}
namespace {
diff --git a/Core/Multilayer/ScalarFresnelMap.h b/Core/Multilayer/ScalarFresnelMap.h
index 10ba4328ef5df4e89de5515859f49f38d68019aa..9f258660425cca80f530b5df5f5b6d3d4ee2e0e8 100644
--- a/Core/Multilayer/ScalarFresnelMap.h
+++ b/Core/Multilayer/ScalarFresnelMap.h
@@ -38,14 +38,19 @@ public:
ScalarFresnelMap();
~ScalarFresnelMap() final;
- const ILayerRTCoefficients* getOutCoefficients (
+ virtual const ILayerRTCoefficients* getOutCoefficients (
const SimulationElement& sim_element, size_t layer_index) const final override;
- const ILayerRTCoefficients* getInCoefficients(
+ virtual const ILayerRTCoefficients* getInCoefficients(
const SimulationElement& sim_element, size_t layer_index) const final override;
+ //! Fills simulation element specular data
+ virtual void fillSpecularData(SimulationElement& sim_element) const override;
+
private:
const ScalarRTCoefficients* getCoefficients(kvector_t kvec, size_t layer_index) const;
+ const std::vector<ScalarRTCoefficients>& getCoefficientsFromCache(kvector_t kvec) const;
+
mutable std::unordered_map<std::pair<double, double>, std::vector<ScalarRTCoefficients>,
Hash2Doubles> m_hash_table;
};
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index 43b502c8dab36de74d494db6257e494cb40a0444..f43a18db40bd1c26bb6a33181d40a51d91769f6e 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -124,11 +124,6 @@ GISASSimulation::GISASSimulation(const GISASSimulation& other)
initialize();
}
-void GISASSimulation::initSimulationElementVector()
-{
- m_sim_elements = m_instrument.createSimulationElements();
-}
-
void GISASSimulation::transferResultsToIntensityMap() {}
void GISASSimulation::updateIntensityMap() {}
diff --git a/Core/Simulation/GISASSimulation.h b/Core/Simulation/GISASSimulation.h
index debfd410f6adc8bb5624c880f3a9057f2ef4f022..2388d2a51fb17d25b63ab44d206f259dd3716ac9 100644
--- a/Core/Simulation/GISASSimulation.h
+++ b/Core/Simulation/GISASSimulation.h
@@ -92,9 +92,6 @@ protected:
private:
GISASSimulation(const GISASSimulation& other);
- //! Initializes the vector of Simulation elements
- void initSimulationElementVector() final;
-
//! Creates the appropriate data structure (e.g. 2D intensity map) from the calculated
//! SimulationElement objects
void transferResultsToIntensityMap() final;
diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp
index 5ab1b15873492e265597d8791757948836ca35a9..ccb125bfe64591fa02db3180376f96d073e0d3bb 100644
--- a/Core/Simulation/Simulation.cpp
+++ b/Core/Simulation/Simulation.cpp
@@ -50,6 +50,7 @@ Simulation::Simulation(const Simulation& other)
, m_options(other.m_options)
, m_distribution_handler(other.m_distribution_handler)
, m_progress(other.m_progress)
+ , m_sim_elements(other.m_sim_elements)
, m_instrument(other.m_instrument)
{
if (other.mP_background)
@@ -208,16 +209,14 @@ void Simulation::addParameterDistribution(const ParameterDistribution& par_distr
m_distribution_handler.addParameterDistribution(par_distr);
}
-void Simulation::updateSample()
+void Simulation::initSimulationElementVector()
{
- m_sample_provider.updateSample();
+ m_sim_elements = m_instrument.createSimulationElements();
}
-std::unique_ptr<IComputation> Simulation::generateSingleThreadedComputation(
- std::vector<SimulationElement>::iterator,
- std::vector<SimulationElement>::iterator)
+void Simulation::updateSample()
{
- return {};
+ m_sample_provider.updateSample();
}
//! Runs a single simulation with fixed parameter values.
diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h
index 92cb6c7b1449843637d06838a118509f50f7ee9c..37a5bd581b488b04d0ac700535a97d16ca708ee9 100644
--- a/Core/Simulation/Simulation.h
+++ b/Core/Simulation/Simulation.h
@@ -49,7 +49,7 @@ public:
virtual void prepareSimulation();
//! Run a simulation, possibly averaged over parameter distributions
- virtual void runSimulation();
+ void runSimulation();
void setInstrument(const Instrument& instrument);
const Instrument& getInstrument() const { return m_instrument; }
@@ -98,7 +98,8 @@ public:
protected:
Simulation(const Simulation& other);
- virtual void initSimulationElementVector() =0;
+ //! Initializes the vector of Simulation elements
+ virtual void initSimulationElementVector();
//! Creates the appropriate data structure (e.g. 2D intensity map) from the calculated
//! SimulationElement objects
@@ -110,19 +111,17 @@ protected:
//! Generate a single threaded computation for a given range of SimulationElement's
virtual std::unique_ptr<IComputation> generateSingleThreadedComputation(
std::vector<SimulationElement>::iterator start,
- std::vector<SimulationElement>::iterator end);
+ std::vector<SimulationElement>::iterator end) = 0;
void runSingleSimulation();
virtual void updateIntensityMap() =0;
-#ifndef SWIG
- void normalize(std::vector<SimulationElement>::iterator begin_it,
+ virtual void normalize(std::vector<SimulationElement>::iterator begin_it,
std::vector<SimulationElement>::iterator end_it) const;
void addBackGroundIntensity(std::vector<SimulationElement>::iterator begin_it,
std::vector<SimulationElement>::iterator end_it) const;
-#endif
//! Returns the start iterator of simulation elements for the current batch
std::vector<SimulationElement>::iterator getBatchStart(int n_batches, int current_batch);
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index fd7122ef8cd277ed5318f377f8362fc7d544eb84..f2d71ad045316bc7aedbe221f9be2071dff9e303 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -19,7 +19,9 @@
#include "SpecularMatrix.h"
#include "MaterialUtils.h"
#include "Histogram1D.h"
-#include <memory>
+#include "SimulationElement.h"
+#include "SpecularComputation.h"
+#include "SpecularDetector1D.h"
SpecularSimulation::SpecularSimulation() : Simulation()
{
@@ -40,12 +42,11 @@ SpecularSimulation::SpecularSimulation(const std::shared_ptr<IMultiLayerBuilder>
SpecularSimulation::SpecularSimulation(const SpecularSimulation& other)
: Simulation(other)
{
- if (other.m_alpha_i_axis)
- m_alpha_i_axis.reset(other.m_alpha_i_axis->clone());
- m_RT_coefficients.copyFrom(other.m_RT_coefficients);
initialize();
}
+SpecularSimulation::~SpecularSimulation() = default;
+
SpecularSimulation* SpecularSimulation::clone() const
{
return new SpecularSimulation(*this);
@@ -53,38 +54,18 @@ SpecularSimulation* SpecularSimulation::clone() const
void SpecularSimulation::prepareSimulation()
{
- if (!m_alpha_i_axis || m_alpha_i_axis->size() < 1)
- throw std::runtime_error("Error in SpecularSimulation::prepareSimulation(): "
- "Incoming alpha range not configured.");
-
Simulation::prepareSimulation();
- m_RT_coefficients.clear();
- m_RT_coefficients.addAxis(*m_alpha_i_axis);
-}
-
-void SpecularSimulation::runSimulation()
-{
- prepareSimulation();
-
- const MultiLayer* multilayer = m_sample_provider.sample();
- multilayer->requiresMatrixRTCoefficients() ? collectRTCoefficientsMatrix(multilayer)
- : collectRTCoefficientsScalar(multilayer);
}
size_t SpecularSimulation::numberOfSimulationElements() const
{
- if (!m_alpha_i_axis)
- std::runtime_error("Error in SpecularSimulation::numberOfSimulationElements:"
- "angle range was not initialized.");
- return m_alpha_i_axis->size();
+ return getInstrument().getDetector()->numberOfSimulationElements();
}
void SpecularSimulation::setBeamParameters(double lambda, const IAxis& alpha_axis, double phi_i)
{
- if (alpha_axis.size() < 1)
- throw std::runtime_error("Error in SpecularSimulation::setBeamParameters(): "
- "incoming angle range size < 1.");
- m_alpha_i_axis.reset(alpha_axis.clone());
+ SpecularDetector1D detector(alpha_axis);
+ m_instrument.setDetector(detector);
m_instrument.setBeamParameters(lambda, alpha_axis[0], phi_i);
}
@@ -97,114 +78,107 @@ void SpecularSimulation::setBeamParameters(double lambda, int nbins, double alph
const IAxis* SpecularSimulation::getAlphaAxis() const
{
- return m_alpha_i_axis.get();
+ return &m_instrument.getDetector()->getAxis(0);
+}
+
+std::vector<complex_t> SpecularSimulation::getData(size_t i_layer, DataGetter fn_ptr) const
+{
+ validityCheck(i_layer);
+ std::vector<complex_t> result;
+ const size_t data_size = m_sim_elements.size();
+ result.resize(data_size);
+ for (size_t i = 0; i < data_size; ++i) {
+ const SpecularData* specular_data = m_sim_elements[i].specularData();
+ result[i] = ((*specular_data)[i_layer].*fn_ptr)();
+ }
+ return result;
}
std::unique_ptr<OutputData<double>>
-SpecularSimulation::getData(size_t i_layer, DataGetter fn_ptr) const
+SpecularSimulation::getDataByAbsValue(size_t i_layer, DataGetter fn_ptr) const
{
- checkCoefficients(i_layer);
std::unique_ptr<OutputData<double>> output_ptr = std::make_unique<OutputData<double>>();
- output_ptr->copyShapeFrom(m_RT_coefficients);
+ output_ptr->addAxis(*getAlphaAxis());
+ const std::vector<complex_t> complex_data = getData(i_layer, fn_ptr);
OutputData<double>& output = *output_ptr.get();
- for (size_t i = 0; i < m_RT_coefficients.getAllocatedSize(); ++i)
- output[i] = std::norm((m_RT_coefficients[i][i_layer].get()->*fn_ptr)());
+ for (size_t i = 0; i < complex_data.size(); ++i)
+ output[i] = std::norm(complex_data[i]);
return output_ptr;
}
-OutputData<double>* SpecularSimulation::getDetectorIntensity(AxesUnits) const
+std::unique_ptr<IComputation> SpecularSimulation::generateSingleThreadedComputation(
+ std::vector<SimulationElement>::iterator start, std::vector<SimulationElement>::iterator end)
+{
+ return std::make_unique<SpecularComputation>(*sample(), m_options, m_progress, start, end);
+}
+
+OutputData<double>* SpecularSimulation::getDetectorIntensity(AxesUnits units_type) const
{
- return getData(0, &ILayerRTCoefficients::getScalarR).release();
+ const size_t i_layer = 0; // detector intensity is proportional to reflectivity from the zeroth layer
+ validityCheck(i_layer);
+ return m_instrument.createDetectorIntensity(m_sim_elements, units_type);
}
Histogram1D* SpecularSimulation::reflectivity() const
{
- return new Histogram1D(*getData(0, &ILayerRTCoefficients::getScalarR).get());
+ return new Histogram1D(*getDataByAbsValue(0, &ILayerRTCoefficients::getScalarR));
}
Histogram1D* SpecularSimulation::transmissivity() const
{
- const size_t i_layer = m_RT_coefficients.isInitialized() && m_RT_coefficients[0].size() != 0
- ? static_cast<size_t>(m_RT_coefficients[0].size() - 1)
- : 0;
- return new Histogram1D(*getData(i_layer, &ILayerRTCoefficients::getScalarT).get());
+ const MultiLayer* current_sample = sample();
+ const size_t i_layer = current_sample ? static_cast<size_t>(current_sample->numberOfLayers() - 1) : 0;
+ return new Histogram1D(*getDataByAbsValue(i_layer, &ILayerRTCoefficients::getScalarT));
}
std::vector<complex_t> SpecularSimulation::getScalarR(size_t i_layer) const
{
- checkCoefficients(i_layer);
- std::vector<complex_t> result;
- result.resize(m_RT_coefficients.getAllocatedSize());
- for (size_t i = 0; i < m_RT_coefficients.getAllocatedSize(); ++i) {
- result[i] = m_RT_coefficients[i][i_layer]->getScalarR();
- }
- return result;
+ return getData(i_layer, &ILayerRTCoefficients::getScalarR);
}
std::vector<complex_t> SpecularSimulation::getScalarT(size_t i_layer) const
{
- checkCoefficients(i_layer);
- std::vector<complex_t> result;
- result.resize(m_RT_coefficients.getAllocatedSize());
- for (size_t i = 0; i < m_RT_coefficients.getAllocatedSize(); ++i) {
- result[i] = m_RT_coefficients[i][i_layer]->getScalarT();
- }
- return result;
+ return getData(i_layer, &ILayerRTCoefficients::getScalarT);
}
std::vector<complex_t> SpecularSimulation::getScalarKz(size_t i_layer) const
{
- checkCoefficients(i_layer);
- std::vector<complex_t> result;
- result.resize(m_RT_coefficients.getAllocatedSize());
- for (size_t i = 0; i < m_RT_coefficients.getAllocatedSize(); ++i) {
- result[i] = m_RT_coefficients[i][i_layer]->getScalarKz();
- }
- return result;
+ return getData(i_layer, &ILayerRTCoefficients::getScalarKz);
}
-void SpecularSimulation::collectRTCoefficientsScalar(const MultiLayer *multilayer)
+void SpecularSimulation::normalize(std::vector<SimulationElement>::iterator begin_it,
+ std::vector<SimulationElement>::iterator end_it) const
{
- OutputData<MultiLayerRTCoefficients_t>::iterator it = m_RT_coefficients.begin();
- while (it != m_RT_coefficients.end()) {
- double alpha_i = m_RT_coefficients.getAxisValue(it.getIndex(), 0);
- kvector_t kvec = vecOfLambdaAlphaPhi(m_instrument.getBeam().getWavelength(), -alpha_i, 0.0);
-
- std::vector<ScalarRTCoefficients> coeffs;
- SpecularMatrix::execute(*multilayer, kvec, coeffs);
-
- MultiLayerRTCoefficients_t ml_coeffs;
- ml_coeffs.resize(coeffs.size());
- for (size_t i_layer = 0; i_layer < coeffs.size(); ++i_layer) {
- ml_coeffs[i_layer] = LayerRTCoefficients_t(new ScalarRTCoefficients(coeffs[i_layer]));
- }
-
- *it = ml_coeffs;
- ++it;
-
- } // alpha_i
-}
-
-void SpecularSimulation::collectRTCoefficientsMatrix(const MultiLayer* /*multilayer*/)
-{
- throw std::runtime_error(
- "SpecularSimulation::collectRTCoefficientsMatrix() -> Error. Not implemented.");
+ double beam_intensity = getBeamIntensity();
+ if (beam_intensity==0.0)
+ return; // no normalization when beam intensity is zero
+ for(auto it=begin_it; it!=end_it; ++it) {
+ it->setIntensity(it->getIntensity()*beam_intensity);
+ }
}
-void SpecularSimulation::checkCoefficients(size_t i_layer) const
+void SpecularSimulation::validityCheck(size_t i_layer) const
{
- if (!m_RT_coefficients.isInitialized() || m_RT_coefficients[0].size() == 0)
+ const MultiLayer* current_sample = sample();
+ if (!current_sample)
throw std::runtime_error(
- "SpecularSimulation::checkCoefficients() -> Error. "
- "No coefficients found, check that (1) you have set beam parameters "
- "(2) you have run your simulation.");
-
- if (i_layer >= m_RT_coefficients[0].size()) {
- std::ostringstream message;
- message << "SpecularSimulation::checkCoefficients() -> Error. Requested layer index "
- << i_layer << " is large than or equal to the total number of layers "
- << m_RT_coefficients[0].size() << std::endl;
- throw std::runtime_error(message.str());
+ "Error in SpecularSimulation::validityCheck: no sample found in the simulation.");
+ if (i_layer >= current_sample->numberOfLayers())
+ throw std::runtime_error("Error in SpecularSimulation::validityCheck: passed layer number "
+ "exceeds the number of layers in the sample.");
+
+ const size_t data_size = m_sim_elements.size();
+ if (data_size != getAlphaAxis()->size())
+ throw std::runtime_error("Error in SpecularSimulation::validityCheck: length of simulation "
+ "element vector is not equal to the length of detector axis");
+
+ for (size_t i = 0; i < data_size; ++i) {
+ const SpecularData* specular_data = m_sim_elements[i].specularData();
+ if (!specular_data || !specular_data->isInited()) {
+ std::ostringstream message;
+ message << "Error in SpecularSimulation::validityCheck: simulation element " << i << "does not contain specular info";
+ throw std::runtime_error(message.str());
+ }
}
}
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index 124a478a748699e0814241867d6bcdf3f748e316..68198ff109a755dfe2eeb5bef852199330ec427f 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -19,9 +19,9 @@
#include "Simulation.h"
#include "ILayerRTCoefficients.h"
#include "OutputData.h"
-#include <memory>
class IAxis;
+class IComputation;
class ISample;
class IMultiLayerBuilder;
class MultiLayer;
@@ -36,16 +36,13 @@ public:
SpecularSimulation();
SpecularSimulation(const MultiLayer& sample);
SpecularSimulation(const std::shared_ptr<IMultiLayerBuilder> sample_builder);
- virtual ~SpecularSimulation() override = default;
+ virtual ~SpecularSimulation();
virtual SpecularSimulation* clone() const override;
//! Put into a clean state for running a simulation.
virtual void prepareSimulation() override;
- //! Run a simulation, possibly averaged over parameter distributions.
- virtual void runSimulation() override;
-
virtual void accept(INodeVisitor* visitor) const override final {visitor->visit(this);}
virtual size_t numberOfSimulationElements() const override;
@@ -58,8 +55,8 @@ public:
//! Returns a pointer to incident angle axis.
const IAxis* getAlphaAxis() const;
- //! Returns reflectivity values \f$Reflectivity = \|R\|^2\f$ from the upper layer in the form of
- //! OutputData<double>.
+ //! Returns detector count values in the form of OutputData<double>. Detector counts are
+ //! proportional to \f$Reflectivity = |R|^2\f$ from the upper layer.
virtual OutputData<double>* getDetectorIntensity(AxesUnits units_type
= AxesUnits::DEFAULT) const override;
@@ -81,33 +78,32 @@ public:
std::vector<complex_t> getScalarKz(size_t i_layer) const;
private:
- typedef std::shared_ptr<const ILayerRTCoefficients> LayerRTCoefficients_t;
- typedef std::vector<LayerRTCoefficients_t> MultiLayerRTCoefficients_t;
typedef complex_t (ILayerRTCoefficients::*DataGetter)() const;
SpecularSimulation(const SpecularSimulation& other);
- std::unique_ptr<OutputData<double>> getData(size_t i_layer, DataGetter fn_ptr) const;
+ std::vector<complex_t> getData(size_t i_layer, DataGetter fn_ptr) const;
+
+ std::unique_ptr<OutputData<double>> getDataByAbsValue(size_t i_layer, DataGetter fn_ptr) const;
// unused methods
- virtual void initSimulationElementVector() override {}
virtual void transferResultsToIntensityMap() override {}
virtual void updateIntensityMap() override {}
- //! calculates RT coefficients for multilayer without magnetic materials
- void collectRTCoefficientsScalar(const MultiLayer* multilayer);
+ //! Generate a single threaded computation for a given range of SimulationElement's
+ virtual std::unique_ptr<IComputation>
+ generateSingleThreadedComputation(std::vector<SimulationElement>::iterator start,
+ std::vector<SimulationElement>::iterator end) override;
- //! calculates RT coefficients for multilayer with magnetic materials
- void collectRTCoefficientsMatrix(const MultiLayer* multilayer);
+ //! Normalize the detector counts to beam intensity, to solid angle, and to exposure angle.
+ virtual void normalize(std::vector<SimulationElement>::iterator begin_it,
+ std::vector<SimulationElement>::iterator end_it) const override;
- //! check if simulation was run already and has valid coefficients
- void checkCoefficients(size_t i_layer) const;
+ //! Checks if simulation data is ready for retrieval
+ void validityCheck(size_t i_layer) const;
//! Initializes simulation
void initialize();
-
- OutputData<MultiLayerRTCoefficients_t> m_RT_coefficients;
- std::unique_ptr<IAxis> m_alpha_i_axis;
};
#endif // SPECULARSIMULATION_H
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index 77d27de98b17189704e0cd3ab156fbe62f12c9b7..71f97a99bed9125a63945b2dfe61c81953389fa9 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -167,7 +167,7 @@ void ApplicationModels::createTestSample()
const std::unique_ptr<ISample> P_sample(factory.createSample("CylindersAndPrismsBuilder"));
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(m_sampleModel, *P_sample);
+ guiBuilder.populateSampleModel(m_sampleModel, m_materialModel, *P_sample);
// to populate InstrumentView with predefined instrument
// const std::unique_ptr<GISASSimulation> simulation(StandardSimulations::GISASWithMasks());
@@ -214,6 +214,8 @@ void ApplicationModels::readFrom(QXmlStreamReader* reader, WarningMessageService
break;
}
}
+
+ m_materialPropertyController->onMaterialModelLoad();
}
//! Returns the list of all GUI models
diff --git a/GUI/coregui/Models/ComboProperty.cpp b/GUI/coregui/Models/ComboProperty.cpp
index 6091ed671a09fd807d208820d2a27de603619b8e..25230e509081070d69bff707c08c3f0f0f406824 100644
--- a/GUI/coregui/Models/ComboProperty.cpp
+++ b/GUI/coregui/Models/ComboProperty.cpp
@@ -133,7 +133,7 @@ void ComboProperty::setStringOfValues(const QString& values)
m_current_index = m_values.contains(current) ? m_values.indexOf(current) : 0;
}
-QVariant ComboProperty::getVariant() const
+QVariant ComboProperty::variant() const
{
QVariant result;
result.setValue(*this);
diff --git a/GUI/coregui/Models/ComboProperty.h b/GUI/coregui/Models/ComboProperty.h
index f795b7772c38b4d0ccbbf51e78a1bed118dff05f..3cc25a8c2f083eed749a4f8e2ac239e5e58205cc 100644
--- a/GUI/coregui/Models/ComboProperty.h
+++ b/GUI/coregui/Models/ComboProperty.h
@@ -50,7 +50,7 @@ public:
QString stringOfValues() const;
void setStringOfValues(const QString& values);
- QVariant getVariant() const;
+ QVariant variant() const;
private:
QStringList m_values;
diff --git a/GUI/coregui/Models/FTDistributionItems.cpp b/GUI/coregui/Models/FTDistributionItems.cpp
index f9236ede67ff5988e1eaf5e74fc2008a43f7b201..e1db15d81a6e9c0a90c42fd1ea2d0629a9762ab4 100644
--- a/GUI/coregui/Models/FTDistributionItems.cpp
+++ b/GUI/coregui/Models/FTDistributionItems.cpp
@@ -124,11 +124,8 @@ std::unique_ptr<IFTDistribution1D> FTDistribution1DVoigtItem::createFTDistributi
// --------------------------------------------------------------------------------------------- //
-// TODO BACKCOMPATIBILITY (fix when we will break back compatibility)
-// Make P_OMEGA_X, P_OMEGA_Y depend on BornAgain::OmegaX and OmegaY
-
-const QString FTDistribution2DItem::P_OMEGA_X = "CoherenceLengthX"; // temp FIXME
-const QString FTDistribution2DItem::P_OMEGA_Y = "CoherenceLengthY"; // temp FIXME
+const QString FTDistribution2DItem::P_OMEGA_X = QString::fromStdString(BornAgain::OmegaX);
+const QString FTDistribution2DItem::P_OMEGA_Y = QString::fromStdString(BornAgain::OmegaY);
const QString FTDistribution2DItem::P_GAMMA = QString::fromStdString(BornAgain::Gamma);
FTDistribution2DItem::FTDistribution2DItem(const QString& name)
@@ -138,14 +135,10 @@ FTDistribution2DItem::FTDistribution2DItem(const QString& name)
void FTDistribution2DItem::add_omega_properties()
{
- // TODO BACKCOMPATIBILITY (remove setDisplayName when P_OMEGA_X will be "OmegaX")
addProperty(P_OMEGA_X, 1.0)->setToolTip(
- QStringLiteral("Half-width of the distribution along its x-axis in nanometers"))
- .setDisplayName("OmegaX");
-
+ QStringLiteral("Half-width of the distribution along its x-axis in nanometers"));
addProperty(P_OMEGA_Y, 1.0)->setToolTip(
- QStringLiteral("Half-width of the distribution along its y-axis in nanometers"))
- .setDisplayName("OmegaY");
+ QStringLiteral("Half-width of the distribution along its y-axis in nanometers"));
}
void FTDistribution2DItem::add_gamma_property()
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/coregui/Models/FTDistributionItems.h
index 4c63ded3d5b87e0f29af216adb665cce4ba48c22..ed07faf4c3f941d4d5b31ce72a0b29b35360cc84 100644
--- a/GUI/coregui/Models/FTDistributionItems.h
+++ b/GUI/coregui/Models/FTDistributionItems.h
@@ -85,7 +85,6 @@ public:
static const QString P_GAMMA;
explicit FTDistribution2DItem(const QString& name);
virtual std::unique_ptr<IFTDistribution2D> createFTDistribution() const=0;
- virtual ~FTDistribution2DItem(){}
protected:
void add_omega_properties();
void add_gamma_property();
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
index dee62dbc03cd1a498d6b603c8b59baf92d603c63..5af338c839bd9c437bfd927157044dd65fb7dee7 100644
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ b/GUI/coregui/Models/FitParameterItems.cpp
@@ -67,7 +67,7 @@ const QString FitParameterItem::T_LINK = "Link tag";
FitParameterItem::FitParameterItem() : SessionItem(Constants::FitParameterType)
{
- addProperty(P_TYPE, fitParameterTypeCombo().getVariant());
+ addProperty(P_TYPE, fitParameterTypeCombo().variant());
addProperty(P_START_VALUE, 0.0);
addProperty(P_MIN, 0.0);
addProperty(P_MAX, 0.0)->setEnabled(false);
diff --git a/GUI/coregui/Models/GUIExamplesFactory.cpp b/GUI/coregui/Models/GUIExamplesFactory.cpp
index 2859d6a56504e847d862008d90c51f87da15dc6a..e54547cd7e498c8673f5cb1b517241a4b1d10c86 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.cpp
+++ b/GUI/coregui/Models/GUIExamplesFactory.cpp
@@ -62,7 +62,8 @@ bool GUIExamplesFactory::isValidExampleName(const QString &name)
}
//! Populate sample model with
-SessionItem *GUIExamplesFactory::createSampleItems(const QString &name, SampleModel *sampleModel)
+SessionItem *GUIExamplesFactory::createSampleItems(const QString &name, SampleModel *sampleModel,
+ MaterialModel* materialModel)
{
QString exampleName = m_name_to_registry[name];
@@ -70,7 +71,7 @@ SessionItem *GUIExamplesFactory::createSampleItems(const QString &name, SampleMo
const std::unique_ptr<ISample> sample(factory.createSample(exampleName.toStdString()));
GUIObjectBuilder guiBuilder;
- return guiBuilder.populateSampleModel(sampleModel, *sample.get(), name);
+ return guiBuilder.populateSampleModel(sampleModel, materialModel, *sample.get(), name);
}
//SessionItem *GUIExamplesFactory::createInstrumentItems(const QString &name, InstrumentModel *instrumentModel)
diff --git a/GUI/coregui/Models/GUIExamplesFactory.h b/GUI/coregui/Models/GUIExamplesFactory.h
index cbd906ccbb146c48a2d7c4044760259a75eb1a64..0821211427e4d92b6d8acd2f3d82621472f074e6 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.h
+++ b/GUI/coregui/Models/GUIExamplesFactory.h
@@ -22,6 +22,7 @@
class SessionItem;
class SampleModel;
+class MaterialModel;
//! Class that generates GUI model from
class BA_CORE_API_ GUIExamplesFactory
@@ -29,7 +30,7 @@ class BA_CORE_API_ GUIExamplesFactory
public:
static bool isValidExampleName(const QString &name);
- static SessionItem *createSampleItems(const QString &name, SampleModel *sampleModel);
+ static SessionItem *createSampleItems(const QString &name, SampleModel *sampleModel, MaterialModel* materialModel);
// static SessionItem *createInstrumentItems(const QString &name, InstrumentModel *instrumentModel);
private:
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 4743819895671c918f6d7fd7b8a0d715ae314ce2..9f8bb34ecc8468f98e130f01f1c00451ea00ec8f 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -57,7 +57,6 @@
#include "VectorItem.h"
#include "Particle.h"
#include "ParticleCoreShell.h"
-#include "AppSvc.h"
#include "MaterialItemUtils.h"
using SessionItemUtils::SetVectorItem;
@@ -67,29 +66,30 @@ SessionItem* AddFormFactorItem(SessionItem* p_parent, Constants::ModelType model
}
GUIObjectBuilder::GUIObjectBuilder()
- : m_sampleModel(0)
+ : m_sampleModel(nullptr)
+ , m_materialModel(nullptr)
{
}
-SessionItem* GUIObjectBuilder::populateSampleModel(
- SampleModel* p_sample_model, const GISASSimulation& simulation, const QString& sample_name)
+SessionItem* GUIObjectBuilder::populateSampleModel(SampleModel* sampleModel, MaterialModel* materialModel, const GISASSimulation& simulation, const QString& sample_name)
{
std::unique_ptr<GISASSimulation> sim(simulation.clone());
sim->prepareSimulation();
- return populateSampleModel(p_sample_model,*sim->sample(), sample_name);
+ return populateSampleModel(sampleModel,materialModel, *sim->sample(), sample_name);
}
-SessionItem* GUIObjectBuilder::populateSampleModel(
- SampleModel* p_sample_model, const ISample& sample, const QString& sample_name)
+SessionItem* GUIObjectBuilder::populateSampleModel(SampleModel* sampleModel, MaterialModel* materialModel, const ISample& sample, const QString& sample_name)
{
- Q_ASSERT(p_sample_model);
+ Q_ASSERT(sampleModel);
+ Q_ASSERT(materialModel);
m_levelToParentItem.clear();
m_topSampleName = sample_name;
if(m_topSampleName.isEmpty()) m_topSampleName = sample.getName().c_str();
- m_sampleModel = p_sample_model;
+ m_sampleModel = sampleModel;
+ m_materialModel = materialModel;
VisitNodesPreorder(sample, *this);
SessionItem* result = m_levelToParentItem[1];
@@ -173,7 +173,7 @@ void GUIObjectBuilder::visit(const ParticleLayout* p_sample)
approx_prop.setValue(Constants::LAYOUT_SSCA);
break;
}
- p_layout_item->setItemValue(ParticleLayoutItem::P_APPROX, approx_prop.getVariant());
+ p_layout_item->setItemValue(ParticleLayoutItem::P_APPROX, approx_prop.variant());
p_layout_item->setItemValue(ParticleLayoutItem::P_TOTAL_DENSITY,
p_sample->totalParticleSurfaceDensity());
m_levelToParentItem[depth()] = p_layout_item;
@@ -192,7 +192,7 @@ void GUIObjectBuilder::visit(const Layer* p_sample)
SessionItem* p_layer_item = m_sampleModel->insertNewItem(
Constants::LayerType, m_sampleModel->indexOfItem(p_parent));
p_layer_item->setItemValue(LayerItem::P_MATERIAL,
- createMaterialFromDomain(p_sample->material()).getVariant());
+ createMaterialFromDomain(p_sample->material()).variant());
TransformFromDomain::setItemFromSample(p_layer_item, p_sample, p_interface);
@@ -215,7 +215,7 @@ void GUIObjectBuilder::visit(const Particle* p_sample)
{
auto p_particle_item = InsertIParticle(p_sample, Constants::ParticleType);
p_particle_item->setItemValue(ParticleItem::P_MATERIAL,
- createMaterialFromDomain(p_sample->material()).getVariant());
+ createMaterialFromDomain(p_sample->material()).variant());
}
void GUIObjectBuilder::visit(const ParticleDistribution* p_sample)
@@ -598,14 +598,12 @@ ExternalProperty GUIObjectBuilder::createMaterialFromDomain(
{
QString materialName = m_topSampleName + QString("_") + QString(material->getName().c_str());
- MaterialModel* model = AppSvc::materialModel();
-
- if (auto material = model->materialFromName(materialName))
+ if (auto material = m_materialModel->materialFromName(materialName))
return MaterialItemUtils::materialProperty(*material);
complex_t material_data = material->materialData();
MaterialItem* materialItem =
- model->addMaterial(materialName, material_data.real(),material_data.imag());
+ m_materialModel->addMaterial(materialName, material_data.real(),material_data.imag());
SetVectorItem(*materialItem, MaterialItem::P_MAGNETIZATION, material->magnetization());
return MaterialItemUtils::materialProperty(*materialItem);
}
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/coregui/Models/GUIObjectBuilder.h
index f4dd05b3af21d0b986ae648d44ea20ff2f2b3c5c..9d1ea418f0c2278623d99f5c41deb333c67c0470 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.h
+++ b/GUI/coregui/Models/GUIObjectBuilder.h
@@ -25,6 +25,7 @@ class Material;
class InstrumentModel;
class SampleModel;
class SessionItem;
+class MaterialModel;
class DocumentModel;
class GISASSimulation;
class ExternalProperty;
@@ -36,11 +37,13 @@ public:
GUIObjectBuilder();
virtual ~GUIObjectBuilder(){}
- SessionItem* populateSampleModel(SampleModel* sample_model,
+ SessionItem* populateSampleModel(SampleModel* sampleModel,
+ MaterialModel* materialModel,
const GISASSimulation& simulation,
const QString& sample_name=QString());
- SessionItem* populateSampleModel(SampleModel* sample_model,
+ SessionItem* populateSampleModel(SampleModel* sampleModel,
+ MaterialModel* materialModel,
const ISample& sample,
const QString& sample_name=QString());
@@ -106,6 +109,7 @@ private:
SessionItem* InsertIParticle(const IParticle* p_particle, QString model_type);
SampleModel* m_sampleModel;
+ MaterialModel* m_materialModel;
QMap<int, SessionItem*> m_levelToParentItem;
QMap<QString, double > m_propertyToValue;
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/coregui/Models/IntensityDataItem.cpp
index d268d5c8da1c17625bbd49be80e6d9895f320df0..133a718dd3b87214de327428f94e3a421e088fbe 100644
--- a/GUI/coregui/Models/IntensityDataItem.cpp
+++ b/GUI/coregui/Models/IntensityDataItem.cpp
@@ -51,13 +51,13 @@ const QString IntensityDataItem::T_PROJECTIONS = "Projection tag";
IntensityDataItem::IntensityDataItem() : SessionItem(Constants::IntensityDataType)
{
ComboProperty units = ComboProperty() << Constants::UnitsNbins;
- addProperty(P_AXES_UNITS, units.getVariant());
+ addProperty(P_AXES_UNITS, units.variant());
addProperty(P_TITLE, QString())->setVisible(false);
addProperty(P_PROJECTIONS_FLAG, false)->setVisible(false);
addProperty(P_IS_INTERPOLATED, true);
- addProperty(P_GRADIENT, gradientCombo().getVariant());
+ addProperty(P_GRADIENT, gradientCombo().variant());
SessionItem* item = addGroupProperty(P_XAXIS, Constants::BasicAxisType);
item->getItem(BasicAxisItem::P_NBINS)->setVisible(false);
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 459a4e05f65f7304b132a2fd1bc886b243ba9cbe..138b88534f08b13203e05c93d809390c65ddd47b 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -29,6 +29,10 @@
#include "InterferenceFunction1DLattice.h"
#include "GroupItem.h"
+namespace {
+ const QString decay_function_tag = "Decay Function";
+}
+
// TODO (when back compatibility will be broken again)
// Make InterferenceFunction1DLatticeItem::P_DECAY_FUNCTION and
// InterferenceFunction2DLatticeItem::P_DECAY_FUNCTION rely on same constant
@@ -200,7 +204,7 @@ const QString InterferenceFunction1DLatticeItem::P_LENGTH =
QString::fromStdString(BornAgain::Length);
const QString InterferenceFunction1DLatticeItem::P_ROTATION_ANGLE =
QString::fromStdString(BornAgain::Xi);
-const QString InterferenceFunction1DLatticeItem::P_DECAY_FUNCTION = "Decay Function";
+const QString InterferenceFunction1DLatticeItem::P_DECAY_FUNCTION = decay_function_tag;
InterferenceFunction1DLatticeItem::InterferenceFunction1DLatticeItem()
: InterferenceFunctionItem(Constants::InterferenceFunction1DLatticeType)
@@ -230,7 +234,7 @@ InterferenceFunction1DLatticeItem::createInterferenceFunction() const
// --------------------------------------------------------------------------------------------- //
const QString InterferenceFunction2DLatticeItem::P_LATTICE_TYPE = "LatticeType";
-const QString InterferenceFunction2DLatticeItem::P_DECAY_FUNCTION = "DecayFunction";
+const QString InterferenceFunction2DLatticeItem::P_DECAY_FUNCTION = decay_function_tag;
const QString InterferenceFunction2DLatticeItem::P_XI_INTEGRATION = "Integration_over_xi";
InterferenceFunction2DLatticeItem::InterferenceFunction2DLatticeItem()
diff --git a/GUI/coregui/Models/JobItemUtils.cpp b/GUI/coregui/Models/JobItemUtils.cpp
index 368abe0fd182d2bd8421993e4feefd1ba6e6cc44..a7b689e01f2444e08858509b08579ef49213895d 100644
--- a/GUI/coregui/Models/JobItemUtils.cpp
+++ b/GUI/coregui/Models/JobItemUtils.cpp
@@ -169,7 +169,7 @@ void JobItemUtils::setIntensityItemAxesUnits(IntensityDataItem* intensityItem,
= preferableGUIAxesUnits(detector->defaultAxesUnits());
combo.setValue(nameFromAxesUnits(preferrable_units));
- intensityItem->setItemValue(IntensityDataItem::P_AXES_UNITS, combo.getVariant());
+ intensityItem->setItemValue(IntensityDataItem::P_AXES_UNITS, combo.variant());
}
void JobItemUtils::updateAxesTitle(IntensityDataItem* intensityItem)
diff --git a/GUI/coregui/Models/LayerItem.cpp b/GUI/coregui/Models/LayerItem.cpp
index d43b3b44158e235beb46542f116049a97685380b..4ae971cfc796741cf7681cd7a8f6ca6a0f0eb5b5 100644
--- a/GUI/coregui/Models/LayerItem.cpp
+++ b/GUI/coregui/Models/LayerItem.cpp
@@ -38,8 +38,9 @@ LayerItem::LayerItem()
addProperty(P_THICKNESS, 0.0)->setLimits(RealLimits::lowerLimited(0.0))
.setToolTip(QStringLiteral("Thickness of a layer in nanometers"));
- addProperty(P_MATERIAL, MaterialItemUtils::defaultMaterialProperty().getVariant())
- ->setToolTip(QStringLiteral("Material the layer is made of"));
+ addProperty(P_MATERIAL, MaterialItemUtils::defaultMaterialProperty().variant())
+ ->setToolTip(QStringLiteral("Material the layer is made of"))
+ .setEditorType(Constants::MaterialEditorExternalType);
addProperty(P_NSLICES, 1)->setLimits(RealLimits::lowerLimited(0.0))
.setToolTip(layer_nslices_tooltip);
diff --git a/GUI/coregui/Models/LinkInstrumentItem.cpp b/GUI/coregui/Models/LinkInstrumentItem.cpp
index 3cc10078a00ab2bb82edcc08ba40158294522c5a..9e0d41cda6a8dffa5e9868f2de4d24906b5c9ade 100644
--- a/GUI/coregui/Models/LinkInstrumentItem.cpp
+++ b/GUI/coregui/Models/LinkInstrumentItem.cpp
@@ -30,5 +30,5 @@ LinkInstrumentItem::LinkInstrumentItem()
addProperty(P_INSTRUMENT_ID, QString());
addProperty(P_INSTRUMENT_NAME, QString());
ComboProperty instruments = ComboProperty() << "Undefined";
- addProperty(P_INSTRUMENT_COMBO, instruments.getVariant());
+ addProperty(P_INSTRUMENT_COMBO, instruments.variant());
}
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index e325044c91f33f1061ada8b6e907bee75d9a1e54..5db870c3ff9dfcb77be04db44ca0a697bfd6c88e 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -15,11 +15,12 @@
// ************************************************************************** //
#include "MaterialItem.h"
-#include "ColorProperty.h"
+#include "ExternalProperty.h"
#include "GUIHelpers.h"
#include "MaterialDataItem.h"
#include "MaterialFactoryFuncs.h"
#include "SessionItemUtils.h"
+#include "MaterialItemUtils.h"
using SessionItemUtils::GetVectorItem;
@@ -38,8 +39,9 @@ MaterialItem::MaterialItem()
{
setItemName(Constants::HomogeneousMaterialType);
- ColorProperty color;
- addProperty(P_COLOR, color.getVariant());
+ ExternalProperty color = MaterialItemUtils::colorProperty(QColor(Qt::red));
+ addProperty(P_COLOR, color.variant())->setEditorType(Constants::ColorEditorExternalType);
+
addGroupProperty(P_MATERIAL_DATA, Constants::MaterialDataType);
addGroupProperty(P_MAGNETIZATION, Constants::VectorType)->setToolTip(magnetization_tooltip);
addProperty(P_IDENTIFIER, GUIHelpers::createUuid());
@@ -53,8 +55,8 @@ QString MaterialItem::getIdentifier() const
QColor MaterialItem::getColor() const
{
- ColorProperty property = getItemValue(P_COLOR).value<ColorProperty>();
- return property.getColor();
+ ExternalProperty property = getItemValue(P_COLOR).value<ExternalProperty>();
+ return property.color();
}
//TODO: make this function create proper type of material (refractive index m-l or wl-indp. mat-l)
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index 1e9354c1c6ac044adb18ffe2657aad6d11a4df07..daa30a2590bb2cd8b6ca9b4a579f114067d3dac6 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -20,16 +20,17 @@
#include "MaterialDataItem.h"
#include "AppSvc.h"
-
MaterialModel::MaterialModel(QObject* parent) : SessionModel(SessionXML::MaterialModelTag, parent)
{
setObjectName(SessionXML::MaterialModelTag);
- AppSvc::subscribe(this);
+ if (AppSvc::materialModel() == nullptr)
+ AppSvc::subscribe(this);
}
MaterialModel::~MaterialModel()
{
- AppSvc::unsubscribe(this);
+ if (AppSvc::materialModel() == this)
+ AppSvc::unsubscribe(this);
}
MaterialModel* MaterialModel::createCopy(SessionItem* parent)
@@ -52,8 +53,8 @@ MaterialItem* MaterialModel::addMaterial(const QString& name, double material_da
materialDataItem->setReal(material_data_real);
materialDataItem->setImag(material_data_imag);
- ColorProperty color(MaterialItemUtils::suggestMaterialColor(name));
- materialItem->setItemValue(MaterialItem::P_COLOR, color.getVariant());
+ QColor color = MaterialItemUtils::suggestMaterialColor(name);
+ materialItem->setItemValue(MaterialItem::P_COLOR, MaterialItemUtils::colorProperty(color).variant());
return materialItem;
}
@@ -69,20 +70,6 @@ MaterialItem* MaterialModel::getMaterial(const QModelIndex& index)
return dynamic_cast<MaterialItem*>(itemForIndex(index));
}
-MaterialItem* MaterialModel::getMaterial(const ExternalProperty& property)
-{
- QModelIndex parentIndex;
- for (int i_row = 0; i_row < rowCount(parentIndex); ++i_row) {
- QModelIndex itemIndex = index(i_row, 0, parentIndex);
-
- if (MaterialItem* material = dynamic_cast<MaterialItem*>(itemForIndex(itemIndex))) {
- if (material->getIdentifier() == property.getIdentifier())
- return material;
- }
- }
- return nullptr;
-}
-
//! Returns clone of material with given index.
MaterialItem* MaterialModel::cloneMaterial(const QModelIndex& index)
diff --git a/GUI/coregui/Models/MaterialModel.h b/GUI/coregui/Models/MaterialModel.h
index d450290069e0ce951f6cc3fe41239ad055499cce..f7b1ed26dde07efc91b6e73c54d02ccb4ebecf42 100644
--- a/GUI/coregui/Models/MaterialModel.h
+++ b/GUI/coregui/Models/MaterialModel.h
@@ -36,7 +36,6 @@ public:
void removeMaterial(MaterialItem*);
MaterialItem* getMaterial(const QModelIndex& index);
- MaterialItem* getMaterial(const ExternalProperty& property);
MaterialItem* cloneMaterial(const QModelIndex& index);
@@ -44,9 +43,6 @@ public:
MaterialItem* materialFromIdentifier(const QString& identifier);
QVector<MaterialItem*> materialItems();
-signals:
- void createdFromCopy();
-
};
#endif // MATERIALMODEL_H
diff --git a/GUI/coregui/Models/MaterialPropertyController.cpp b/GUI/coregui/Models/MaterialPropertyController.cpp
index 923edd99af3b18ba8690c01f484fc9778bb0a19f..79d856d7e73fe72feb76a53c6e7843de301f542f 100644
--- a/GUI/coregui/Models/MaterialPropertyController.cpp
+++ b/GUI/coregui/Models/MaterialPropertyController.cpp
@@ -40,8 +40,29 @@ void MaterialPropertyController::setModels(MaterialModel* materialModel, SampleM
connect(m_materialModel, &MaterialModel::rowsAboutToBeRemoved, this,
&MaterialPropertyController::onMaterialRowsAboutToBeRemoved);
- connect(m_materialModel, &MaterialModel::createdFromCopy, this,
- &MaterialPropertyController::onMaterialModelCopy);
+ connect(m_materialModel, &MaterialModel::modelLoaded, this,
+ &MaterialPropertyController::onMaterialModelLoad);
+}
+
+//! Special case when original MaterialModel was fully rebuild from MaterialEditor.
+//! Full update of MaterialProperties.
+
+void MaterialPropertyController::onMaterialModelLoad()
+{
+ for (auto sampleItem : relatedSampleItems()) {
+ QString tag = MaterialItemUtils::materialTag(*sampleItem);
+ Q_ASSERT(!tag.isEmpty());
+
+ ExternalProperty property = sampleItem->getItemValue(tag).value<ExternalProperty>();
+ if (MaterialItem* material
+ = m_materialModel->materialFromIdentifier(property.identifier())) {
+ ExternalProperty new_property = MaterialItemUtils::materialProperty(*material);
+ sampleItem->setItemValue(tag, new_property.variant());
+ } else {
+ ExternalProperty undefined;
+ sampleItem->setItemValue(tag, undefined.variant());
+ }
+ }
}
//! On MaterialItem change: updates corresponding MaterialProperty in sample items.
@@ -58,9 +79,9 @@ void MaterialPropertyController::onMaterialDataChanged(const QModelIndex& topLef
Q_ASSERT(!tag.isEmpty());
ExternalProperty property = sampleItem->getItemValue(tag).value<ExternalProperty>();
- if (property.getIdentifier() == materialItem->getIdentifier()) {
+ if (property.identifier() == materialItem->getIdentifier()) {
ExternalProperty new_property = MaterialItemUtils::materialProperty(*materialItem);
- sampleItem->setItemValue(tag, new_property.getVariant());
+ sampleItem->setItemValue(tag, new_property.variant());
}
}
}
@@ -89,30 +110,9 @@ void MaterialPropertyController::onMaterialRowsAboutToBeRemoved(const QModelInde
Q_ASSERT(!tag.isEmpty());
ExternalProperty property = sampleItem->getItemValue(tag).value<ExternalProperty>();
- if (identifiersToDelete.contains(property.getIdentifier())) {
- ExternalProperty undefined;
- sampleItem->setItemValue(tag, undefined.getVariant());
- }
- }
-}
-
-//! Special case when original MaterialModel was fully rebuild from MaterialEditor.
-//! Full update of MaterialProperties.
-
-void MaterialPropertyController::onMaterialModelCopy()
-{
- for (auto sampleItem : relatedSampleItems()) {
- QString tag = MaterialItemUtils::materialTag(*sampleItem);
- Q_ASSERT(!tag.isEmpty());
-
- ExternalProperty property = sampleItem->getItemValue(tag).value<ExternalProperty>();
- if (MaterialItem* material
- = m_materialModel->materialFromIdentifier(property.getIdentifier())) {
- ExternalProperty new_property = MaterialItemUtils::materialProperty(*material);
- sampleItem->setItemValue(tag, new_property.getVariant());
- } else {
+ if (identifiersToDelete.contains(property.identifier())) {
ExternalProperty undefined;
- sampleItem->setItemValue(tag, undefined.getVariant());
+ sampleItem->setItemValue(tag, undefined.variant());
}
}
}
diff --git a/GUI/coregui/Models/MaterialPropertyController.h b/GUI/coregui/Models/MaterialPropertyController.h
index 54001cdfea12200e39713df0a4ae141da94f28ab..5e7b30325ebff25ae65d96aaedf4af380f3b57a1 100644
--- a/GUI/coregui/Models/MaterialPropertyController.h
+++ b/GUI/coregui/Models/MaterialPropertyController.h
@@ -35,10 +35,12 @@ public:
void setModels(MaterialModel* materialModel, SampleModel* sampleModel);
+public slots:
+ void onMaterialModelLoad();
+
private slots:
void onMaterialDataChanged(const QModelIndex &topLeft, const QModelIndex &, const QVector<int> &);
void onMaterialRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last);
- void onMaterialModelCopy();
private:
QVector<SessionItem*> relatedSampleItems();
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index 6e312cd35beb7f6409349dd24878da86b0c43cfc..6d9e1fed3d937a20d1356f692ebff3254a497247 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -57,7 +57,7 @@ const QString MinuitMinimizerItem::P_MAXFUNCTIONCALLS
MinuitMinimizerItem::MinuitMinimizerItem() : MinimizerItem(Constants::MinuitMinimizerType)
{
- addProperty(P_ALGORITHMS, MinimizerItemCatalogue::algorithmCombo(modelType()).getVariant());
+ addProperty(P_ALGORITHMS, MinimizerItemCatalogue::algorithmCombo(modelType()).variant());
addProperty(P_STRATEGY, 1)
->setToolTip("Minimization strategy (0-low, 1-medium, 2-high quality)");
@@ -97,7 +97,7 @@ const QString GSLMultiMinimizerItem::P_MAXITERATIONS
GSLMultiMinimizerItem::GSLMultiMinimizerItem() : MinimizerItem(Constants::GSLMultiMinimizerType)
{
- addProperty(P_ALGORITHMS, MinimizerItemCatalogue::algorithmCombo(modelType()).getVariant());
+ addProperty(P_ALGORITHMS, MinimizerItemCatalogue::algorithmCombo(modelType()).variant());
addProperty(P_MAXITERATIONS, 0)->setToolTip("Maximum number of iterations");
}
diff --git a/GUI/coregui/Models/ColorProperty.h b/GUI/coregui/Models/ObsoleteColorProperty.h
similarity index 77%
rename from GUI/coregui/Models/ColorProperty.h
rename to GUI/coregui/Models/ObsoleteColorProperty.h
index c4adfd44b0d40dd9f7230facc18c8ed6aea9d953..52980ec6aba892a693ce92e88fdc448c60ed2fd6 100644
--- a/GUI/coregui/Models/ColorProperty.h
+++ b/GUI/coregui/Models/ObsoleteColorProperty.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/ColorProperty.h
-//! @brief Defines class ColorProperty
+//! @file GUI/coregui/Models/ObsoleteColorProperty.h
+//! @brief Defines class ObsoleteColorProperty
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#ifndef COLORPROPERTY_H
-#define COLORPROPERTY_H
+#ifndef OBSOLETECOLORPROPERTY_H
+#define OBSOLETECOLORPROPERTY_H
#include "WinDllMacros.h"
#include <QPixmap>
@@ -25,11 +25,11 @@
//!
//! The reason is to have simple color editor in PropertyEditor instead of
//! original one which is too sophisticated.
-class BA_CORE_API_ ColorProperty
+class BA_CORE_API_ ObsoleteColorProperty
{
public:
- ColorProperty() : m_color(Qt::red) {}
- ColorProperty(QColor color) : m_color(color) {}
+ ObsoleteColorProperty() : m_color(Qt::red) {}
+ ObsoleteColorProperty(QColor color) : m_color(color) {}
QPixmap getPixmap() const {
QPixmap pixmap(10,10);
pixmap.fill(m_color);
@@ -53,8 +53,8 @@ private:
QColor m_color;
};
-Q_DECLARE_METATYPE(ColorProperty)
+Q_DECLARE_METATYPE(ObsoleteColorProperty)
-#endif // COLORPROPERTY_H
+#endif // OBSOLETECOLORPROPERTY_H
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index 2afe766b32df4aef277c9e93c2801cbce392e713..d73c6008dc8d0f4990294dd703c8811dc11c3ad5 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -57,7 +57,7 @@ ParticleDistributionItem::ParticleDistributionItem()
setDefaultTag(T_PARTICLES);
ComboProperty par_prop;
- addProperty(P_DISTRIBUTED_PARAMETER, par_prop.getVariant())->setToolTip(
+ addProperty(P_DISTRIBUTED_PARAMETER, par_prop.variant())->setToolTip(
QStringLiteral("Parameter to distribute"));
updateParameterList();
@@ -138,7 +138,7 @@ void ParticleDistributionItem::updateParameterList()
// we first set parameter, and then clear the cache name, to not to allow
// initDistributionItem to override limits obtained from the domain
if(prop != newProp)
- setItemValue(P_DISTRIBUTED_PARAMETER, newProp.getVariant());
+ setItemValue(P_DISTRIBUTED_PARAMETER, newProp.variant());
if(make_cache_clear)
m_domain_cache_name.clear();
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/coregui/Models/ParticleItem.cpp
index 309c515ba8b1ffbc215798081bf359660b790cfe..27c9e4ad262858a4675a863fd904e17eeb832100 100644
--- a/GUI/coregui/Models/ParticleItem.cpp
+++ b/GUI/coregui/Models/ParticleItem.cpp
@@ -47,8 +47,9 @@ ParticleItem::ParticleItem()
: SessionGraphicsItem(Constants::ParticleType)
{
addGroupProperty(P_FORM_FACTOR, Constants::FormFactorGroup);
- addProperty(P_MATERIAL, MaterialItemUtils::defaultMaterialProperty().getVariant())
- ->setToolTip(QStringLiteral("Material of particle"));
+ addProperty(P_MATERIAL, MaterialItemUtils::defaultMaterialProperty().variant())
+ ->setToolTip(QStringLiteral("Material of particle"))
+ .setEditorType(Constants::MaterialEditorExternalType);
addProperty(P_ABUNDANCE, 1.0)->setLimits(RealLimits::limited(0.0, 1.0)).setDecimals(3)
.setToolTip(abundance_tooltip);
diff --git a/GUI/coregui/Models/ParticleLayoutItem.cpp b/GUI/coregui/Models/ParticleLayoutItem.cpp
index c17a199ff668726efd9870a7fecfbb8f35f2d176..706c269a0ab11bf1998a29bef4ea020bf7905453 100644
--- a/GUI/coregui/Models/ParticleLayoutItem.cpp
+++ b/GUI/coregui/Models/ParticleLayoutItem.cpp
@@ -45,7 +45,7 @@ ParticleLayoutItem::ParticleLayoutItem() : SessionGraphicsItem(Constants::Partic
setToolTip(QStringLiteral("A layout of particles"));
ComboProperty approx = ComboProperty() << Constants::LAYOUT_DA << Constants::LAYOUT_SSCA;
- addProperty(P_APPROX, approx.getVariant())->setToolTip(
+ addProperty(P_APPROX, approx.variant())->setToolTip(
QStringLiteral("Approximation used to distribute the particles"));
addProperty(P_TOTAL_DENSITY, 1.0)->setToolTip(density_tooltip);
getItem(P_TOTAL_DENSITY)->setDecimals(10);
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index a6fc9ae4c0942f57f88dcd62df2695fa172db129..5cef412988970d5fa6cc6f4482e6d8ee22832354 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -130,7 +130,7 @@ void RealDataItem::updateToInstrument()
if(m_linkedInstrument == 0) {
ComboProperty combo = ComboProperty() << Constants::UnitsNbins;
- item->setItemValue(IntensityDataItem::P_AXES_UNITS, combo.getVariant());
+ item->setItemValue(IntensityDataItem::P_AXES_UNITS, combo.variant());
item->getItem(IntensityDataItem::P_AXES_UNITS)->setVisible(true);
item->setXaxisTitle("X [nbins]");
item->setYaxisTitle("Y [nbins]");
diff --git a/GUI/coregui/Models/RealDataModel.h b/GUI/coregui/Models/RealDataModel.h
index d8d42db5c7c293acd167b2156a45bda17b213636..12bc0f909e218c47745ec3f41599ac8f094c1310 100644
--- a/GUI/coregui/Models/RealDataModel.h
+++ b/GUI/coregui/Models/RealDataModel.h
@@ -30,10 +30,6 @@ public:
// Qt::ItemFlags flags(const QModelIndex &index) const;
QVector<SessionItem*> nonXMLData() const override;
-
-signals:
- void modelLoaded();
-
};
#endif // REALDATAMODEL_H
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index 0b5a7882e0cdcda9105374e40d5d3d1093232995..bbf88a91277e25a64e0aefd2ae9c58454cc7297f 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -89,7 +89,7 @@ RectangularDetectorItem::RectangularDetectorItem()
item->getItem(BasicAxisItem::P_MAX)->setToolTip(QStringLiteral("Height of the detector in mm"));
// alignment selector
- addProperty(P_ALIGNMENT, alignmentCombo().getVariant());
+ addProperty(P_ALIGNMENT, alignmentCombo().variant());
// alignment parameters
item = addGroupProperty(P_NORMAL, Constants::VectorType);
@@ -133,7 +133,7 @@ void RectangularDetectorItem::setDetectorAlignment(const QString& alignment)
"RectangularDetectorItem::setDetectorAlignment -> Unexpected alignment");
combo_property.setValue(alignment);
- setItemValue(RectangularDetectorItem::P_ALIGNMENT, combo_property.getVariant());
+ setItemValue(RectangularDetectorItem::P_ALIGNMENT, combo_property.variant());
}
void RectangularDetectorItem::setSize(int nx, int ny)
diff --git a/GUI/coregui/Models/SessionItemUtils.cpp b/GUI/coregui/Models/SessionItemUtils.cpp
index 8a3c7fa1862b3b8fcdca35bcbbd2a900a5fe22f9..581b049c85466e9d81b3c5d4fe8debb38bae4c36 100644
--- a/GUI/coregui/Models/SessionItemUtils.cpp
+++ b/GUI/coregui/Models/SessionItemUtils.cpp
@@ -18,7 +18,6 @@
#include "SessionItem.h"
#include "VectorItem.h"
#include "MaterialItem.h"
-#include "ColorProperty.h"
#include "ExternalProperty.h"
#include <QColor>
#include <QIcon>
@@ -88,10 +87,7 @@ QVariant SessionItemUtils::ToolTipRole(const SessionItem& item, int ncol)
QVariant SessionItemUtils::DecorationRole(const SessionItem& item)
{
if (item.value().canConvert<ExternalProperty>())
- return QIcon(item.value().value<ExternalProperty>().getPixmap());
-
- if (item.value().canConvert<ColorProperty>())
- return QIcon(item.value().value<ColorProperty>().getPixmap());
+ return QIcon(item.value().value<ExternalProperty>().pixmap());
return QVariant();
}
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index ce2a12ff7190b637f242072391b66541879560c2..91e6bada0598ce4e28fe0660d37c0904ddf6c92a 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -189,7 +189,7 @@ QMimeData *SessionModel::mimeData(const QModelIndexList& indices) const
QMimeData *mime_data = new QMimeData;
QByteArray xml_data;
QXmlStreamWriter writer(&xml_data);
- SessionWriter::writeItemAndChildItems(&writer, item);
+ SessionXML::writeItemAndChildItems(&writer, item);
mime_data->setData(SessionXML::ItemMimeType, qCompress(xml_data, MaxCompression));
return mime_data;
}
@@ -308,7 +308,7 @@ void SessionModel::load(const QString& filename)
clear();
m_root_item = ItemFactory::createEmptyItem();
QXmlStreamReader reader(&file);
- SessionReader::readItems(&reader, m_root_item);
+ SessionXML::readItems(&reader, m_root_item);
if (reader.hasError())
throw GUIHelpers::Error(reader.errorString());
endResetModel();
@@ -325,7 +325,7 @@ void SessionModel::save(const QString& filename)
writer.writeStartDocument();
writer.writeStartElement("BornAgain");
writer.writeAttribute("Version", GUIHelpers::getBornAgainVersionString());
- SessionWriter::writeItemAndChildItems(&writer, m_root_item);
+ SessionXML::writeItemAndChildItems(&writer, m_root_item);
writer.writeEndElement(); // BornAgain
writer.writeEndDocument();
}
@@ -351,7 +351,7 @@ void SessionModel::readFrom(QXmlStreamReader* reader, WarningMessageService* mes
m_name = reader->attributes().value(SessionXML::ModelNameAttribute).toString();
- SessionReader::readItems(reader, m_root_item, QString(), messageService);
+ SessionXML::readItems(reader, m_root_item, QString(), messageService);
if (reader->hasError())
throw GUIHelpers::Error(reader->errorString());
endResetModel();
@@ -361,7 +361,7 @@ void SessionModel::writeTo(QXmlStreamWriter* writer, SessionItem* parent)
{
if (!parent)
parent = m_root_item;
- SessionWriter::writeTo(writer, parent);
+ SessionXML::writeTo(writer, parent);
}
//! Move given parameterized item to the new_parent at given row. If new_parent is not defined,
@@ -412,11 +412,11 @@ SessionItem* SessionModel::copyParameterizedItem(const SessionItem* item_to_copy
QByteArray xml_data;
QXmlStreamWriter writer(&xml_data);
- SessionWriter::writeItemAndChildItems(&writer, item_to_copy);
+ SessionXML::writeItemAndChildItems(&writer, item_to_copy);
QXmlStreamReader reader(xml_data);
- SessionReader::readItems(&reader, new_parent, tagName);
+ SessionXML::readItems(&reader, new_parent, tagName);
return new_parent->getItems(tagName).back();
}
@@ -489,6 +489,7 @@ void SessionModel::initFrom(SessionModel* model, SessionItem*)
readFrom(&reader);
}
}
+ modelLoaded();
}
SessionItem* SessionModel::rootItem() const{
diff --git a/GUI/coregui/Models/SessionModel.h b/GUI/coregui/Models/SessionModel.h
index 2d10203b2b10f2d1b5c18f9178b84edcefda7d47..ef4b30234d44ad4a96d4936f994acf92aea1cc06 100644
--- a/GUI/coregui/Models/SessionModel.h
+++ b/GUI/coregui/Models/SessionModel.h
@@ -100,6 +100,9 @@ public:
virtual QVector<SessionItem*> nonXMLData() const;
+signals:
+ void modelLoaded();
+
protected:
void setRootItem(SessionItem *root) {m_root_item = root;}
diff --git a/GUI/coregui/Models/SessionModelDelegate.cpp b/GUI/coregui/Models/SessionModelDelegate.cpp
index 93218ae001d8d62e8dfcbf017185712e8e3d265b..87f27f2f976f0071b05349c2c2f63f4748512223 100644
--- a/GUI/coregui/Models/SessionModelDelegate.cpp
+++ b/GUI/coregui/Models/SessionModelDelegate.cpp
@@ -18,6 +18,7 @@
#include "SessionItem.h"
#include "PropertyEditorFactory.h"
#include "CustomEditors.h"
+#include "SessionFlags.h"
#include <QApplication>
#include <QLocale>
@@ -29,7 +30,6 @@ bool isDoubleProperty(const QModelIndex& index)
}
//! Returns text representation of double value depending on user defined editor type.
-//! FIXME Remove this temporary function after getting rid from ScientificDoubleProperty
QString doubleToString(const SessionItem& item)
{
QString result;
@@ -45,12 +45,19 @@ QString doubleToString(const SessionItem& item)
return result;
}
+QWidget* createEditorFromIndex(const QModelIndex& index, QWidget* parent) {
+ if (index.column() == SessionFlags::ITEM_VALUE && index.internalPointer()) {
+ auto item = static_cast<SessionItem*>(index.internalPointer());
+ return PropertyEditorFactory::CreateEditor(*item, parent);
+ }
+ return nullptr;
+}
+
}
SessionModelDelegate::SessionModelDelegate(QObject* parent)
: QStyledItemDelegate(parent)
{
-
}
void SessionModelDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
@@ -72,9 +79,7 @@ void SessionModelDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
QWidget* SessionModelDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option,
const QModelIndex& index) const
{
-
- auto item = static_cast<SessionItem*>(index.internalPointer());
- auto result = PropertyEditorFactory::CreateEditor(*item, parent);
+ auto result = createEditorFromIndex(index, parent);
if (result) {
if(auto customEditor = dynamic_cast<CustomEditor*>(result)) {
@@ -98,7 +103,8 @@ QWidget* SessionModelDelegate::createEditor(QWidget* parent, const QStyleOptionV
void SessionModelDelegate::setModelData(QWidget* editor, QAbstractItemModel* model,
const QModelIndex& index) const
{
- if (auto customEditor = qobject_cast<CustomEditor*>(editor))
+ auto customEditor = qobject_cast<CustomEditor*>(editor);
+ if (index.column() == SessionFlags::ITEM_VALUE && customEditor)
model->setData(index, customEditor->editorData());
else
QStyledItemDelegate::setModelData(editor, model, index);
@@ -108,7 +114,8 @@ void SessionModelDelegate::setModelData(QWidget* editor, QAbstractItemModel* mod
void SessionModelDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
{
- if (auto customEditor = dynamic_cast<CustomEditor*>(editor))
+ auto customEditor = dynamic_cast<CustomEditor*>(editor);
+ if (index.column() == SessionFlags::ITEM_VALUE && customEditor)
customEditor->setData(index.data());
else
QStyledItemDelegate::setEditorData(editor, index);
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index c7e51b63926cf2c802e041ad4b9abb534a54940c..e7971e92e19562ba369b4d248ce2e6639f424311 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -14,7 +14,7 @@
//
// ************************************************************************** //
-#include "ColorProperty.h"
+#include "ObsoleteColorProperty.h"
#include "ComboProperty.h"
#include "GUIHelpers.h"
#include "GroupItem.h"
@@ -28,15 +28,19 @@ namespace
{
const QString SET_ITEM_PROPERTY_ERROR = "SET_ITEM_PROPERTY_ERROR";
const QString ITEM_IS_NOT_INITIALIZED = "ITEM_IS_NOT_INITIALIZED";
-const QString NON_EXISTING_SUBITEM = "NON_EXISTING_SUBITEM";
const QString bool_type_name = "bool";
const QString double_type_name = "double";
const QString int_type_name = "int";
const QString qstring_type_name = "QString";
+
+void report_error(WarningMessageService* messageService, SessionItem* item,
+ const QString& error_type, const QString& message);
+
+SessionItem* createItem(SessionItem* parent, const QString& modelType, const QString& tag);
}
-void SessionWriter::writeTo(QXmlStreamWriter *writer, SessionItem *parent)
+void SessionXML::writeTo(QXmlStreamWriter* writer, SessionItem* parent)
{
writer->writeStartElement(parent->model()->getModelTag());
writer->writeAttribute(SessionXML::ModelNameAttribute, parent->model()->getModelName());
@@ -46,33 +50,29 @@ void SessionWriter::writeTo(QXmlStreamWriter *writer, SessionItem *parent)
writer->writeEndElement(); // m_model_tag
}
-void SessionWriter::writeItemAndChildItems(QXmlStreamWriter *writer, const SessionItem *item)
+void SessionXML::writeItemAndChildItems(QXmlStreamWriter* writer, const SessionItem* item)
{
- Q_ASSERT(item);
if (item->parent()) {
writer->writeStartElement(SessionXML::ItemTag);
writer->writeAttribute(SessionXML::ModelTypeAttribute, item->modelType());
QString tag = item->parent()->tagFromItem(item);
- if (tag == item->parent()->defaultTag())
- tag = "";
writer->writeAttribute(SessionXML::TagAttribute, tag);
- writer->writeAttribute(SessionXML::DisplayNameAttribute, item->data(SessionFlags::DisplayNameRole).toString());
- QVector<int> roles = item->getRoles();
- foreach(int role, roles) {
+ writer->writeAttribute(SessionXML::DisplayNameAttribute,
+ item->data(SessionFlags::DisplayNameRole).toString());
+ for (int role : item->getRoles()) {
if (role == Qt::DisplayRole || role == Qt::EditRole)
- writeVariant(writer, item->value(), role);
+ SessionXML::writeVariant(writer, item->value(), role);
}
-
}
- foreach (SessionItem *child_item, item->children()) {
- writeItemAndChildItems(writer, child_item);
- }
- if (item->parent()) {
+
+ for (auto child : item->children())
+ writeItemAndChildItems(writer, child);
+
+ if (item->parent())
writer->writeEndElement(); // ItemTag
- }
}
-void SessionWriter::writeVariant(QXmlStreamWriter *writer, QVariant variant, int role)
+void SessionXML::writeVariant(QXmlStreamWriter* writer, QVariant variant, int role)
{
if (variant.isValid()) {
writer->writeStartElement(SessionXML::ParameterTag);
@@ -100,12 +100,12 @@ void SessionWriter::writeVariant(QXmlStreamWriter *writer, QVariant variant, int
}
else if (type_name == Constants::ExternalPropertyType) {
- ExternalProperty material_property = variant.value<ExternalProperty>();
- writer->writeAttribute(SessionXML::ParameterValueAttribute,
- material_property.getName());
- writer->writeAttribute(SessionXML::IdentifierAttribute,
- material_property.getIdentifier());
+ ExternalProperty prop = variant.value<ExternalProperty>();
+ writer->writeAttribute(SessionXML::ExternalPropertyTextAtt, prop.text());
+ QString tcol = prop.color().isValid() ? prop.color().name(QColor::HexArgb) : "";
+ writer->writeAttribute(SessionXML::ExternalPropertyColorAtt, tcol);
+ writer->writeAttribute(SessionXML::ExternalPropertyIdentifierAtt, prop.identifier());
}
else if (type_name == Constants::ComboPropertyType) {
@@ -122,28 +122,20 @@ void SessionWriter::writeVariant(QXmlStreamWriter *writer, QVariant variant, int
writer->writeAttribute(SessionXML::ParameterValueAttribute, ff_name);
}
- else if (type_name == Constants::ColorPropertyType) {
- int r, g, b, a;
- QColor material_color = variant.value<ColorProperty>().getColor();
- material_color.getRgb(&r, &g, &b, &a);
- writer->writeAttribute(SessionXML::ColorRedAttribute, QString::number(r));
- writer->writeAttribute(SessionXML::ColorGreenAttribute, QString::number(g));
- writer->writeAttribute(SessionXML::ColorBlueAttribute, QString::number(b));
- writer->writeAttribute(SessionXML::ColorAlphaAttribute, QString::number(a));
-
- } else {
- throw GUIHelpers::Error("SessionModel::writeProperty: Parameter type not supported " + type_name);
+ else {
+ throw GUIHelpers::Error("SessionModel::writeProperty: Parameter type not supported "
+ + type_name);
}
writer->writeEndElement(); // end ParameterTag
}
}
-void SessionReader::readItems(QXmlStreamReader *reader, SessionItem *item, const QString &topTag,
- WarningMessageService *messageService)
+void SessionXML::readItems(QXmlStreamReader* reader, SessionItem* parent, QString topTag,
+ WarningMessageService* messageService)
{
- bool isTopItem = true;
- const QString start_type = item->model()->getModelTag();
+ Q_ASSERT(parent);
+ const QString start_type = parent->model()->getModelTag();
while (!reader->atEnd()) {
reader->readNext();
if (reader->isStartElement()) {
@@ -151,103 +143,41 @@ void SessionReader::readItems(QXmlStreamReader *reader, SessionItem *item, const
const QString model_type
= reader->attributes().value(SessionXML::ModelTypeAttribute).toString();
QString tag = reader->attributes().value(SessionXML::TagAttribute).toString();
- if (isTopItem) {
+ QString displayName
+ = reader->attributes().value(SessionXML::DisplayNameAttribute).toString();
+
+ if (!topTag.isEmpty()) {
+ // to handle copying of item to another parent
tag = topTag;
+ topTag.clear();
}
- if (tag == SessionItem::P_NAME)
- item->setItemName("");
- if (model_type == Constants::PropertyType || model_type == Constants::GroupItemType) {
- SessionItem *newItem = item->getItem(tag);
- if (!newItem) {
- QString message = QString("Unrecoverable read error for model '%1', "
- "Can't get item for tag '%2'").arg(item->model()->getModelTag()).arg(tag);
- throw GUIHelpers::Error(message);
- }
- item = newItem;
-
- } else if (item->modelType() == Constants::GroupItemType) {
- // get item corresponding to model_type and create if it doesn't exist
- SessionItem *newItem = item->parent()->item<GroupItem>(
- item->parent()->tagFromItem(item))
- .groupProperty()->getItemOfType(model_type);
- if (!newItem) {
- QString message = QString("Unrecoverable read error for model '%1', "
- "Can't get group item").arg(item->model()->getModelTag());
- throw GUIHelpers::Error(message);
- }
- item = newItem;
-
- } else {
- if (tag == "")
- tag = item->defaultTag();
-
- SessionItem *newItem(0);
- SessionTagInfo info = item->getTagInfo(tag);
- if (info.min == 1 && info.max == 1 && info.childCount == 1) {
- newItem = item->getItem(tag);
- } else {
- newItem = ItemFactory::createItem(model_type);
- if (!item->insertItem(-1, newItem, tag)) {
- QString message = QString("Attempt to create item '%1' for tag '%2' failed")
- .arg(model_type).arg(tag);
- report_error(messageService, item, ITEM_IS_NOT_INITIALIZED, message);
- return;
- }
-
- }
-
- if (!newItem) {
- QString message = QString("Unrecoverable read error for model '%1', "
- "Can't add item for tag").arg(item->model()->getModelTag()).arg(tag);
- throw GUIHelpers::Error(message);
- }
-
- if (reader->attributes().hasAttribute(SessionXML::DisplayNameAttribute)) {
- newItem->setDisplayName(reader->attributes().value(SessionXML::DisplayNameAttribute).toString());
- }
- item = newItem;
- }
- if (!item) {
-// tag = -1;
- }
-
-// tag = -1; // all but the first item should be appended
- isTopItem = false;
-
+ parent = createItem(parent, model_type, tag);
+ parent->setDisplayName(displayName);
} else if (reader->name() == SessionXML::ParameterTag) {
- readProperty(reader, item, messageService);
+ SessionXML::readProperty(reader, parent, messageService);
}
} else if (reader->isEndElement()) {
- if (reader->name() == SessionXML::ItemTag) {
- if(item) {
- item = item->parent();
- } else {
- // handling the case when reading obsolete project file, when SubItem doesn't exist anymore
- Q_ASSERT(0);
- }
- }
- if (reader->name() == start_type) {
+ if (reader->name() == SessionXML::ItemTag && parent)
+ parent = parent->parent();
+
+ if (reader->name() == start_type)
break;
- }
- if (reader->name() == SessionXML::ParameterTag) {
- }
}
}
}
-QString SessionReader::readProperty(QXmlStreamReader *reader,
- SessionItem *item, WarningMessageService *messageService)
+QString SessionXML::readProperty(QXmlStreamReader* reader, SessionItem* item,
+ WarningMessageService* messageService)
{
const QString parameter_name
= reader->attributes().value(SessionXML::ParameterNameAttribute).toString();
const QString parameter_type
= reader->attributes().value(SessionXML::ParameterTypeAttribute).toString();
- const int role
- = reader->attributes().value(SessionXML::ParameterRoleAttribute).toInt();
+ const int role = reader->attributes().value(SessionXML::ParameterRoleAttribute).toInt();
- if(!item) {
- QString message = QString("Attempt to set property '%1' for non existing item")
- .arg(parameter_name);
+ if (!item) {
+ QString message
+ = QString("Attempt to set property '%1' for non existing item").arg(parameter_name);
report_error(messageService, item, ITEM_IS_NOT_INITIALIZED, message);
return parameter_name;
}
@@ -278,10 +208,17 @@ QString SessionReader::readProperty(QXmlStreamReader *reader,
}
else if (parameter_type == Constants::ExternalPropertyType) {
- QString identifier = reader->attributes().value(SessionXML::IdentifierAttribute).toString();
-
- ExternalProperty material_property(identifier);
- variant = material_property.getVariant();
+ QString text = reader->attributes().value(SessionXML::ExternalPropertyTextAtt).toString();
+ QString colorName
+ = reader->attributes().value(SessionXML::ExternalPropertyColorAtt).toString();
+ QString identifier
+ = reader->attributes().value(SessionXML::ExternalPropertyIdentifierAtt).toString();
+
+ ExternalProperty property;
+ property.setText(text);
+ property.setColor(QColor(colorName));
+ property.setIdentifier(identifier);
+ variant = property.variant();
}
else if (parameter_type == Constants::ComboPropertyType) {
@@ -294,7 +231,7 @@ QString SessionReader::readProperty(QXmlStreamReader *reader,
combo_property.setStringOfValues(parameterExt);
combo_property.setCurrentIndex(parameter_value);
- variant = combo_property.getVariant();
+ variant = combo_property.variant();
}
else if (parameter_type == Constants::GroupPropertyType) {
@@ -302,7 +239,7 @@ QString SessionReader::readProperty(QXmlStreamReader *reader,
= reader->attributes().value(SessionXML::ParameterValueAttribute).toString();
QVariant v = item->value();
- if(!v.canConvert<GroupProperty_t>()) {
+ if (!v.canConvert<GroupProperty_t>()) {
report_error(messageService, item, SET_ITEM_PROPERTY_ERROR,
QStringLiteral("GroupProperty conversion failed"));
} else {
@@ -312,18 +249,10 @@ QString SessionReader::readProperty(QXmlStreamReader *reader,
}
}
- else if (parameter_type == Constants::ColorPropertyType) {
- int r = reader->attributes().value(SessionXML::ColorRedAttribute).toInt();
- int g = reader->attributes().value(SessionXML::ColorGreenAttribute).toInt();
- int b = reader->attributes().value(SessionXML::ColorBlueAttribute).toInt();
- int a = reader->attributes().value(SessionXML::ColorAlphaAttribute).toInt();
- ColorProperty color(QColor(r, g, b, a));
- variant = color.getVariant();
- }
-
else {
throw GUIHelpers::Error("SessionModel::readProperty: "
- "Parameter type not supported" + parameter_type);
+ "Parameter type not supported"
+ + parameter_type);
}
if (variant.isValid()) {
@@ -333,13 +262,35 @@ QString SessionReader::readProperty(QXmlStreamReader *reader,
return parameter_name;
}
-void SessionReader::report_error(WarningMessageService *messageService,
- SessionItem *item, const QString &error_type,
- const QString &message)
+namespace
{
- if(messageService) {
+void report_error(WarningMessageService* messageService, SessionItem* item,
+ const QString& error_type, const QString& message)
+{
+ if (messageService) {
messageService->send_message(item->model(), error_type, message);
} else {
throw GUIHelpers::Error(error_type + QString(" ") + message);
}
}
+
+SessionItem* createItem(SessionItem* parent, const QString& modelType, const QString& tag)
+{
+ SessionItem* result(nullptr);
+
+ if (parent->modelType() == Constants::GroupItemType) {
+ result = parent->parent()
+ ->item<GroupItem>(parent->parent()->tagFromItem(parent))
+ .groupProperty()
+ ->getItemOfType(modelType);
+ } else {
+ SessionTagInfo info = parent->getTagInfo(tag);
+ if (info.min == 1 && info.max == 1 && info.childCount == 1)
+ result = parent->getItem(tag);
+ else
+ result = parent->model()->insertNewItem(modelType, parent->index(), -1, tag);
+ }
+ Q_ASSERT(result);
+ return result;
+}
+}
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/coregui/Models/SessionXML.h
index 455fb216186477aa5223ce402e2ae13e8daed433..a30df5bbb68cdf47ad0b560f54815cc66a2aee57 100644
--- a/GUI/coregui/Models/SessionXML.h
+++ b/GUI/coregui/Models/SessionXML.h
@@ -25,17 +25,15 @@ class QXmlStreamReader;
class SessionItem;
class WarningMessageService;
-namespace SessionXML {
+namespace SessionXML
+{
const QString ItemMimeType = "application/org.bornagainproject.xml.item.z";
const QString LinkMimeType = "application/org.bornagainproject.fittinglink";
-const QString ModelTag("SessionModel");
const QString InstrumentModelTag("InstrumentModel");
const QString SampleModelTag("SampleModel");
const QString MaterialModelTag("MaterialModel");
-const QString FitModelTag("FitModel");
const QString JobModelTag("JobModel");
-const QString MaskModelTag("MaskModel");
const QString DocumentModelTag("DocumentModel");
const QString RealDataModelTag("RealDataModel");
@@ -52,37 +50,19 @@ const QString ParameterValueAttribute("ParValue");
const QString ParameterRoleAttribute("ParRole");
const QString ParameterExtAttribute("ParExt");
-const QString IdentifierAttribute("Identifier");
-
-const QString ColorRedAttribute("Red");
-const QString ColorGreenAttribute("Green");
-const QString ColorBlueAttribute("Blue");
-const QString ColorAlphaAttribute("Alpha");
+const QString ExternalPropertyTextAtt("Text");
+const QString ExternalPropertyColorAtt("Color");
+const QString ExternalPropertyIdentifierAtt("Identifier");
-const QString AngleUnitsAttribute("Units");
+BA_CORE_API_ void writeTo(QXmlStreamWriter* writer, SessionItem* parent);
+BA_CORE_API_ void writeItemAndChildItems(QXmlStreamWriter* writer, const SessionItem* item);
+BA_CORE_API_ void writeVariant(QXmlStreamWriter* writer, QVariant variant, int role);
+BA_CORE_API_ void readItems(QXmlStreamReader* reader, SessionItem* parent,
+ QString topTag = QString(),
+ WarningMessageService* messageService = nullptr);
+BA_CORE_API_ QString readProperty(QXmlStreamReader* reader, SessionItem* item,
+ WarningMessageService* messageService = nullptr);
}
-class BA_CORE_API_ SessionWriter
-{
-public:
- static void writeTo(QXmlStreamWriter *writer, SessionItem *parent);
- static void writeItemAndChildItems(QXmlStreamWriter *writer, const SessionItem *item);
- static void writeVariant(QXmlStreamWriter *writer, QVariant variant, int role);
-};
-
-class BA_CORE_API_ SessionReader
-{
-public:
- static void readItems(QXmlStreamReader *reader, SessionItem *item,
- const QString &topTag = QString(),
- WarningMessageService *messageService=0);
- static QString readProperty(QXmlStreamReader *reader, SessionItem *item,
- WarningMessageService *messageService=0);
-
-private:
- static void report_error(WarningMessageService *messageService, SessionItem *item,
- const QString &error_type, const QString &message);
-};
-
#endif // SESSIONXML_H
diff --git a/GUI/coregui/Models/SimulationOptionsItem.cpp b/GUI/coregui/Models/SimulationOptionsItem.cpp
index 6e8b13dc8c134586069099f50ab84eeecd52dcc1..bdad10fd29b8a3e8e7529e2589ed308c4b865c25 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.cpp
+++ b/GUI/coregui/Models/SimulationOptionsItem.cpp
@@ -61,28 +61,28 @@ SimulationOptionsItem::SimulationOptionsItem()
<< Constants::JOB_RUN_IN_BACKGROUND
<< Constants::JOB_RUN_SUBMIT_ONLY;
policy.setToolTips(getRunPolicyTooltips());
- addProperty(P_RUN_POLICY, policy.getVariant())->setToolTip(tooltip_runpolicy);
+ addProperty(P_RUN_POLICY, policy.variant())->setToolTip(tooltip_runpolicy);
ComboProperty nthreads;
nthreads << getCPUUsageOptions();
- addProperty(P_NTHREADS, nthreads.getVariant())->setToolTip(tooltip_nthreads);
+ addProperty(P_NTHREADS, nthreads.variant())->setToolTip(tooltip_nthreads);
ComboProperty computationMethod;
computationMethod << Constants::SIMULATION_ANALYTICAL << Constants::SIMULATION_MONTECARLO;
addProperty(P_COMPUTATION_METHOD,
- computationMethod.getVariant())->setToolTip(tooltip_computation);
+ computationMethod.variant())->setToolTip(tooltip_computation);
addProperty(P_MC_POINTS, 100)->setEnabled(false);
ComboProperty averageLayerMaterials;
averageLayerMaterials <<Constants::AMBIENT_LAYER_MATERIAL << Constants::AVERAGE_LAYER_MATERIAL;
addProperty(P_FRESNEL_MATERIAL_METHOD,
- averageLayerMaterials.getVariant())->setToolTip(tooltip_ambientmaterial);
+ averageLayerMaterials.variant())->setToolTip(tooltip_ambientmaterial);
ComboProperty includeSpecularPeak;
includeSpecularPeak << Constants::No << Constants::Yes;
addProperty(P_INCLUDE_SPECULAR_PEAK,
- includeSpecularPeak.getVariant())->setToolTip(tooltip_specularpeak);
+ includeSpecularPeak.variant())->setToolTip(tooltip_specularpeak);
mapper()->setOnPropertyChange(
[this](const QString &name) {
@@ -122,14 +122,14 @@ void SimulationOptionsItem::setRunPolicy(const QString &policy)
{
ComboProperty combo = getItemValue(P_RUN_POLICY).value<ComboProperty>();
combo.setValue(policy);
- setItemValue(P_RUN_POLICY, combo.getVariant());
+ setItemValue(P_RUN_POLICY, combo.variant());
}
void SimulationOptionsItem::setComputationMethod(const QString &name)
{
ComboProperty combo = getItemValue(P_COMPUTATION_METHOD).value<ComboProperty>();
combo.setValue(name);
- setItemValue(P_COMPUTATION_METHOD, combo.getVariant());
+ setItemValue(P_COMPUTATION_METHOD, combo.variant());
}
QString SimulationOptionsItem::getComputationMethod() const
@@ -152,7 +152,7 @@ void SimulationOptionsItem::setFresnelMaterialMethod(const QString& name)
{
ComboProperty combo = getItemValue(P_FRESNEL_MATERIAL_METHOD).value<ComboProperty>();
combo.setValue(name);
- setItemValue(P_FRESNEL_MATERIAL_METHOD, combo.getVariant());
+ setItemValue(P_FRESNEL_MATERIAL_METHOD, combo.variant());
}
QString SimulationOptionsItem::getFresnelMaterialMethod() const
@@ -165,7 +165,7 @@ void SimulationOptionsItem::setIncludeSpecularPeak(const QString& name)
{
ComboProperty combo = getItemValue(P_INCLUDE_SPECULAR_PEAK).value<ComboProperty>();
combo.setValue(name);
- setItemValue(P_INCLUDE_SPECULAR_PEAK, combo.getVariant());
+ setItemValue(P_INCLUDE_SPECULAR_PEAK, combo.variant());
}
QString SimulationOptionsItem::getIncludeSpecularPeak() const
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index f94456537df367fae2a066cc5a8db2e40cdfab9f..5a44f6f19d8c80a258c2bf7be8608a722732fd00 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -60,20 +60,9 @@ using SessionItemUtils::GetVectorItem;
std::unique_ptr<Material> TransformToDomain::createDomainMaterial(const SessionItem& item)
{
- ExternalProperty material_property;
- if (item.modelType() == Constants::ParticleType) {
- material_property
- = item.getItemValue(ParticleItem::P_MATERIAL).value<ExternalProperty>();
- } else if (item.modelType() == Constants::LayerType) {
- material_property
- = item.getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
- }
- if (!material_property.isDefined())
- throw GUIHelpers::Error(
- "TransformToDomain::createDomainMaterial() -> Error. Can't create material "
- "for item '"+item.displayName()+"'.");
-
- return MaterialItemUtils::createDomainMaterial(material_property);
+ QString tag = MaterialItemUtils::materialTag(item);
+ ExternalProperty property = item.getItemValue(tag).value<ExternalProperty>();
+ return MaterialItemUtils::createDomainMaterial(property);
}
std::unique_ptr<MultiLayer> TransformToDomain::createMultiLayer(const SessionItem& item)
diff --git a/GUI/coregui/Models/item_constants.h b/GUI/coregui/Models/item_constants.h
index 08a74a099ec0856d0a7a2520a15b3bcdbef7a54d..1ad245db42e9ff34f1780325acbc172ada07eb0d 100644
--- a/GUI/coregui/Models/item_constants.h
+++ b/GUI/coregui/Models/item_constants.h
@@ -270,12 +270,13 @@ const QString MaskEditorPresentation = "Mask Editor";
const ModelType ExternalPropertyType = "ExternalProperty";
const ModelType ComboPropertyType = "ComboProperty";
-const ModelType ColorPropertyType = "ColorProperty";
const ModelType GroupPropertyType = "GroupProperty_t";
// --- Custom editors for variant propertues ---
const ModelType DefaultEditorType = "Default";
const ModelType ScientificEditorType = "SceintificDouble";
+const ModelType MaterialEditorExternalType = "ExtMaterialEditor";
+const ModelType ColorEditorExternalType = "ExtColorEditor";
}
#endif // ITEM_CONSTANTS_H
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
index af17af2fde6afb1269d305318e650a24777d4f2e..10c4d0e8cf57dbaf8b1646456d684ac8a189d839 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
@@ -339,8 +339,6 @@ void LinkInstrumentManager::setRealDataModel(RealDataModel *model)
this, SLOT(onRealDataRowsChange(QModelIndex, int, int)));
disconnect(m_realDataModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
this, SLOT(onRealDataRowsChange(QModelIndex, int, int)));
- disconnect(m_realDataModel, SIGNAL(modelLoaded()),
- this, SLOT(updateLinks()));
}
m_realDataModel = model;
@@ -350,7 +348,5 @@ void LinkInstrumentManager::setRealDataModel(RealDataModel *model)
this, SLOT(onRealDataRowsChange(QModelIndex, int, int)));
connect(m_realDataModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
this, SLOT(onRealDataRowsChange(QModelIndex, int, int)));
- connect(m_realDataModel, SIGNAL(modelLoaded()),
- this, SLOT(updateLinks()));
}
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index a3b072abc5ea6b8ee27cf8e96d749619557293b9..4696eafecda78f8f5705e80632f4ee9e7e816e9b 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -157,7 +157,7 @@ void IntensityDataCanvas::applyPersistentSettings()
QString persistentGradient = settings.value(gradient_setting_name()).toString();
if (combo.getValue() != persistentGradient) {
combo.setValue(settings.value(gradient_setting_name()).toString());
- intensityDataItem()->setItemValue(IntensityDataItem::P_GRADIENT, combo.getVariant());
+ intensityDataItem()->setItemValue(IntensityDataItem::P_GRADIENT, combo.variant());
}
}
diff --git a/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp b/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp
index f8348d58b1ea5edc0eb8d6f04f01282344f93812..e7710e0c9835ab3ee75785a7608b140c08b93447 100644
--- a/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp
+++ b/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp
@@ -18,24 +18,21 @@
#include "MaterialItem.h"
#include "MaterialModel.h"
-ExternalProperty::ExternalProperty(const QString& identifier)
- : m_identifier(identifier)
- , m_name("Undefined")
- , m_color(Qt::red)
+ExternalProperty::ExternalProperty()
{}
-QString ExternalProperty::getName() const
+QString ExternalProperty::text() const
{
- return m_name;
+ return m_text;
}
-void ExternalProperty::setName(const QString& name)
+void ExternalProperty::setText(const QString& name)
{
- m_name = name;
+ m_text = name;
}
-QColor ExternalProperty::getColor() const
+QColor ExternalProperty::color() const
{
return m_color;
}
@@ -45,15 +42,58 @@ void ExternalProperty::setColor(const QColor& color)
m_color = color;
}
+QString ExternalProperty::identifier() const {
+ return m_identifier;
+}
-QPixmap ExternalProperty::getPixmap() const
+void ExternalProperty::setIdentifier(const QString& identifier)
+{
+ m_identifier = identifier;
+}
+
+QPixmap ExternalProperty::pixmap() const
{
QPixmap pixmap(10,10);
- pixmap.fill(getColor());
+ pixmap.fill(color());
return pixmap;
}
-bool ExternalProperty::isDefined() const
+//! Returns true if property is in valid state (i.e. have at least one member defined).
+
+bool ExternalProperty::isValid() const
+{
+ if (m_identifier.isEmpty() && m_text.isEmpty() && !m_color.isValid())
+ return false;
+
+ return true;
+}
+
+QVariant ExternalProperty::variant() const
+{
+ QVariant variant;
+ variant.setValue(*this);
+ return variant;
+}
+
+bool ExternalProperty::operator==(const ExternalProperty& other) const
+{
+ if (m_identifier != other.m_identifier)
+ return false;
+ if (m_text != other.m_text)
+ return false;
+ if (m_color != other.m_color)
+ return false;
+
+ return true;
+}
+
+bool ExternalProperty::operator!=(const ExternalProperty& other) const
{
- return !m_identifier.isEmpty();
+ return !(*this == other);
}
+
+bool ExternalProperty::operator<(const ExternalProperty& other) const
+{
+ return m_identifier < other.m_identifier && m_text < other.m_text;
+}
+
diff --git a/GUI/coregui/Views/MaterialEditor/ExternalProperty.h b/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
index 6b09bf9e3a3cebfe393d0cfbd44aa9e6ae69190f..bc89186ee603277c86118ddf957a25280e1da8e4 100644
--- a/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
+++ b/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
@@ -24,38 +24,37 @@
#include <QString>
#include <QVariant>
-//! The MaterialProperty class defines unique identifier to help LayerItem, ParticleItem etc
-//! to access materials from MaterialEditor;
+//! The ExternalProperty class defines custom QVariant property to carry the text, color and
+//! an identifier.
+
class BA_CORE_API_ ExternalProperty
{
public:
- explicit ExternalProperty(const QString &identifier=QString());
+ explicit ExternalProperty();
- QString getIdentifier() const {
- return m_identifier;
- }
+ QString text() const;
+ void setText(const QString& name);
- QVariant getVariant() const
- {
- QVariant variant;
- variant.setValue(*this);
- return variant;
- }
+ QColor color() const;
+ void setColor(const QColor& color);
- QString getName() const;
- void setName(const QString& name);
+ QString identifier() const;
+ void setIdentifier(const QString& identifier);
- QColor getColor() const;
- void setColor(const QColor& color);
+ QPixmap pixmap() const;
- QPixmap getPixmap() const;
+ bool isValid() const;
- bool isDefined() const;
+ QVariant variant() const;
+
+ bool operator==(const ExternalProperty& other) const;
+ bool operator!=(const ExternalProperty& other) const;
+ bool operator<(const ExternalProperty& other) const;
private:
- QString m_identifier;
- QString m_name;
+ QString m_text;
QColor m_color;
+ QString m_identifier;
};
Q_DECLARE_METATYPE(ExternalProperty)
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
index 52c09865cb44cd7186c27fccd8189f9baafc7cc8..699a3143268bc3f5d4718638bc621580bff68546 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
@@ -20,6 +20,7 @@
#include "MaterialItem.h"
#include "MaterialModel.h"
#include "SessionDecorationModel.h"
+#include "ExternalProperty.h"
#include <QListView>
#include <QSplitter>
#include <QVBoxLayout>
@@ -69,9 +70,10 @@ MaterialItem* MaterialEditor::selectedMaterial()
//! Sets selection corresponding to initial material property
void MaterialEditor::setInitialMaterialProperty(const ExternalProperty& matProperty)
{
- if (MaterialItem* mat = m_materialModel->getMaterial(matProperty)) {
+ if (MaterialItem* mat = m_materialModel->materialFromIdentifier(matProperty.identifier())) {
selectionModel()->clearSelection();
- selectionModel()->select(m_materialModel->indexOfItem(mat), QItemSelectionModel::Select);
+ selectionModel()->setCurrentIndex(m_materialModel->indexOfItem(mat), QItemSelectionModel::ClearAndSelect);
+ selectionModel()->select(m_materialModel->indexOfItem(mat), QItemSelectionModel::ClearAndSelect);
}
}
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index f637227430a10bc651ba2c460ec61817a186b5ee..9b870a591717b82ae719ae092ce70a551f1cb1af 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -56,7 +56,6 @@ void MaterialEditorDialog::onOKButton()
if (m_materialEditor->modelWasChanged()) {
m_origMaterialModel->clear();
m_origMaterialModel->initFrom(m_tmpMaterialModel.get(), 0);
- m_origMaterialModel->createdFromCopy();
}
writeSettings();
accept();
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
index 955e2937c340aadc3f3a88ef68e5e5163a8c346c..6b4cfa95ed5f43044e38525ee461845c1feb6e9e 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
@@ -26,6 +26,7 @@
#include "MaterialEditorDialog.h"
#include "AppSvc.h"
#include "MaterialItem.h"
+#include <QColorDialog>
QColor MaterialItemUtils::suggestMaterialColor(const QString &name)
@@ -50,6 +51,9 @@ QColor MaterialItemUtils::suggestMaterialColor(const QString &name)
ExternalProperty MaterialItemUtils::defaultMaterialProperty()
{
+ if (!AppSvc::materialModel())
+ return ExternalProperty();
+
auto materials = AppSvc::materialModel()->topItems();
return materials.isEmpty() ? ExternalProperty() :
MaterialItemUtils::materialProperty(*materials.front());
@@ -60,11 +64,11 @@ std::unique_ptr<Material>
MaterialItemUtils::createDomainMaterial(const ExternalProperty &material_property)
{
MaterialItem *materialItem
- = AppSvc::materialModel()->materialFromIdentifier(material_property.getIdentifier());
+ = AppSvc::materialModel()->materialFromIdentifier(material_property.identifier());
if(!materialItem)
throw GUIHelpers::Error("MaterialUtils::createDomainMaterial() -> Error. Can't create "
- "material with name '"+material_property.getName()+"'.");
+ "material with name '"+material_property.text()+"'.");
return materialItem->createMaterial();
}
@@ -89,22 +93,33 @@ QStringList MaterialItemUtils::materialRelatedModelTypes()
return {Constants::ParticleType, Constants::LayerType};
}
+//! Constructs material property for given material.
ExternalProperty MaterialItemUtils::materialProperty(const SessionItem& materialItem)
{
- ExternalProperty result(materialItem.getItemValue(MaterialItem::P_IDENTIFIER).toString());
+ ExternalProperty result;
+
+ ExternalProperty colorProperty = materialItem.getItemValue(MaterialItem::P_COLOR).value<ExternalProperty>();
+ result.setIdentifier(materialItem.getItemValue(MaterialItem::P_IDENTIFIER).toString());
+ result.setColor(colorProperty.color());
+ result.setText(materialItem.itemName());
- ColorProperty colorProperty = materialItem.getItemValue(MaterialItem::P_COLOR).value<ColorProperty>();
- result.setColor(colorProperty.getColor());
- result.setName(materialItem.itemName());
+ return result;
+}
+ExternalProperty MaterialItemUtils::colorProperty(const QColor& color)
+{
+ ExternalProperty result;
+ result.setColor(color);
+ result.setText(QString("[%1, %2, %3] (%4)")
+ .arg(color.red()).arg(color.green()).arg(color.blue()).arg(color.alpha()));
return result;
}
-ExternalProperty MaterialItemUtils::selectMaterialProperty(const ExternalProperty& previousMaterial)
+ExternalProperty MaterialItemUtils::selectMaterialProperty(const ExternalProperty& previous)
{
MaterialEditorDialog dialog(AppSvc::materialModel());
- dialog.setMaterialProperty(previousMaterial);
+ dialog.setMaterialProperty(previous);
if(dialog.exec() == QDialog::Accepted) {
return dialog.selectedMaterialProperty();
}
@@ -112,3 +127,16 @@ ExternalProperty MaterialItemUtils::selectMaterialProperty(const ExternalPropert
return ExternalProperty();
}
+
+ExternalProperty MaterialItemUtils::selectColorProperty(const ExternalProperty& previous)
+{
+ ExternalProperty result;
+
+ bool ok = false;
+ QRgb oldRgba = previous.color().rgba();
+ QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, nullptr);
+ if (ok && newRgba != oldRgba)
+ result = MaterialItemUtils::colorProperty(QColor::fromRgba(newRgba));
+
+ return result;
+}
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
index ca05f7ac8d2c46fc254570953f4a16d430be8bcb..e083455f644489d109fa9ddd8ca98f11a7e50963 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
@@ -17,7 +17,7 @@
#ifndef MATERIALITEMUTILS_H
#define MATERIALITEMUTILS_H
-#include "ColorProperty.h"
+#include "ObsoleteColorProperty.h"
#include "MaterialItem.h"
#include "ExternalProperty.h"
#include <QColor>
@@ -40,8 +40,14 @@ BA_CORE_API_ QStringList materialRelatedModelTypes();
//! Constructs material property corresponding to given material.
BA_CORE_API_ ExternalProperty materialProperty(const SessionItem& materialItem);
+//! Constructs color property from given color.
+BA_CORE_API_ ExternalProperty colorProperty(const QColor& color);
+
//! Calls material selector dialog.
-BA_CORE_API_ ExternalProperty selectMaterialProperty(const ExternalProperty &previousMaterial=ExternalProperty());
+BA_CORE_API_ ExternalProperty selectMaterialProperty(const ExternalProperty &previous=ExternalProperty());
+
+//! Calls color selector dialog.
+BA_CORE_API_ ExternalProperty selectColorProperty(const ExternalProperty &previous=ExternalProperty());
}
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
index 14e73e3612e66b6f4aadce6b485b87c6fd95577e..6ca6d61ec9691d187c01eb6b824e48aa565f33ce 100644
--- a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
@@ -19,8 +19,9 @@
#include "ExternalProperty.h"
#include "GroupProperty.h"
#include "ComboProperty.h"
-#include "ColorProperty.h"
+#include "ObsoleteColorProperty.h"
#include "MaterialItemUtils.h"
+#include "GUIHelpers.h"
#include <QBoxLayout>
#include <QLabel>
#include <QToolButton>
@@ -56,6 +57,7 @@ ExternalPropertyEditor::ExternalPropertyEditor(QWidget* parent)
, m_textLabel(new QLabel)
, m_pixmapLabel(new QLabel)
, m_focusFilter(new LostFocusFilter(this))
+ , m_extDialogType(Constants::MaterialEditorExternalType)
{
setMouseTracking(true);
setAutoFillBackground(true);
@@ -64,8 +66,8 @@ ExternalPropertyEditor::ExternalPropertyEditor(QWidget* parent)
layout->setContentsMargins(4, 0, 0, 0);
ExternalProperty defProperty; // to get label and pixmap of undefined material
- m_textLabel->setText(defProperty.getName());
- m_pixmapLabel->setPixmap(defProperty.getPixmap());
+ m_textLabel->setText(defProperty.text());
+ m_pixmapLabel->setPixmap(defProperty.pixmap());
auto button = new QToolButton;
button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred));
@@ -82,79 +84,38 @@ ExternalPropertyEditor::ExternalPropertyEditor(QWidget* parent)
setLayout(layout);
}
+void ExternalPropertyEditor::setExternalDialogType(const QString& editorType)
+{
+ m_extDialogType = editorType;
+}
+
void ExternalPropertyEditor::buttonClicked()
{
// temporarily installing filter to prevent loss of focus caused by too insistent dialog
installEventFilter(m_focusFilter);
- ExternalProperty materialProperty = m_data.value<ExternalProperty>();
- ExternalProperty mat = MaterialItemUtils::selectMaterialProperty(materialProperty);
+ ExternalProperty property = m_data.value<ExternalProperty>();
+
+ ExternalProperty newProperty;
+ if (m_extDialogType == Constants::MaterialEditorExternalType) {
+ newProperty = MaterialItemUtils::selectMaterialProperty(property);
+ } else if(m_extDialogType == Constants::ColorEditorExternalType) {
+ newProperty = MaterialItemUtils::selectColorProperty(property);
+ } else {
+ throw GUIHelpers::Error("ExternalPropertyEditor::buttonClicked() -> Unexpected dialog");
+ }
+
removeEventFilter(m_focusFilter);
- if(mat.isDefined() )
- setDataIntern(mat.getVariant());
+ if (newProperty.isValid() && newProperty != property)
+ setDataIntern(newProperty.variant());
}
void ExternalPropertyEditor::initEditor()
{
Q_ASSERT(m_data.canConvert<ExternalProperty>());
ExternalProperty materialProperty = m_data.value<ExternalProperty>();
- m_textLabel->setText(materialProperty.getName());
- m_pixmapLabel->setPixmap(materialProperty.getPixmap());
-}
-
-// --- ColorPropertyEditor ---
-
-ColorPropertyEditor::ColorPropertyEditor(QWidget* parent)
- : CustomEditor(parent)
- , m_textLabel(new QLabel)
- , m_pixmapLabel(new QLabel)
- , m_focusFilter(new LostFocusFilter(this))
-{
- setMouseTracking(true);
- setAutoFillBackground(true);
-
- auto layout = new QHBoxLayout;
- layout->setContentsMargins(4, 0, 0, 0);
-
- ColorProperty defProperty; // to get label and pixmap of undefined material
- m_textLabel->setText(defProperty.getText());
- m_pixmapLabel->setPixmap(defProperty.getPixmap());
-
- auto button = new QToolButton;
- button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred));
- button->setText(QLatin1String(" . . . "));
- button->setToolTip("Color selector");
- layout->addWidget(m_pixmapLabel);
- layout->addWidget(m_textLabel);
- layout->addStretch(1);
- layout->addWidget(button);
- setFocusPolicy(Qt::StrongFocus);
- setAttribute(Qt::WA_InputMethodEnabled);
- connect(button, &QToolButton::clicked, this, &ColorPropertyEditor::buttonClicked);
-
- setLayout(layout);
-}
-
-void ColorPropertyEditor::buttonClicked()
-{
- ColorProperty colorProperty = m_data.value<ColorProperty>();
-
- bool ok = false;
- QRgb oldRgba = colorProperty.getColor().rgba();
- QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
- if (ok && newRgba != oldRgba) {
- colorProperty.setColor(QColor::fromRgba(newRgba));
- m_pixmapLabel->setPixmap(colorProperty.getPixmap());
- setDataIntern(colorProperty.getVariant());
- }
-}
-
-void ColorPropertyEditor::initEditor()
-{
- Q_ASSERT(m_data.canConvert<ColorProperty>());
- ColorProperty colorProperty = m_data.value<ColorProperty>();
- m_textLabel->setText(colorProperty.getText());
- m_pixmapLabel->setPixmap(colorProperty.getPixmap());
+ m_textLabel->setText(materialProperty.text());
+ m_pixmapLabel->setPixmap(materialProperty.pixmap());
}
// --- CustomComboEditor ---
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.h b/GUI/coregui/Views/PropertyEditor/CustomEditors.h
index 13b5cea6d8abf4c6a5c207e34d5b98e73d77b18a..ff800133fdf2fb772be3c718b9d0618f6413cc87 100644
--- a/GUI/coregui/Views/PropertyEditor/CustomEditors.h
+++ b/GUI/coregui/Views/PropertyEditor/CustomEditors.h
@@ -56,25 +56,7 @@ class BA_CORE_API_ ExternalPropertyEditor : public CustomEditor
public:
explicit ExternalPropertyEditor(QWidget* parent = nullptr);
-private slots:
- void buttonClicked();
-
-protected:
- void initEditor();
-
-private:
- QLabel* m_textLabel;
- QLabel* m_pixmapLabel;
- LostFocusFilter* m_focusFilter;
-};
-
-//! Editor for ColorProperty variant.
-
-class BA_CORE_API_ ColorPropertyEditor : public CustomEditor
-{
- Q_OBJECT
-public:
- explicit ColorPropertyEditor(QWidget* parent = nullptr);
+ void setExternalDialogType(const QString& dialogType);
private slots:
void buttonClicked();
@@ -86,6 +68,7 @@ private:
QLabel* m_textLabel;
QLabel* m_pixmapLabel;
LostFocusFilter* m_focusFilter;
+ QString m_extDialogType; //!< Type of the dialog which will be created on button click
};
//! Common editor for QComboBox-like custom editors.
diff --git a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.cpp b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.cpp
index c35bcadd32e7204e369db31d93db0d0a738e0b23..b9a8698da19d17044e775952e166ecc4111fac4f 100644
--- a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.cpp
@@ -46,10 +46,10 @@ ObsoleteMaterialPropertyEdit::ObsoleteMaterialPropertyEdit(QWidget *parent)
layout->setSpacing(0);
m_textLabel = new QLabel;
- m_textLabel->setText(m_materialProperty.getName());
+ m_textLabel->setText(m_materialProperty.text());
m_pixmapLabel = new QLabel;
- m_pixmapLabel->setPixmap(m_materialProperty.getPixmap());
+ m_pixmapLabel->setPixmap(m_materialProperty.pixmap());
QToolButton *button = new QToolButton;
button->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
@@ -73,7 +73,7 @@ void ObsoleteMaterialPropertyEdit::buttonClicked()
ExternalProperty mat = MaterialItemUtils::selectMaterialProperty(m_materialProperty);
removeEventFilter(m_focusFilter);
- if(mat.isDefined() ) {
+ if(mat.isValid() ) {
setMaterialProperty(mat);
emit materialPropertyChanged(m_materialProperty);
}
@@ -84,8 +84,8 @@ void ObsoleteMaterialPropertyEdit::setMaterialProperty(
const ExternalProperty &materialProperty)
{
m_materialProperty = materialProperty;
- m_textLabel->setText(m_materialProperty.getName());
- m_pixmapLabel->setPixmap(m_materialProperty.getPixmap());
+ m_textLabel->setText(m_materialProperty.text());
+ m_pixmapLabel->setPixmap(m_materialProperty.pixmap());
}
@@ -229,7 +229,7 @@ void ObsoleteColorPropertyEdit::buttonClicked()
}
void ObsoleteColorPropertyEdit::setColorProperty(
- const ColorProperty &colorProperty)
+ const ObsoleteColorProperty &colorProperty)
{
m_colorProperty = colorProperty;
m_textLabel->setText(colorValueText(m_colorProperty.getColor()));
diff --git a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.h b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.h
index 98563dc7c04851f0c66d8b879b3f6c18fd83a67b..970d8a24ed84707fe52bc1b939017d1e8fc6e419 100644
--- a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.h
+++ b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyBrowserUtils.h
@@ -19,7 +19,7 @@
#include <QWidget>
#include "ExternalProperty.h"
-#include "ColorProperty.h"
+#include "ObsoleteColorProperty.h"
#include "ObsoleteScientificDoubleProperty.h"
#include "GroupProperty.h"
#include "ComboProperty.h"
@@ -99,20 +99,20 @@ class BA_CORE_API_ ObsoleteColorPropertyEdit : public QWidget
public:
ObsoleteColorPropertyEdit(QWidget *parent = 0);
- void setColorProperty(const ColorProperty &colorProperty);
- ColorProperty getColorProperty() const {return m_colorProperty; }
+ void setColorProperty(const ObsoleteColorProperty &colorProperty);
+ ObsoleteColorProperty getColorProperty() const {return m_colorProperty; }
QString colorValueText(const QColor &c);
signals:
- void colorPropertyChanged(const ColorProperty &material_color);
+ void colorPropertyChanged(const ObsoleteColorProperty &material_color);
private slots:
void buttonClicked();
private:
QLabel *m_textLabel;
QLabel *m_pixmapLabel;
- ColorProperty m_colorProperty;
+ ObsoleteColorProperty m_colorProperty;
};
diff --git a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.cpp b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.cpp
index d12232392cb2dface5a84e23e631cc75064c6b3e..eda3fe50570166dc3fc437cb4cbdd0cbec480f19 100644
--- a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.cpp
@@ -89,14 +89,14 @@ QWidget *ObsoletePropertyVariantFactory::createEditor(QtVariantPropertyManager *
ObsoletePropertyVariantManager::colorPropertyTypeId()) {
ObsoleteColorPropertyEdit *editor = new ObsoleteColorPropertyEdit(parent);
QVariant var = manager->value(property);
- ColorProperty mat = var.value<ColorProperty>();
+ ObsoleteColorProperty mat = var.value<ObsoleteColorProperty>();
editor->setColorProperty(mat);
m_property_to_color_editors[property].append(editor);
m_color_editor_to_property[editor] = property;
- connect(editor, SIGNAL(colorPropertyChanged(const ColorProperty &)),
- this, SLOT(slotSetValue(const ColorProperty &)));
+ connect(editor, SIGNAL(colorPropertyChanged(const ObsoleteColorProperty &)),
+ this, SLOT(slotSetValue(const ObsoleteColorProperty &)));
connect(editor, SIGNAL(destroyed(QObject *)),
this, SLOT(slotEditorDestroyed(QObject *)));
return editor;
@@ -191,7 +191,7 @@ void ObsoletePropertyVariantFactory::slotPropertyChanged(QtProperty *property,
m_property_to_color_editors[property];
QListIterator<ObsoleteColorPropertyEdit *> itEditor(editors);
while (itEditor.hasNext()) {
- ColorProperty mat = value.value<ColorProperty>();
+ ObsoleteColorProperty mat = value.value<ObsoleteColorProperty>();
itEditor.next()->setColorProperty(mat);
}
}
@@ -244,7 +244,7 @@ void ObsoletePropertyVariantFactory::slotSetValue(const ExternalProperty &value)
}
}
-void ObsoletePropertyVariantFactory::slotSetValue(const ColorProperty &value)
+void ObsoletePropertyVariantFactory::slotSetValue(const ObsoleteColorProperty &value)
{
QObject *object = sender();
QMap<ObsoleteColorPropertyEdit *, QtProperty *>::ConstIterator itEditor =
diff --git a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.h b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.h
index 1099133edc7a7cb5388cfbaadb867f5a85db10ed..c45fdc4ceb434e4d307f44c427df5ae821b3da40 100644
--- a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.h
+++ b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantFactory.h
@@ -25,7 +25,7 @@
class ObsoleteMaterialPropertyEdit;
class ExternalProperty;
class ObsoleteColorPropertyEdit;
-class ColorProperty;
+class ObsoleteColorProperty;
class ObsoleteScientificDoublePropertyEdit;
class ObsoleteScientificDoubleProperty;
class ObsoleteGroupPropertyEdit;
@@ -52,7 +52,7 @@ protected:
private slots:
void slotPropertyChanged(QtProperty *property, const QVariant &value);
void slotSetValue(const ExternalProperty &value);
- void slotSetValue(const ColorProperty &value);
+ void slotSetValue(const ObsoleteColorProperty &value);
void slotSetValue(const ObsoleteScientificDoubleProperty &value);
void slotSetValue(const GroupProperty_t &value);
void slotSetValue(const ComboProperty &value);
diff --git a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.cpp b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.cpp
index 7e2c46fe17a0cde889630e3b6b470edd50773339..38e97a58c91bc23b10dadb91f6298248c5035977 100644
--- a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.cpp
@@ -33,7 +33,7 @@ int ObsoletePropertyVariantManager::materialTypeId()
int ObsoletePropertyVariantManager::colorPropertyTypeId()
{
- int result = qMetaTypeId<ColorProperty>();
+ int result = qMetaTypeId<ObsoleteColorProperty>();
return result;
}
@@ -122,7 +122,7 @@ QVariant ObsoletePropertyVariantManager::value(const QtProperty *property) const
QString ObsoletePropertyVariantManager::valueText(const QtProperty *property) const
{
if (m_theMaterialValues.contains(property)) {
- return m_theMaterialValues[property].getName();
+ return m_theMaterialValues[property].text();
}
if (m_theColorValues.contains(property)) {
return m_theColorValues[property].getText();
@@ -143,7 +143,7 @@ QString ObsoletePropertyVariantManager::valueText(const QtProperty *property) co
QIcon ObsoletePropertyVariantManager::valueIcon(const QtProperty *property) const
{
if (m_theMaterialValues.contains(property)) {
- return QIcon(m_theMaterialValues[property].getPixmap());
+ return QIcon(m_theMaterialValues[property].pixmap());
}
if (m_theColorValues.contains(property)) {
return QIcon(m_theColorValues[property].getPixmap());
@@ -166,7 +166,7 @@ void ObsoletePropertyVariantManager::setValue(QtProperty *property, const QVaria
}
if (m_theColorValues.contains(property)) {
if( val.userType() != colorPropertyTypeId() ) return;
- ColorProperty mat = val.value<ColorProperty>();
+ ObsoleteColorProperty mat = val.value<ObsoleteColorProperty>();
m_theColorValues[property] = mat;
QVariant v2;
v2.setValue(mat);
@@ -216,7 +216,7 @@ void ObsoletePropertyVariantManager::initializeProperty(QtProperty *property)
m_theMaterialValues[property] = m;
}
if (propertyType(property) == colorPropertyTypeId()) {
- ColorProperty m;
+ ObsoleteColorProperty m;
m_theColorValues[property] = m;
}
if (propertyType(property) == scientificDoubleTypeId()) {
diff --git a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.h b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.h
index fcb0b722ba37f5cbc5885697b0d1d392ffd92750..f3c54ffb1e3709ad727d47c664c544b99b0e083a 100644
--- a/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.h
+++ b/GUI/coregui/Views/PropertyEditor/ObsoletePropertyVariantManager.h
@@ -19,7 +19,7 @@
//! collection of classes extending QtPropertyBrowser functionality
-#include "ColorProperty.h"
+#include "ObsoleteColorProperty.h"
#include "ComboProperty.h"
#include "GroupProperty.h"
#include "ExternalProperty.h"
@@ -57,7 +57,7 @@ protected:
virtual void uninitializeProperty(QtProperty *property);
private:
QMap<const QtProperty *, ExternalProperty> m_theMaterialValues;
- QMap<const QtProperty *, ColorProperty> m_theColorValues;
+ QMap<const QtProperty *, ObsoleteColorProperty> m_theColorValues;
QMap<const QtProperty *, ObsoleteScientificDoubleProperty> m_theScientificDoubleValues;
QMap<const QtProperty *, GroupProperty_t> m_theFancyGroupValues;
QMap<const QtProperty *, ComboProperty> m_theComboValues;
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
index 617533f39639173661d51928591d9cfd6ac6184c..9e91c69a2b1894703581afa797029137a12516ca 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -21,7 +21,6 @@
#include "GroupProperty.h"
#include "CustomEditors.h"
#include "ComboProperty.h"
-#include "ColorProperty.h"
#include "CustomEventFilters.h"
#include <QDoubleSpinBox>
#include <QSpinBox>
@@ -51,16 +50,11 @@ bool isIntProperty(const QVariant& variant)
return variant.type() == QVariant::Int;
}
-bool isMaterialProperty(const QVariant& variant)
+bool isExternalProperty(const QVariant& variant)
{
return variant.canConvert<ExternalProperty>();
}
-bool isColorProperty(const QVariant& variant)
-{
- return variant.canConvert<ColorProperty>();
-}
-
bool isGroupProperty(const QVariant& variant)
{
return variant.canConvert<GroupProperty_t>();
@@ -85,9 +79,7 @@ bool isBoolProperty(const QVariant& variant)
bool PropertyEditorFactory::IsCustomVariant(const QVariant& variant)
{
- if (isMaterialProperty(variant))
- return true;
- if (isColorProperty(variant))
+ if (isExternalProperty(variant))
return true;
if (isGroupProperty(variant))
return true;
@@ -102,10 +94,8 @@ bool PropertyEditorFactory::IsCustomVariant(const QVariant& variant)
// TODO replace with template method when custom variants refactored
QString PropertyEditorFactory::ToString(const QVariant& variant)
{
- if (isMaterialProperty(variant))
- return variant.value<ExternalProperty>().getName();
- if (isColorProperty(variant))
- return variant.value<ColorProperty>().getText();
+ if (isExternalProperty(variant))
+ return variant.value<ExternalProperty>().text();
if (isGroupProperty(variant))
return variant.value<GroupProperty_t>()->currentLabel();
if (isComboProperty(variant))
@@ -145,15 +135,11 @@ QWidget* PropertyEditorFactory::CreateEditor(const SessionItem& item, QWidget* p
result = createCustomStringEditor(item);
}
- else if(isMaterialProperty(item.value())) {
+ else if(isExternalProperty(item.value())) {
auto editor = new ExternalPropertyEditor;
editor->setData(item.value());
- result = editor;
- }
-
- else if(isColorProperty(item.value())) {
- auto editor = new ColorPropertyEditor;
- editor->setData(item.value());
+ if (item.editorType() != Constants::DefaultEditorType)
+ editor->setExternalDialogType(item.editorType());
result = editor;
}
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
index a83c5ee1908d825e66c1a237aea1fb34c7795f8b..898d42f06d87db321e51efab5d2f633dc4828355 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
@@ -34,6 +34,7 @@
#include "MaterialDataItem.h"
#include "MaterialItemUtils.h"
#include "ComponentEditor.h"
+#include "MaterialModel.h"
#include <QTreeView>
#include <QBoxLayout>
#include <QItemSelectionModel>
@@ -43,7 +44,8 @@
TestComponentView::TestComponentView(MainWindow* mainWindow)
: m_mainWindow(mainWindow)
- , m_sourceModel(new SampleModel(this))
+ , m_sampleModel(new SampleModel(this))
+ , m_materialModel(new MaterialModel(this))
, m_sourceTree(new QTreeView)
, m_componentTree(new ComponentEditor(ComponentEditor::FullTree))
, m_componentFlat(new ComponentEditor(ComponentEditor::PlainWidget))
@@ -82,7 +84,7 @@ TestComponentView::TestComponentView(MainWindow* mainWindow)
connect(m_addItemButton, &QPushButton::clicked, this, &TestComponentView::onAddItemRequest);
connect(m_expandButton, &QPushButton::clicked, this, &TestComponentView::onExpandRequest);
- m_sourceTree->setModel(m_sourceModel);
+ m_sourceTree->setModel(m_sampleModel);
m_sourceTree->setItemDelegate(m_delegate);
StyleUtils::setPropertyStyle(m_sourceTree);
connect(m_sourceTree->selectionModel(), &QItemSelectionModel::selectionChanged,
@@ -97,7 +99,7 @@ void TestComponentView::onUpdateRequest()
void TestComponentView::onAddItemRequest()
{
- m_sourceModel->insertNewItem(Constants::ParticleType);
+ m_sampleModel->insertNewItem(Constants::ParticleType);
}
void TestComponentView::onExpandRequest()
@@ -129,13 +131,13 @@ void TestComponentView::init_source()
SampleBuilderFactory factory;
const std::unique_ptr<ISample> sample(factory.createSample("CylindersAndPrismsBuilder"));
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(m_sourceModel, *sample);
- m_sourceModel->insertNewItem(Constants::VectorType);
- m_sourceModel->insertNewItem(Constants::BeamType);
+ guiBuilder.populateSampleModel(m_sampleModel, m_materialModel, *sample);
+ m_sampleModel->insertNewItem(Constants::VectorType);
+ m_sampleModel->insertNewItem(Constants::BeamType);
// adding material to the test model
MaterialItem* materialItem
- = dynamic_cast<MaterialItem*>(m_sourceModel->insertNewItem(Constants::HomogeneousMaterialType));
+ = dynamic_cast<MaterialItem*>(m_sampleModel->insertNewItem(Constants::HomogeneousMaterialType));
materialItem->setItemName("air");
MaterialDataItem* materialDataItem = dynamic_cast<MaterialDataItem*>(
materialItem->getItem(MaterialItem::P_MATERIAL_DATA));
@@ -144,7 +146,7 @@ void TestComponentView::init_source()
materialDataItem->setImag(1e-5);
// adding intensity data item
- m_sourceModel->insertNewItem(Constants::IntensityDataType);
+ m_sampleModel->insertNewItem(Constants::IntensityDataType);
// SessionItem* multilayer = m_sourceModel->insertNewItem(Constants::MultiLayerType);
// m_sourceModel->insertNewItem(Constants::LayerType, m_sourceModel->indexOfItem(multilayer));
@@ -162,7 +164,7 @@ void TestComponentView::onSelectionChanged(const QItemSelection& selected, const
// m_componentTree->setRootIndex(selectedIndex);
// m_componentTree->treeView()->expandAll();
- auto item = m_sourceModel->itemForIndex(indices.front());
+ auto item = m_sampleModel->itemForIndex(indices.front());
m_componentTree->setItem(item);
m_obsoleteEditor->setItem(item, item->modelType());
m_obsoleteBoxEditor->clearEditor();
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.h b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
index a0b12f6e8e05c0a65141e6996819c878866d5534..70a72e22ac46ec5946ba492ed4ff330102b4dff3 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.h
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
@@ -33,6 +33,7 @@ class QBoxLayout;
class ObsoleteComponentEditor;
class ObsoleteComponentBoxEditor;
class ComponentFlatView;
+class MaterialModel;
//! View to tests QListView working with ComponentProxyModel.
@@ -54,7 +55,8 @@ private:
QWidget* componentBoxPanel();
MainWindow* m_mainWindow;
- SampleModel* m_sourceModel;
+ SampleModel* m_sampleModel;
+ MaterialModel* m_materialModel;
QTreeView* m_sourceTree;
ComponentEditor* m_componentTree;
ComponentEditor* m_componentFlat;
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
index 303e96cc0f34afd6d2d5ae043925a96a58a08ff2..15b6f7cbbf3d60a8a5932a81ae360ddd6d5e6d60 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
@@ -69,7 +69,7 @@ std::unique_ptr<ba3d::Layer> TransformTo3D::createLayer(const SessionItem& layer
std::unique_ptr<ba3d::Layer> result = std::make_unique<ba3d::Layer>(
ba3d::dxyz(ba3d::dr(-s2,+s2), ba3d::dr(-s2,+s2), ba3d::dr(ztop, zbottom)));
- QColor color = layerItem.getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>().getColor();
+ QColor color = layerItem.getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>().color();
color.setAlphaF(.3);
result->color = color;
@@ -106,7 +106,7 @@ TransformTo3D::createParticle(const SessionItem& particleItem)
ExternalProperty material
= particleItem.getItemValue(ParticleItem::P_MATERIAL).value<ExternalProperty>();
- result->color = material.getColor();
+ result->color = material.color();
SessionItem* positionItem = particleItem.getItem(ParticleItem::P_POSITION);
double x = positionItem->getItemValue(VectorItem::P_X).toDouble();
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 20c425cce6a4603a07234e23b86267dd9a2f2111..66ca48c4e1b054dc0798154b12ece2f95770f36d 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -40,7 +40,8 @@
#include <QPainter>
DesignerScene::DesignerScene(QObject *parent)
- : QGraphicsScene(parent), m_sampleModel(0), m_instrumentModel(0), m_selectionModel(0), m_proxy(0),
+ : QGraphicsScene(parent), m_sampleModel(0), m_instrumentModel(0), m_materialModel(0),
+ m_selectionModel(0), m_proxy(0),
m_block_selection(false), m_aligner(new SampleViewAligner(this))
{
setSceneRect(QRectF(-800, 0, 1600, 1600));
@@ -98,6 +99,11 @@ void DesignerScene::setInstrumentModel(InstrumentModel *instrumentModel)
m_instrumentModel = instrumentModel;
}
+void DesignerScene::setMaterialModel(MaterialModel* materialModel)
+{
+ m_materialModel = materialModel;
+}
+
void DesignerScene::setSelectionModel(QItemSelectionModel *model, FilterPropertyProxy *proxy)
{
Q_ASSERT(model);
@@ -431,7 +437,7 @@ void DesignerScene::dropEvent(QGraphicsSceneDragDropEvent *event)
} else if (GUIExamplesFactory::isValidExampleName(mimeData->getClassName())) {
SessionItem *topItem = GUIExamplesFactory::createSampleItems(
- mimeData->getClassName(), m_sampleModel);
+ mimeData->getClassName(), m_sampleModel, m_materialModel);
QRectF boundingRect = DesignerHelper::getDefaultBoundingRect(topItem->modelType());
QPointF reference(event->scenePos().x() - boundingRect.width() / 2,
event->scenePos().y() - boundingRect.height() / 2);
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.h b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
index 5430de51ef5d0e142f3c404f113363fbe8bd2b97..b9d31bcda2614947177889f399925ecc90b6821b 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
@@ -34,6 +34,7 @@ class DesignerMimeData;
class SampleViewAligner;
class NodeEditor;
class FilterPropertyProxy;
+class MaterialModel;
//! Main class which represents SessionModel on graphics scene
@@ -47,6 +48,7 @@ public:
void setSampleModel(SampleModel *sampleModel);
void setInstrumentModel(InstrumentModel *instrumentModel);
+ void setMaterialModel(MaterialModel* materialModel);
void setSelectionModel(QItemSelectionModel *model, FilterPropertyProxy *proxy);
SampleModel *getSampleModel() { return m_sampleModel; }
@@ -101,6 +103,7 @@ private:
SampleModel *m_sampleModel;
InstrumentModel *m_instrumentModel;
+ MaterialModel* m_materialModel;
QItemSelectionModel *m_selectionModel;
FilterPropertyProxy *m_proxy;
bool m_block_selection;
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 911cb57f872df1e67bed249bda763e6bda48716a..6cc81ef22d9c8f021103d9dd501b7eb0033efbbd 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -80,7 +80,7 @@ void ILayerView::updateColor()
QVariant v = m_item->getItemValue(LayerItem::P_MATERIAL);
if (v.isValid()) {
ExternalProperty mp = v.value<ExternalProperty>();
- setColor(mp.getColor());
+ setColor(mp.color());
update();
} else {
Q_ASSERT(0);
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index eefc8982d7bf18510cec94f9cf96c048ed28e160..b5c483693817616c397e4bca4f296d2b5d01f4be 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -20,6 +20,7 @@
#include "FilterPropertyProxy.h"
#include "ISample.h"
#include "MultiLayerView.h"
+#include "ApplicationModels.h"
SampleDesigner::SampleDesigner(QWidget *parent)
: SampleDesignerInterface(parent)
@@ -35,18 +36,13 @@ SampleDesigner::~SampleDesigner()
{
}
-
-void SampleDesigner::setSampleModel(SampleModel *sampleModel)
+void SampleDesigner::setModels(ApplicationModels* models)
{
- if(sampleModel) m_designerScene->setSampleModel(sampleModel);
+ m_designerScene->setSampleModel(models->sampleModel());
+ m_designerScene->setInstrumentModel(models->instrumentModel());
+ m_designerScene->setMaterialModel(models->materialModel());
}
-void SampleDesigner::setInstrumentModel(InstrumentModel *instrumentModel)
-{
- if(instrumentModel) m_designerScene->setInstrumentModel(instrumentModel);
-}
-
-
void SampleDesigner::setSelectionModel(QItemSelectionModel *model, FilterPropertyProxy *proxy)
{
if(model) m_designerScene->setSelectionModel(model, proxy);
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
index df936a6456b8c1bb106e4d60ab224bd17d1cfa15..64c9ce880485e9a739088cdf43feb64ef564a3f0 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
@@ -27,6 +27,7 @@ class DesignerWidgetFactory;
class InstrumentModel;
class SampleModel;
class FilterPropertyProxy;
+class ApplicationModels;
//! sample designer interface
class BA_CORE_API_ SampleDesignerInterface : public QObject
@@ -57,8 +58,7 @@ public:
QWidget *getCentralWidget() { return m_designerView; }
- void setSampleModel(SampleModel *sampleModel);
- void setInstrumentModel(InstrumentModel *instrumentModel);
+ void setModels(ApplicationModels* models);
void setSelectionModel(QItemSelectionModel *model, FilterPropertyProxy *proxy);
public slots:
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index 520ed2fac3104691abccac72baf8d471a86d4dad..39b270719ddd0852ed026495edc0f5251b9cf3f0 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -23,6 +23,7 @@
#include "SampleToolBar.h"
#include "SampleViewComponents.h"
#include "mainwindow.h"
+#include "ApplicationModels.h"
#include <QDockWidget>
#include <QMenu>
#include <QTimer>
@@ -31,8 +32,7 @@ SampleView::SampleView(MainWindow *mainWindow)
: Manhattan::FancyMainWindow(mainWindow)
, m_sampleDesigner(new SampleDesigner(this))
, m_toolBar(0)
- , m_sampleModel(mainWindow->sampleModel())
- , m_instrumentModel(mainWindow->instrumentModel())
+ , m_models(mainWindow->models())
{
setObjectName("SampleView");
@@ -81,7 +81,7 @@ void SampleView::initSubWindows()
m_subWindows[WIDGET_BOX] =
SampleViewComponents::createWidgetBox(m_sampleDesigner, this);
- m_tree_view = SampleViewComponents::createTreeView(m_sampleModel, this);
+ m_tree_view = SampleViewComponents::createTreeView(m_models->sampleModel(), this);
m_subWindows[SAMPLE_TREE] = m_tree_view;
m_tree_view->expandAll();
connect(m_tree_view->model(), SIGNAL(rowsInserted(QModelIndex,int,int)),
@@ -92,12 +92,11 @@ void SampleView::initSubWindows()
InfoWidget *infoWidget = new InfoWidget(this);
connect(infoWidget, SIGNAL(widgetHeightRequest(int)), this, SLOT(setDockHeightForWidget(int)));
connect(infoWidget, SIGNAL(widgetCloseRequest()), this, SLOT(onWidgetCloseRequest()));
- infoWidget->setSampleModel(m_sampleModel);
- infoWidget->setInstrumentModel(m_instrumentModel);
+ infoWidget->setSampleModel(m_models->sampleModel());
+ infoWidget->setInstrumentModel(m_models->instrumentModel());
m_subWindows[INFO] = infoWidget;
- m_sampleDesigner->setSampleModel(m_sampleModel);
- m_sampleDesigner->setInstrumentModel(m_instrumentModel);
+ m_sampleDesigner->setModels(m_models);
m_sampleDesigner->setSelectionModel(m_tree_view->selectionModel(), dynamic_cast<FilterPropertyProxy*>(const_cast<QAbstractItemModel*>(m_tree_view->model())));
}
@@ -320,7 +319,7 @@ QModelIndex SampleView::getIndexAtColumnZero(const QModelIndex &index)
SampleModel *SampleView::getSampleModel()
{
- return m_sampleModel;
+ return m_models->sampleModel();
}
QTreeView *SampleView::getTreeView()
diff --git a/GUI/coregui/Views/SampleView.h b/GUI/coregui/Views/SampleView.h
index d46590e38064909338a85cf84a22148793b69339..7524ff796740d65aed760ed227f2a5faefb18f2c 100644
--- a/GUI/coregui/Views/SampleView.h
+++ b/GUI/coregui/Views/SampleView.h
@@ -24,11 +24,10 @@
#include <QTreeView>
class MainWindow;
-class SampleModel;
-class InstrumentModel;
class SampleDesigner;
class SampleToolBar;
-
+class ApplicationModels;
+class SampleModel;
class BA_CORE_API_ SampleView : public Manhattan::FancyMainWindow
{
@@ -93,8 +92,7 @@ private:
QMap<QString, QAction *> m_add_action_map;
QAction *m_delete_item_action;
- SampleModel *m_sampleModel;
- InstrumentModel *m_instrumentModel;
+ ApplicationModels* m_models;
QTreeView *m_tree_view;
QItemSelectionModel *m_selection_model;
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/coregui/Views/SessionModelView.cpp
index e04d7c953ccec794574a2e5b32b33f30316de6f8..be0808f13c38d851f16c474c6ff96156e90ad990 100644
--- a/GUI/coregui/Views/SessionModelView.cpp
+++ b/GUI/coregui/Views/SessionModelView.cpp
@@ -29,7 +29,7 @@
#include <QVBoxLayout>
namespace {
-const bool show_test_view = true;
+const bool show_test_view = false;
}
SessionModelView::SessionModelView(MainWindow *mainWindow)
diff --git a/GUI/coregui/mainwindow/AppSvc.cpp b/GUI/coregui/mainwindow/AppSvc.cpp
index 044a5914756d284ea99c03e156bc8090a8d8d277..c98c0518023250cf0431dd4831e20640c5761634 100644
--- a/GUI/coregui/mainwindow/AppSvc.cpp
+++ b/GUI/coregui/mainwindow/AppSvc.cpp
@@ -65,10 +65,6 @@ ProjectManager* AppSvc::this_projectManager()
MaterialModel* AppSvc::this_materialModel()
{
- if (!m_materialModel)
- throw GUIHelpers::Error("AppSvc::projectManager() -> Error. Attempt to access "
- "non existing MaterialModel.");
-
return m_materialModel;
}
@@ -92,9 +88,9 @@ void AppSvc::this_unsubscribe(ProjectManager* projectManager)
void AppSvc::this_subscribe(MaterialModel* materialModel)
{
- // MaterialModel created first will be subscribed
if (m_materialModel)
- return;
+ throw GUIHelpers::Error("AppSvc::projectManager() -> Error. Attempt to subscribe "
+ "MaterialModel twice.");
m_materialModel = materialModel;
}
@@ -102,7 +98,8 @@ void AppSvc::this_subscribe(MaterialModel* materialModel)
void AppSvc::this_unsubscribe(MaterialModel* materialModel)
{
if (m_materialModel != materialModel)
- return;
+ throw GUIHelpers::Error("AppSvc::projectManager() -> Error. Attempt to unsubscribe "
+ "MaterialModel before it was subscribed.");
m_materialModel = nullptr;
}
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.cpp b/GUI/coregui/mainwindow/PyImportAssistant.cpp
index 01aa966d2191cf055deee509e1fa4bd3bb78194c..1fc6e739aabc4c1c5238b502e966acc0a65941c0 100644
--- a/GUI/coregui/mainwindow/PyImportAssistant.cpp
+++ b/GUI/coregui/mainwindow/PyImportAssistant.cpp
@@ -220,7 +220,8 @@ void PyImportAssistant::populateModels(const MultiLayer& multilayer, const QStri
name = QString::fromStdString(multilayer.getName());
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(m_mainWindow->sampleModel(), multilayer, name);
+ guiBuilder.populateSampleModel(m_mainWindow->sampleModel(), m_mainWindow->materialModel(),
+ multilayer, name);
QString message("Seems that import was successfull.\n\n"
"Check SampleView for new sample and material editor for new materials.");
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index 2aee211d611854817b6720056dc05aa4fda43702..c18e51a4a9c735ef1d4ae8a8e379d5a5721a24c1 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -237,6 +237,7 @@ void ProjectDocument::onModelChanged()
void ProjectDocument::readFrom(QIODevice* device)
{
+ Q_ASSERT(m_messageService);
QXmlStreamReader reader(device);
while (!reader.atEnd()) {
diff --git a/GUI/coregui/utils/IMessageService.h b/GUI/coregui/utils/IMessageService.h
index 1a3df6bba7cd2afeeb3e728bf60bd3e9f794cf00..3bcd5bec8e550ecaf67796ee9c3ae4b2309a8ae6 100644
--- a/GUI/coregui/utils/IMessageService.h
+++ b/GUI/coregui/utils/IMessageService.h
@@ -17,11 +17,12 @@
#ifndef IMESSAGESERVICE_H
#define IMESSAGESERVICE_H
+#include "WinDllMacros.h"
+
//! @class IMessageService
//! @brief Abstract class for messaging in our GUI
-
-class IMessageService {
+class BA_CORE_API_ IMessageService {
public:
IMessageService(){}
virtual ~IMessageService(){}
diff --git a/GUI/coregui/utils/WarningMessageService.h b/GUI/coregui/utils/WarningMessageService.h
index 92f4cda30098ddd681fa2954fe57ed3855f51682..6e0d57719e8b67272773f476114a95cf15ee4894 100644
--- a/GUI/coregui/utils/WarningMessageService.h
+++ b/GUI/coregui/utils/WarningMessageService.h
@@ -27,7 +27,7 @@ class QObject;
//! @class WarningMessageService
//! @brief The service to collect warning messages from different senders.
-class WarningMessageService : public IMessageService {
+class BA_CORE_API_ WarningMessageService : public IMessageService {
public:
typedef QMap<QObject *, MessageContainer *> container_t;
typedef container_t::iterator iterator;
diff --git a/Tests/Functional/Core/CoreStandardTest/CMakeLists.txt b/Tests/Functional/Core/CoreStandardTest/CMakeLists.txt
index f9f247a954e9788cec9ca07ed59a2680c7069329..15f8592e70ffb11f3d9c09bc2093fd2f5f19a407 100644
--- a/Tests/Functional/Core/CoreStandardTest/CMakeLists.txt
+++ b/Tests/Functional/Core/CoreStandardTest/CMakeLists.txt
@@ -61,6 +61,7 @@ set(test_cases
SpheresWithLimitsDistribution
ConesWithLimitsDistribution
HomogeneousTiNiSample
+ RoughnessInSpecular
)
add_executable(CoreStandardTest main.cpp CoreStandardTest.h CoreStandardTest.cpp)
diff --git a/Tests/Functional/GUI/GUISpecial/CMakeLists.txt b/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
index 9b3e76071519de9d60f148d5a5095c227e3b3d5e..f9e04d2f62e652332efa994eefb31d5591ce5d5f 100644
--- a/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
+++ b/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
@@ -16,6 +16,7 @@ set(test_cases
RotationTranslation
RoughnessTranslation
TwoLayerRoughnessTranslation
+ SaveLoadProject
# GUIPerformanceTest # too heavy, call manually when necessary
)
diff --git a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
index 65b82443a94277cf40fa20f02ed557d9da5792b0..2e453643da55b503b3fcdf2a19a224be8564f9e2 100644
--- a/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
@@ -89,7 +89,7 @@ void GUIPerformanceTest::test_domain_to_gui()
m_models->sampleModel()->clear();
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(m_models->sampleModel(), *sample);
+ guiBuilder.populateSampleModel(m_models->sampleModel(), m_models->materialModel(), *sample);
}
//! Creates gui sample once and then populates domain.
@@ -107,7 +107,7 @@ void GUIPerformanceTest::test_gui_to_domain()
const std::unique_ptr<ISample> sample(factory.createSample(m_sample_name.toStdString()));
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(m_models->sampleModel(), *sample);
+ guiBuilder.populateSampleModel(m_models->sampleModel(), m_models->materialModel(), *sample);
}
@@ -129,7 +129,7 @@ void GUIPerformanceTest::test_real_time()
const std::unique_ptr<ISample> sample(factory.createSample(m_sample_name.toStdString()));
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(m_models->sampleModel(), *sample);
+ guiBuilder.populateSampleModel(m_models->sampleModel(), m_models->materialModel(), *sample);
m_models->instrumentModel()->instrumentItem()->detectorItem()->setSize(50, 50);
diff --git a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..398bccb1aedb8fbc9ee1c01b688fd8017d77b278
--- /dev/null
+++ b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.cpp
@@ -0,0 +1,226 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Tests/Functional/GUI/GUIPerformanceTest/GUISaveLoadProject.cpp
+//! @brief Implements GUISaveLoadProject test.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @authors Scientific Computing Group at MLZ Garching
+//! @authors Céline Durniak, Marina Ganeva, David Li, Gennady Pospelov
+//! @authors Walter Van Herck, Joachim Wuttke
+//
+// ************************************************************************** //
+
+#include "GUISaveLoadProject.h"
+#include "SimulationOptionsItem.h"
+#include "GUIObjectBuilder.h"
+#include "ApplicationModels.h"
+#include "JobModel.h"
+#include "SampleModel.h"
+#include "InstrumentModel.h"
+#include "SampleBuilderFactory.h"
+#include "DocumentModel.h"
+#include "DetectorItems.h"
+#include "MultiLayer.h"
+#include "JobItem.h"
+#include "InstrumentItem.h"
+#include "projectdocument.h"
+#include "GUIHelpers.h"
+#include "ProjectUtils.h"
+#include "WarningMessageService.h"
+#include <QElapsedTimer>
+#include <QEventLoop>
+#include <QCoreApplication>
+#include <QXmlStreamWriter>
+#include <QDebug>
+
+namespace {
+const QString sample_name = "ParticleCompositionBuilder";
+const QString project_name = "untitled.pro";
+const int failure = 1;
+const int success = 0;
+}
+
+GUISaveLoadProject::GUISaveLoadProject()
+ : m_models(new ApplicationModels)
+{
+
+}
+
+bool GUISaveLoadProject::runTest()
+{
+ int nerr(0);
+ QString projectName1("test_GUISaveLoadProject_1");
+ QString projectName2("test_GUISaveLoadProject_2");
+
+ // running simulation to fill models with fresh data
+ nerr += run_job();
+
+ // saving project
+ nerr += save_project(projectName1);
+
+ // loading project back to models
+ nerr += load_project(projectName1);
+
+ // saving under different name what we've just loaded
+ nerr += save_project(projectName2);
+
+ // analyze difference
+ nerr += check_difference(projectName1, projectName2);
+
+ return nerr == 0 ? true : false;
+}
+
+int GUISaveLoadProject::run_job()
+{
+ resetModels();
+
+ std::cout << "GUISaveLoadProject::run_job()" << std::endl;
+
+ SimulationOptionsItem *optionsItem = m_models->documentModel()->getSimulationOptionsItem();
+
+ SampleBuilderFactory factory;
+ const std::unique_ptr<ISample> sample(factory.createSample(sample_name.toStdString()));
+
+ GUIObjectBuilder guiBuilder;
+ guiBuilder.populateSampleModel(m_models->sampleModel(), m_models->materialModel(), *sample);
+
+ m_models->instrumentModel()->instrumentItem()->detectorItem()->setSize(50, 50);
+
+ auto jobItem = m_models->jobModel()->addJob(
+ m_models->sampleModel()->multiLayerItem(),
+ m_models->instrumentModel()->instrumentItem(),
+ 0,
+ optionsItem);
+
+ m_models->jobModel()->runJob(jobItem->index());
+
+ while(m_models->jobModel()->hasUnfinishedJobs()) {
+ QElapsedTimer timer;
+ timer.start();
+ while(timer.elapsed() < 10)
+ QCoreApplication::processEvents( QEventLoop::AllEvents, 1 );
+ }
+
+ std::cout << "... job finished." << std::endl;
+ return jobItem->isCompleted() ? 0 : 1;
+}
+
+//! Saves models to project directory and as xml string for later analysis.
+
+int GUISaveLoadProject::save_project(const QString& projectName)
+{
+ int nerr(0);
+ nerr += save_project_dir(projectName);
+ nerr += save_xml(projectName);
+ return nerr;
+}
+
+//! Saves project in directory.
+
+int GUISaveLoadProject::save_project_dir(const QString& projectName)
+{
+ std::cout << "GUISaveLoadProject::save_project() -> Saving to "
+ << projectName.toStdString() << std::endl;
+
+ if (ProjectUtils::exists(projectName))
+ ProjectUtils::removeRecursively(projectName);
+
+ GUIHelpers::createSubdir(".", projectName);
+
+ ProjectDocument document;
+ document.setApplicationModels(m_models.get());
+ document.save(projectName+"/"+project_name);
+
+ std::cout << "... saved." << std::endl;
+
+ return success;
+}
+
+//! Sets all model xml content to the map for later analysis.
+
+int GUISaveLoadProject::save_xml(const QString& projectName)
+{
+ for(auto model : m_models->modelList())
+ m_results[projectName].push_back(dataXML(model));
+
+ return success;
+}
+
+int GUISaveLoadProject::load_project(const QString& projectName)
+{
+ resetModels();
+
+ std::cout << "GUISaveLoadProject::load_project() -> Loading from "
+ << projectName.toStdString() << std::endl;
+
+ WarningMessageService logger;
+ ProjectDocument document;
+ document.setApplicationModels(m_models.get());
+ document.setLogger(&logger);
+ document.load(projectName+"/"+project_name);
+
+ std::cout << "... loaded." << std::endl;
+ return success;
+}
+
+int GUISaveLoadProject::check_difference(const QString& projectName1, const QString& projectName2)
+{
+ std::cout << "GUISaveLoadProject::check_difference -> Checking difference of \n"
+ << "'./" << projectName1.toStdString() << "' - initially saved project \n"
+ << "'./" << projectName2.toStdString() << "' - loaded and then saved. \n";
+
+ auto project1 = m_results[projectName1];
+ auto project2 = m_results[projectName2];
+
+ if (project1.size() != project2.size()) {
+ std::cout << "Number of models in project differs. Failed. \n";
+ return failure;
+ }
+
+ int err(0);
+ for(int i=0; i<project1.size(); ++i) {
+ DataXML model_data1 = project1[i];
+ DataXML model_data2 = project2[i];
+
+ if (model_data1.m_model_tag != model_data2.m_model_tag) {
+ std::cout << "Error, different tags. "
+ << model_data1.m_model_tag.toStdString()
+ << model_data2.m_model_tag.toStdString() << "\n";
+ err++;
+ }
+
+ if (model_data1.m_model_xml != model_data2.m_model_xml) {
+ std::cout << "Error, different xml in model '"
+ << model_data1.m_model_tag.toStdString() << "'\n";
+ err++;
+ }
+
+ }
+
+ return err > 0 ? failure : success;
+}
+
+//! Returns DataXML from the model.
+
+GUISaveLoadProject::DataXML GUISaveLoadProject::dataXML(SessionModel* model)
+{
+ DataXML result;
+
+ result.m_model_tag = model->getModelTag();
+ QXmlStreamWriter writer(&result.m_model_xml);
+ model->writeTo(&writer);
+
+ return result;
+}
+
+void GUISaveLoadProject::resetModels()
+{
+ qDebug() << "Going to reset";
+ m_models.reset(); // first have to delete original model
+ m_models.reset(new ApplicationModels);
+ qDebug() << "End of reset";
+}
diff --git a/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h
new file mode 100644
index 0000000000000000000000000000000000000000..58ce4ad890326a7fb1c7fefd1683292296645475
--- /dev/null
+++ b/Tests/Functional/GUI/GUISpecial/GUISaveLoadProject.h
@@ -0,0 +1,60 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Tests/Functional/GUI/GUIPerformanceTest/GUISaveLoadProject.h
+//! @brief Defines GUISaveLoadProject test.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @authors Scientific Computing Group at MLZ Garching
+//! @authors Céline Durniak, Marina Ganeva, David Li, Gennady Pospelov
+//! @authors Walter Van Herck, Joachim Wuttke
+//
+// ************************************************************************** //
+
+#ifndef GUISAVELOADPROJECT_H
+#define GUISAVELOADPROJECT_H
+
+#include "IFunctionalTest.h"
+#include <QString>
+#include <QMap>
+#include <QVector>
+#include <memory>
+
+class ApplicationModels;
+class SessionModel;
+
+//! Functional test to check persistency of application models after save/load.
+
+class GUISaveLoadProject : public IFunctionalTest
+{
+public:
+ GUISaveLoadProject();
+
+protected:
+ bool runTest();
+
+private:
+
+ struct DataXML {
+ QString m_model_tag;
+ QString m_model_xml;
+ };
+
+ int run_job();
+ int save_project(const QString& projectName);
+ int save_project_dir(const QString& projectName);
+ int save_xml(const QString& projectName);
+ int load_project(const QString& projectName);
+ int check_difference(const QString& projectName1, const QString& projectName2);
+ DataXML dataXML(SessionModel* model);
+ void resetModels();
+
+ std::unique_ptr<ApplicationModels> m_models;
+ //! Correspondance of projectname to collected xml data.
+ QMap<QString, QVector<DataXML>> m_results;
+};
+
+#endif // GUISAVELOADPROJECT_H
diff --git a/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.cpp b/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.cpp
index bfd63500451b24e39430d29d4002e2ee7876f9ed..fd56b721343115b1ae4c673c29dfa7c3ffcab5b5 100644
--- a/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUISpecialTestFactory.cpp
@@ -16,6 +16,7 @@
#include "GUISpecialTestFactory.h"
#include "TranslationCases.h"
#include "GUIPerformanceTest.h"
+#include "GUISaveLoadProject.h"
GUISpecialTestFactory::GUISpecialTestFactory()
{
@@ -83,4 +84,7 @@ GUISpecialTestFactory::GUISpecialTestFactory()
create_new<GUIPerformanceTest>,
"Measuring GUI performance on typical tasks.");
+ registerItem("SaveLoadProject",
+ create_new<GUISaveLoadProject>,
+ "Save/load project test");
}
diff --git a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
index 0790447ef6f44196c33109f871d82b74a43efea0..c0975be28c4f5ec05de9c0d734a0fb62dd1fcd2f 100644
--- a/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
+++ b/Tests/Functional/GUI/GUISpecial/GUITranslationTest.cpp
@@ -86,7 +86,7 @@ void GUITranslationTest::processParameterTree()
m_models->instrumentModel()->clear();
// populating GUI models from domain
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(m_models->sampleModel(), *m_simulation);
+ guiBuilder.populateSampleModel(m_models->sampleModel(), m_models->materialModel(), *m_simulation);
guiBuilder.populateInstrumentModel(m_models->instrumentModel(), *m_simulation);
guiBuilder.populateDocumentModel(m_models->documentModel(), *m_simulation);
diff --git a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
index ee5b6e023ce2bf19d6fec8ce2ca78bbd0f5cdf4a..07c15d08fcba8ed9aa6944c371f88f661f41213e 100644
--- a/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
+++ b/Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
@@ -36,7 +36,7 @@ std::unique_ptr<GISASSimulation> createDomainSimulation(const GISASSimulation& o
// populating GUI models from domain
GUIObjectBuilder guiBuilder;
- guiBuilder.populateSampleModel(sampleModel.get(), origin);
+ guiBuilder.populateSampleModel(sampleModel.get(), materialModel.get(), origin);
guiBuilder.populateInstrumentModel(instrumentModel.get(), origin);
guiBuilder.populateDocumentModel(documentModel.get(), origin);
diff --git a/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp b/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
index 02762ef2e827326c254866ace7ca750ee900619a..63dc2f02078a9cd94bd61cf2f7b57171fe81cb35 100644
--- a/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
+++ b/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
@@ -378,6 +378,12 @@ StandardTestCatalogue::StandardTestCatalogue()
"BasicSpecular",
"HomogeneousMultilayerBuilder",
1e-10);
+
+ add("RoughnessInSpecular",
+ "Specular simulation with rough sample",
+ "BasicSpecular",
+ "MultiLayerWithRoughnessBuilder",
+ 2e-9);
}
//! Adds test description to the catalogue.
diff --git a/Tests/ReferenceData/StandardSuite/RoughnessInSpecular.int.gz b/Tests/ReferenceData/StandardSuite/RoughnessInSpecular.int.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b6400998951f06b4de0b50ed1f9ee9bdef9c9854
Binary files /dev/null and b/Tests/ReferenceData/StandardSuite/RoughnessInSpecular.int.gz differ
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.h b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.h
index bcf3d7690a385b05625269c14e889f20b3325a4a..0681bd216b0b2ada1fabdf84292f08b15e3599b1 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.h
+++ b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.h
@@ -36,7 +36,7 @@ TEST_F(SpecularSimulationTest, InitialState)
{
SpecularSimulation sim;
ASSERT_THROW(sim.runSimulation(), std::runtime_error);
- EXPECT_EQ(nullptr, sim.getAlphaAxis());
+ ASSERT_THROW(sim.getAlphaAxis(), std::runtime_error);
EXPECT_EQ(nullptr, sim.sample());
ASSERT_THROW(sim.getScalarR(0), std::runtime_error);
ASSERT_THROW(sim.getScalarT(0), std::runtime_error);
@@ -51,7 +51,7 @@ TEST_F(SpecularSimulationTest, CloneOfEmpty)
std::unique_ptr<SpecularSimulation> clone(sim.clone());
ASSERT_THROW(clone->runSimulation(), std::runtime_error);
- EXPECT_EQ(nullptr, clone->getAlphaAxis());
+ ASSERT_THROW(clone->getAlphaAxis(), std::runtime_error);
EXPECT_EQ(nullptr, clone->sample());
ASSERT_THROW(clone->getScalarR(0), std::runtime_error);
ASSERT_THROW(clone->getScalarT(0), std::runtime_error);
diff --git a/Tests/UnitTests/GUI/TestComboProperty.h b/Tests/UnitTests/GUI/TestComboProperty.h
index 52765450ed4a00aa243f9d1864ee63b6aaf2a467..c0fa0817d996ec516b4f9a90509512a038dc8264 100644
--- a/Tests/UnitTests/GUI/TestComboProperty.h
+++ b/Tests/UnitTests/GUI/TestComboProperty.h
@@ -1,17 +1,17 @@
#include <QtTest>
#include "ComboProperty.h"
-#include "PropertyItem.h"
-#include "SessionXML.h"
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
+#include "test_utils.h"
#include <QPair>
-#include <QDebug>
-#include <memory>
class TestComboProperty : public QObject
{
Q_OBJECT
+private:
+ ComboProperty propertyFromXML(const QString& buffer) {
+ return TestUtils::propertyFromXML<ComboProperty>(buffer);
+ }
+
private slots:
void test_ComboEquality();
void test_VariantEquality();
@@ -51,16 +51,16 @@ inline void TestComboProperty::test_VariantEquality()
ComboProperty c1 = ComboProperty() << "a1" << "a2";
ComboProperty c2 = ComboProperty() << "a1" << "a2";
- QVERIFY(c1.getVariant() == c2.getVariant());
+ QVERIFY(c1.variant() == c2.variant());
c2 << "a3";
- QVERIFY(c1.getVariant() != c2.getVariant());
+ QVERIFY(c1.variant() != c2.variant());
c2.setValue("a2");
- QVERIFY(c1.getVariant() != c2.getVariant());
+ QVERIFY(c1.variant() != c2.variant());
c1 << "a3";
c1.setValue("a2");
- QVERIFY(c1.getVariant() == c2.getVariant());
+ QVERIFY(c1.variant() == c2.variant());
}
inline void TestComboProperty::test_setValue()
@@ -120,30 +120,13 @@ inline void TestComboProperty::test_comboXML()
// Writing combo to XML
ComboProperty combo = ComboProperty() << "a1" << "a2" << "a3";
- QString buffer;
- QXmlStreamWriter writer(&buffer);
-
- SessionWriter::writeVariant(&writer, combo.getVariant(), 0);
-
- QCOMPARE(buffer, QString("<Parameter ParType=\"ComboProperty\" ParRole=\"0\" ParValue=\"0\" "
- "ParExt=\"a1;a2;a3\"/>"));
+ QString expected = "<Parameter ParType=\"ComboProperty\" ParRole=\"0\" ParValue=\"0\" "
+ "ParExt=\"a1;a2;a3\"/>";
+ QCOMPARE(TestUtils::propertyToXML(combo), expected);
// reading from XML
- std::unique_ptr<PropertyItem> item(new PropertyItem);
-
- QXmlStreamReader reader(buffer);
-
- while (!reader.atEnd()) {
- reader.readNext();
- if (reader.isStartElement()) {
- if (reader.name() == SessionXML::ParameterTag) {
- SessionReader::readProperty(&reader, item.get());
- }
- }
- }
-
- ComboProperty combo_property = item->value().value<ComboProperty>();
-
+ ComboProperty combo_property = propertyFromXML(expected);
QCOMPARE(combo_property.getValue(), QString("a1"));
QCOMPARE(combo_property.stringOfValues(), QString("a1;a2;a3"));
+ QVERIFY(combo_property == combo);
}
diff --git a/Tests/UnitTests/GUI/TestExternalProperty.h b/Tests/UnitTests/GUI/TestExternalProperty.h
new file mode 100644
index 0000000000000000000000000000000000000000..4ef6ae848ae07be558f928ec6db3e2a86d1ec0cb
--- /dev/null
+++ b/Tests/UnitTests/GUI/TestExternalProperty.h
@@ -0,0 +1,103 @@
+#include <QtTest>
+#include "ExternalProperty.h"
+#include "test_utils.h"
+
+class TestExternalProperty : public QObject
+{
+ Q_OBJECT
+
+private:
+ ExternalProperty propertyFromXML(const QString& buffer) {
+ return TestUtils::propertyFromXML<ExternalProperty>(buffer);
+ }
+
+private slots:
+ void test_initialState();
+ void test_equalityOperators();
+ void test_variantEquality();
+ void test_toXML();
+};
+
+inline void TestExternalProperty::test_initialState()
+{
+ ExternalProperty property;
+ QVERIFY(property.isValid() == false);
+ QVERIFY(property.color().isValid() == false);
+ QVERIFY(property.identifier().isEmpty() == true);
+ QVERIFY(property.text().isEmpty() == true);
+
+ // changing any property should change state to valid
+ property.setColor(QColor(Qt::red));
+ QVERIFY(property.color() == QColor(Qt::red));
+ QVERIFY(property.isValid() == true);
+ property.setColor(QColor());
+ QVERIFY(property.isValid() == false);
+ property.setText("aaa");
+ QVERIFY(property.text() == QString("aaa"));
+ QVERIFY(property.isValid() == true);
+ property.setText(QString());
+ QVERIFY(property.isValid() == false);
+}
+
+//! Testing equality operators.
+
+inline void TestExternalProperty::test_equalityOperators()
+{
+ ExternalProperty prop1;
+ ExternalProperty prop2;
+
+ QVERIFY (prop1 == prop2);
+ prop1.setColor(QColor(Qt::red));
+ QVERIFY (prop1 != prop2);
+ prop2.setColor(QColor(Qt::red));
+ QVERIFY (prop1 == prop2);
+
+ prop1.setIdentifier("aaa");
+ QVERIFY (prop1 != prop2);
+ prop2.setIdentifier("aaa");
+ QVERIFY (prop1 == prop2);
+}
+
+//! Testing equality operators for QVariants based on ExternalProperty.
+//! Comparators should be enabled in main.cpp
+
+inline void TestExternalProperty::test_variantEquality()
+{
+ ExternalProperty prop1;
+ ExternalProperty prop2;
+
+ QVERIFY(prop1.variant() == prop2.variant());
+ prop1.setIdentifier("aaa");
+ QVERIFY(prop1.variant() != prop2.variant());
+ prop2.setIdentifier("aaa");
+ QVERIFY(prop1.variant() == prop2.variant());
+}
+
+inline void TestExternalProperty::test_toXML()
+{
+ QString expected;
+
+ // empty property to XML
+ ExternalProperty property;
+ expected = "<Parameter ParType=\"ExternalProperty\" ParRole=\"0\" Text=\"\" Color=\"\" Identifier=\"\"/>";
+ QCOMPARE(TestUtils::propertyToXML(property), expected);
+
+ // from XML to empty property
+ QCOMPARE(propertyFromXML(expected).text(), property.text());
+ QCOMPARE(propertyFromXML(expected).color(), property.color());
+ QCOMPARE(propertyFromXML(expected).identifier(), property.identifier());
+ QVERIFY(propertyFromXML(expected) == property);
+
+ // initialized property to XML
+ property.setIdentifier("{123456}");
+ property.setText("abc");
+ property.setColor(QColor(Qt::red));
+ expected = "<Parameter ParType=\"ExternalProperty\" ParRole=\"0\" Text=\"abc\" Color=\"#ffff0000\" Identifier=\"{123456}\"/>";
+ QCOMPARE(TestUtils::propertyToXML(property), expected);
+
+ // from XML to initialized property
+ QCOMPARE(propertyFromXML(expected).identifier(), property.identifier());
+ QCOMPARE(propertyFromXML(expected).text(), property.text());
+ QCOMPARE(propertyFromXML(expected).color(), property.color());
+ QVERIFY(propertyFromXML(expected) == property);
+}
diff --git a/Tests/UnitTests/GUI/TestGUI.cpp b/Tests/UnitTests/GUI/TestGUI.cpp
index d45372b1391f4a7be2b97345e7fdbef1ea8bba30..8e407f5572cebbb59e6fa9b2449274f1540520a6 100644
--- a/Tests/UnitTests/GUI/TestGUI.cpp
+++ b/Tests/UnitTests/GUI/TestGUI.cpp
@@ -38,6 +38,8 @@
#include "TestComponentUtils.h"
#include "TestLayerItems.h"
#include "TestMaterialPropertyController.h"
+#include "TestExternalProperty.h"
+#include "TestSessionXML.h"
#include <memory>
class GUITestFactory {
@@ -67,48 +69,51 @@ int main(int argc, char** argv) {
Q_UNUSED(app);
QMetaType::registerComparators<ComboProperty>();
+ QMetaType::registerComparators<ExternalProperty>();
+
qRegisterMetaType<QAbstractItemModel::LayoutChangeHint>("LayoutChangeHint");
GUITestFactory tests;
-// tests.add<TestFormFactorItems>();
-// tests.add<TestFTDistributionItems>();
-// tests.add<TestParameterizedItem>();
-// tests.add<TestParticleItem>();
-// tests.add<TestLayerRoughnessItems>();
-// tests.add<TestParaCrystalItems>();
-// tests.add<TestSessionModel>();
-// tests.add<TestGUICoreObjectCorrespondence>();
-// tests.add<TestSessionItem>();
-// tests.add<TestMapperCases>();
-// tests.add<TestMapperForItem>();
-// tests.add<TestGUIHelpers>();
-// tests.add<TestFitParameterModel>();
+ tests.add<TestFormFactorItems>();
+ tests.add<TestFTDistributionItems>();
+ tests.add<TestParameterizedItem>();
+ tests.add<TestParticleItem>();
+ tests.add<TestLayerRoughnessItems>();
+ tests.add<TestParaCrystalItems>();
+ tests.add<TestSessionModel>();
+ tests.add<TestGUICoreObjectCorrespondence>();
+ tests.add<TestSessionItem>();
+ tests.add<TestMapperCases>();
+ tests.add<TestMapperForItem>();
+ tests.add<TestGUIHelpers>();
+ tests.add<TestFitParameterModel>();
tests.add<TestMaterialModel>();
tests.add<TestLayerItems>();
tests.add<TestMaterialPropertyController>();
-
-// tests.add<TestComboProperty>();
-// tests.add<TestTranslations>();
-// tests.add<TestGroupProperty>();
-// tests.add<TestParticleDistributionItem>();
-// tests.add<TestParameterTreeUtils>();
-// tests.add<TestDetectorItems>();
-// tests.add<TestLinkInstrument>();
-// tests.add<TestUpdateTimer>();
-// tests.add<TestProjectDocument>();
-// tests.add<TestSaveService>();
-// tests.add<TestOutputDataIOService>();
-// tests.add<TestIntensityDataItem>();
-// tests.add<TestProjectUtils>();
-// tests.add<TestParticleCoreShell>();
-// tests.add<TestPropertyRepeater>();
-// tests.add<TestSessionItemController>();
-// tests.add<TestModelUtils>();
-// tests.add<TestComponentProxyModel>();
-// tests.add<TestProxyModelStrategy>();
-// tests.add<TestSessionItemUtils>();
-// tests.add<TestComponentUtils>();
+ tests.add<TestComboProperty>();
+ tests.add<TestTranslations>();
+ tests.add<TestGroupProperty>();
+ tests.add<TestParticleDistributionItem>();
+ tests.add<TestParameterTreeUtils>();
+ tests.add<TestDetectorItems>();
+ tests.add<TestLinkInstrument>();
+ tests.add<TestUpdateTimer>();
+ tests.add<TestProjectDocument>();
+ tests.add<TestSaveService>();
+ tests.add<TestOutputDataIOService>();
+ tests.add<TestIntensityDataItem>();
+ tests.add<TestProjectUtils>();
+ tests.add<TestParticleCoreShell>();
+ tests.add<TestPropertyRepeater>();
+ tests.add<TestSessionItemController>();
+ tests.add<TestModelUtils>();
+ tests.add<TestComponentProxyModel>();
+ tests.add<TestProxyModelStrategy>();
+ tests.add<TestSessionItemUtils>();
+ tests.add<TestComponentUtils>();
+ tests.add<TestExternalProperty>();
+ tests.add<TestSessionXML>();
return tests.runAll(argc, argv);
}
diff --git a/Tests/UnitTests/GUI/TestLayerItems.h b/Tests/UnitTests/GUI/TestLayerItems.h
index 19eaac821b9870d463060feb35b0da3b087cf2db..5b7ba517b352fc0967763bc7137151998bc07a8d 100644
--- a/Tests/UnitTests/GUI/TestLayerItems.h
+++ b/Tests/UnitTests/GUI/TestLayerItems.h
@@ -27,8 +27,8 @@ inline void TestLayerItems::test_LayerDefaultMaterial()
auto defMaterial = materials.front();
ExternalProperty material = layer->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
- QCOMPARE(material.getName(), QString("Default"));
- QCOMPARE(material.getIdentifier(), defMaterial->getItemValue(MaterialItem::P_IDENTIFIER).toString());
+ QCOMPARE(material.text(), QString("Default"));
+ QCOMPARE(material.identifier(), defMaterial->getItemValue(MaterialItem::P_IDENTIFIER).toString());
}
//! Checks that change of material in MaterialModel is propagated to the LayerItem.
diff --git a/Tests/UnitTests/GUI/TestMapperCases.h b/Tests/UnitTests/GUI/TestMapperCases.h
index d936cc8085ca22e25fcce6b005ca4d05c2198acd..17d4c34b5da20b51ff3861e2994c344574b7f32b 100644
--- a/Tests/UnitTests/GUI/TestMapperCases.h
+++ b/Tests/UnitTests/GUI/TestMapperCases.h
@@ -55,6 +55,6 @@ inline void TestMapperCases::test_SimulationOptionsComputationToggle()
QVERIFY(item->getItem(SimulationOptionsItem::P_MC_POINTS)->isEnabled() == false);
combo.setValue(Constants::SIMULATION_MONTECARLO);
- item->setItemValue(SimulationOptionsItem::P_COMPUTATION_METHOD, combo.getVariant());
+ item->setItemValue(SimulationOptionsItem::P_COMPUTATION_METHOD, combo.variant());
QVERIFY(item->getItem(SimulationOptionsItem::P_MC_POINTS)->isEnabled() == true);
}
diff --git a/Tests/UnitTests/GUI/TestMaterialModel.h b/Tests/UnitTests/GUI/TestMaterialModel.h
index eac429ca5d447a24a8b4b7ef40bbaffa8f79c323..5dc9ae044d448a835a58103cde0133a090f26ec1 100644
--- a/Tests/UnitTests/GUI/TestMaterialModel.h
+++ b/Tests/UnitTests/GUI/TestMaterialModel.h
@@ -100,9 +100,9 @@ inline void TestMaterialModel::test_materialPropertyFromMaterial()
MaterialItem* mat = model.addMaterial("Something", 1.0, 2.0);
ExternalProperty property = MaterialItemUtils::materialProperty(*mat);
- QCOMPARE(property.getName(), QString("Something"));
- QCOMPARE(property.getColor(), mat->getColor());
- QCOMPARE(property.getIdentifier(), mat->getIdentifier());
+ QCOMPARE(property.text(), QString("Something"));
+ QCOMPARE(property.color(), mat->getColor());
+ QCOMPARE(property.identifier(), mat->getIdentifier());
}
//! Default MaterialProperty construction.
@@ -111,23 +111,16 @@ inline void TestMaterialModel::test_defaultMaterialProperty()
{
MaterialModel model;
- // testing default constructed material property
- ExternalProperty property;
- QCOMPARE(property.getName(), QString("Undefined"));
- QCOMPARE(property.getColor(), QColor(Qt::red));
- QCOMPARE(property.getIdentifier(), QString(""));
-
// testing default material property from MaterialItemUtils
- ExternalProperty property2 = MaterialItemUtils::defaultMaterialProperty();
- QCOMPARE(property2.getName(), QString("Undefined"));
- QCOMPARE(property2.getColor(), QColor(Qt::red));
- QCOMPARE(property2.getIdentifier(), QString(""));
+ // in the absence of any materials, property should be in invalid state
+ ExternalProperty property = MaterialItemUtils::defaultMaterialProperty();
+ QVERIFY(property.isValid() == false);
// adding materials to the model, default property should refer to first material in a model
auto mat1 = model.addMaterial("Something1", 1.0, 2.0);
model.addMaterial("Something2", 3.0, 4.0);
- ExternalProperty property3 = MaterialItemUtils::defaultMaterialProperty();
- QCOMPARE(property3.getName(), QString("Something1"));
- QCOMPARE(property3.getColor(), mat1->getColor());
- QCOMPARE(property3.getIdentifier(), mat1->getIdentifier());
+ ExternalProperty property2 = MaterialItemUtils::defaultMaterialProperty();
+ QCOMPARE(property2.text(), QString("Something1"));
+ QCOMPARE(property2.color(), mat1->getColor());
+ QCOMPARE(property2.identifier(), mat1->getIdentifier());
}
diff --git a/Tests/UnitTests/GUI/TestMaterialPropertyController.h b/Tests/UnitTests/GUI/TestMaterialPropertyController.h
index 82327829280db8846b37f09518253848113b67d6..35e6a82788f9def730481626b1b7c7067a42bf79 100644
--- a/Tests/UnitTests/GUI/TestMaterialPropertyController.h
+++ b/Tests/UnitTests/GUI/TestMaterialPropertyController.h
@@ -5,7 +5,7 @@
#include "LayerItem.h"
#include "MaterialItem.h"
#include "ExternalProperty.h"
-#include "ColorProperty.h"
+#include "ObsoleteColorProperty.h"
#include "MaterialItemUtils.h"
class TestMaterialPropertyController : public QObject
@@ -42,27 +42,25 @@ inline void TestMaterialPropertyController::test_ControllerForLayer()
mat1->setItemName("newname");
// QCOMPARE(property_changed, 1);
ExternalProperty property = layer->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
- QCOMPARE(property.getIdentifier(), mat1->getIdentifier());
- QCOMPARE(property.getName(), mat1->itemName());
- QCOMPARE(property.getColor(), mat1->getColor());
+ QCOMPARE(property.identifier(), mat1->getIdentifier());
+ QCOMPARE(property.text(), mat1->itemName());
+ QCOMPARE(property.color(), mat1->getColor());
// changing color of MaterialItem
- ColorProperty colorProperty(Qt::red);
- mat1->setItemValue(MaterialItem::P_COLOR, colorProperty.getVariant());
+ ExternalProperty colorProperty = MaterialItemUtils::colorProperty(QColor(Qt::red));
+ mat1->setItemValue(MaterialItem::P_COLOR, colorProperty.variant());
// QCOMPARE(property_changed, 2);
property = layer->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
- QCOMPARE(property.getIdentifier(), mat1->getIdentifier());
- QCOMPARE(property.getName(), mat1->itemName());
- QCOMPARE(property.getColor(), mat1->getColor());
- QCOMPARE(property.getColor(), QColor(Qt::red));
+ QCOMPARE(property.identifier(), mat1->getIdentifier());
+ QCOMPARE(property.text(), mat1->itemName());
+ QCOMPARE(property.color(), mat1->getColor());
+ QCOMPARE(property.color(), QColor(Qt::red));
// removing material from the model, property should become undefined
materialModel.removeRows(0, 1, QModelIndex());
// QCOMPARE(property_changed, 3);
property = layer->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
- QCOMPARE(property.getIdentifier(), QString());
- QCOMPARE(property.getName(), QString("Undefined"));
- QCOMPARE(property.getColor(), QColor(Qt::red));
+ QVERIFY(property.isValid() == false);
}
//! Test MaterialProperty update in sample items when working on model clone.
@@ -82,9 +80,9 @@ inline void TestMaterialPropertyController::test_ControllerInEditorContext()
MaterialPropertyController controller;
controller.setModels(&materialModel, &sampleModel);
- layer1->setItemValue(LayerItem::P_MATERIAL, MaterialItemUtils::materialProperty(*mat1).getVariant());
- layer2->setItemValue(LayerItem::P_MATERIAL, MaterialItemUtils::materialProperty(*mat2).getVariant());
- layer3->setItemValue(LayerItem::P_MATERIAL, MaterialItemUtils::materialProperty(*mat3).getVariant());
+ layer1->setItemValue(LayerItem::P_MATERIAL, MaterialItemUtils::materialProperty(*mat1).variant());
+ layer2->setItemValue(LayerItem::P_MATERIAL, MaterialItemUtils::materialProperty(*mat2).variant());
+ layer3->setItemValue(LayerItem::P_MATERIAL, MaterialItemUtils::materialProperty(*mat3).variant());
// Making copy of material model
std::unique_ptr<MaterialModel> materialsCopy(materialModel.createCopy());
@@ -115,15 +113,13 @@ inline void TestMaterialPropertyController::test_ControllerInEditorContext()
// copying back to original model
materialModel.clear();
materialModel.initFrom(materialsCopy.get(), 0);
- materialModel.createdFromCopy();
+ materialModel.modelLoaded();
// layer2 should have undefined material property
ExternalProperty property = layer2->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
- QCOMPARE(property.getName(), QString("Undefined"));
- QCOMPARE(property.getIdentifier(), QString(""));
- QCOMPARE(property.getColor(), QColor(Qt::red));
+ QVERIFY(property.isValid() == false);
// layer3 should have different MaterialProperty name
property = layer3->getItemValue(LayerItem::P_MATERIAL).value<ExternalProperty>();
- QCOMPARE(property.getName(), QString("name3changed"));
+ QCOMPARE(property.text(), QString("name3changed"));
}
diff --git a/Tests/UnitTests/GUI/TestSessionXML.h b/Tests/UnitTests/GUI/TestSessionXML.h
new file mode 100644
index 0000000000000000000000000000000000000000..91505a279e2eb3967251cd0a85a03b886796e52f
--- /dev/null
+++ b/Tests/UnitTests/GUI/TestSessionXML.h
@@ -0,0 +1,169 @@
+#include <QtTest>
+#include "SessionItem.h"
+#include "SessionModel.h"
+#include "FormFactorItems.h"
+#include "ParticleItem.h"
+#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
+#include <memory>
+#include <QDebug>
+
+namespace
+{
+QString itemToXML(SessionItem* item)
+{
+ QString result;
+ QXmlStreamWriter writer(&result);
+ SessionXML::writeTo(&writer, item);
+ return result;
+}
+
+void itemFromXML(QString buffer, SessionItem* item)
+{
+ QXmlStreamReader reader(buffer);
+ SessionXML::readItems(&reader, item);
+}
+}
+
+class TestSessionXML : public QObject
+{
+ Q_OBJECT
+private slots:
+ void test_sessionItem();
+ void test_FullSphereItem();
+ void test_twoFullSphereItems();
+ void test_emptyMultiLayer();
+ void test_Layer();
+ void test_Particle();
+ void test_ParticleWithFF();
+};
+
+//! Testing to/from xml: simple property item.
+
+inline void TestSessionXML::test_sessionItem()
+{
+ QString expected;
+
+ SessionModel source("TestModel");
+ source.insertNewItem(Constants::PropertyType);
+
+ expected = "<TestModel Name=\"DefaultName\">"
+ "<Item ModelType=\"Property\" Tag=\"rootTag\" DisplayName=\"Property\"/>"
+ "</TestModel>";
+ QCOMPARE(itemToXML(source.rootItem()), expected);
+
+ SessionModel target("TestModel");
+ itemFromXML(expected, target.rootItem());
+
+ QCOMPARE(target.rowCount(QModelIndex()), 1);
+ SessionItem* newItem = target.itemForIndex(target.index(0, 0, QModelIndex()));
+ QCOMPARE(newItem->modelType(), Constants::PropertyType);
+ QCOMPARE(newItem->displayName(), QString("Property"));
+ QVERIFY(newItem->value().isValid() == false);
+}
+
+//! Testing to/from xml: FullSphereItem
+
+inline void TestSessionXML::test_FullSphereItem()
+{
+ // source model, to xml
+ SessionModel source("TestModel");
+ SessionItem* sphere = source.insertNewItem(Constants::FullSphereType);
+ SessionItem* radius = sphere->getItem(FullSphereItem::P_RADIUS);
+ QString buffer = itemToXML(source.rootItem());
+
+ // target model, from xml
+ SessionModel target("TestModel");
+ itemFromXML(buffer, target.rootItem());
+
+ // checking top items in source and target models
+ SessionItem* t_sphere = target.topItem();
+ SessionItem* t_radius = t_sphere->getItem(FullSphereItem::P_RADIUS);
+
+ QCOMPARE(sphere->parent()->tagFromItem(sphere), t_sphere->parent()->tagFromItem(t_sphere));
+ QCOMPARE(sphere->displayName(), t_sphere->displayName());
+ QCOMPARE(sphere->modelType(), t_sphere->modelType());
+ QCOMPARE(sphere->numberOfChildren(), t_sphere->numberOfChildren());
+ QCOMPARE(sphere->getItemValue(FullSphereItem::P_RADIUS),
+ t_sphere->getItemValue(FullSphereItem::P_RADIUS));
+
+ QCOMPARE(radius->parent()->tagFromItem(sphere), t_radius->parent()->tagFromItem(t_sphere));
+ QCOMPARE(radius->displayName(), t_radius->displayName());
+ QCOMPARE(radius->modelType(), t_radius->modelType());
+ QCOMPARE(radius->numberOfChildren(), t_radius->numberOfChildren());
+ QCOMPARE(radius->value().toDouble(), t_radius->value().toDouble());
+
+ // final XML comparison
+ QCOMPARE(buffer, itemToXML(target.rootItem()));
+}
+
+inline void TestSessionXML::test_twoFullSphereItems()
+{
+ // source model, to xml
+ SessionModel source("TestModel");
+ SessionItem* sphere1 = source.insertNewItem(Constants::FullSphereType);
+ sphere1->setItemValue(FullSphereItem::P_RADIUS, 1.0);
+ SessionItem* sphere2 = source.insertNewItem(Constants::FullSphereType);
+ sphere2->setItemValue(FullSphereItem::P_RADIUS, 2.0);
+ QString buffer = itemToXML(source.rootItem());
+
+ SessionModel target("TestModel");
+ itemFromXML(buffer, target.rootItem());
+
+ // final XML comparison
+ QCOMPARE(buffer, itemToXML(target.rootItem()));
+}
+
+inline void TestSessionXML::test_emptyMultiLayer()
+{
+ SessionModel source("TestModel");
+ source.insertNewItem(Constants::MultiLayerType);
+ QString buffer = itemToXML(source.rootItem());
+
+ SessionModel target("TestModel");
+ itemFromXML(buffer, target.rootItem());
+
+ // final XML comparison
+ QCOMPARE(buffer, itemToXML(target.rootItem()));
+}
+
+inline void TestSessionXML::test_Layer()
+{
+ SessionModel source("TestModel");
+ source.insertNewItem(Constants::LayerType);
+ QString buffer = itemToXML(source.rootItem());
+
+ SessionModel target("TestModel");
+ itemFromXML(buffer, target.rootItem());
+
+ // final XML comparison
+ QCOMPARE(buffer, itemToXML(target.rootItem()));
+}
+
+inline void TestSessionXML::test_Particle()
+{
+ SessionModel source("TestModel");
+ source.insertNewItem(Constants::ParticleType);
+ QString buffer = itemToXML(source.rootItem());
+
+ SessionModel target("TestModel");
+ itemFromXML(buffer, target.rootItem());
+
+ // final XML comparison
+ QCOMPARE(buffer, itemToXML(target.rootItem()));
+}
+
+inline void TestSessionXML::test_ParticleWithFF()
+{
+ SessionModel source("TestModel");
+ SessionItem* particle = source.insertNewItem(Constants::ParticleType);
+
+ particle->setGroupProperty(ParticleItem::P_FORM_FACTOR, Constants::AnisoPyramidType);
+ QString buffer = itemToXML(source.rootItem());
+
+ SessionModel target("TestModel");
+ itemFromXML(buffer, target.rootItem());
+
+ // final XML comparison
+ QCOMPARE(buffer, itemToXML(target.rootItem()));
+}
diff --git a/Tests/UnitTests/GUI/test_utils.h b/Tests/UnitTests/GUI/test_utils.h
index 2e375908f2ea51c707b1ecc2b92329bd68fa9137..1516eee6e265d774827fcd196b51e8a0bed622bf 100644
--- a/Tests/UnitTests/GUI/test_utils.h
+++ b/Tests/UnitTests/GUI/test_utils.h
@@ -17,6 +17,9 @@
#define TEST_UTILS
#include <QString>
+#include "SessionXML.h"
+#include "PropertyItem.h"
+#include <QXmlStreamWriter>
namespace TestUtils
{
@@ -25,6 +28,35 @@ namespace TestUtils
//! it will be removed with all its content.
void create_dir(const QString& dir_name);
+
+//! Converts property to XML string
+template <typename T>
+QString propertyToXML(const T& property)
+{
+ QString result;
+ QXmlStreamWriter writer(&result);
+ SessionXML::writeVariant(&writer, property.variant(), /*role*/0);
+ return result;
+}
+
+//! Converts XML string to property
+template <typename T>
+T propertyFromXML(const QString& buffer) {
+ std::unique_ptr<PropertyItem> item(new PropertyItem);
+ QXmlStreamReader reader(buffer);
+
+ while (!reader.atEnd()) {
+ reader.readNext();
+ if (reader.isStartElement()) {
+ if (reader.name() == SessionXML::ParameterTag) {
+ SessionXML::readProperty(&reader, item.get());
+ }
+ }
+ }
+
+ return item->value().value<T>();
+}
+
}
#endif // TEST_UTILS
diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i
index d937cf08aeb44b1e50338e324c742ed7c12d6e33..aeb4876c5874a21554af9c5d8127525d36f2b949 100644
--- a/auto/Wrap/doxygen_core.i
+++ b/auto/Wrap/doxygen_core.i
@@ -15,7 +15,7 @@ C++ includes: AdjustMinimizerStrategy.h
%feature("docstring") AdjustMinimizerStrategy::AdjustMinimizerStrategy "AdjustMinimizerStrategy::AdjustMinimizerStrategy(const std::string &minimizerName, const std::string &algorithmName=\"\", const std::string &optionString=\"\")
";
-%feature("docstring") AdjustMinimizerStrategy::clone "AdjustMinimizerStrategy * AdjustMinimizerStrategy::clone() const
+%feature("docstring") AdjustMinimizerStrategy::clone "AdjustMinimizerStrategy * AdjustMinimizerStrategy::clone() const
";
%feature("docstring") AdjustMinimizerStrategy::setMinimizer "void AdjustMinimizerStrategy::setMinimizer(const std::string &minimizerName, const std::string &algorithmName=\"\", const std::string &optionString=\"\")
@@ -38,7 +38,7 @@ C++ includes: AdjustMinimizerStrategy.h
// File: classAsymRippleBuilder.xml
%feature("docstring") AsymRippleBuilder "";
-%feature("docstring") AsymRippleBuilder::buildSample "MultiLayer * AsymRippleBuilder::buildSample() const
+%feature("docstring") AsymRippleBuilder::buildSample "MultiLayer * AsymRippleBuilder::buildSample() const
";
@@ -135,7 +135,7 @@ C++ includes: TwoDimLatticeBuilder.h
%feature("docstring") Basic2DLatticeBuilder::Basic2DLatticeBuilder "Basic2DLatticeBuilder::Basic2DLatticeBuilder()
";
-%feature("docstring") Basic2DLatticeBuilder::buildSample "MultiLayer * Basic2DLatticeBuilder::buildSample() const
+%feature("docstring") Basic2DLatticeBuilder::buildSample "MultiLayer * Basic2DLatticeBuilder::buildSample() const
";
@@ -153,7 +153,7 @@ C++ includes: ParaCrystalBuilder.h
%feature("docstring") Basic2DParaCrystalBuilder::~Basic2DParaCrystalBuilder "Basic2DParaCrystalBuilder::~Basic2DParaCrystalBuilder()
";
-%feature("docstring") Basic2DParaCrystalBuilder::buildSample "MultiLayer * Basic2DParaCrystalBuilder::buildSample() const
+%feature("docstring") Basic2DParaCrystalBuilder::buildSample "MultiLayer * Basic2DParaCrystalBuilder::buildSample() const
";
%feature("docstring") Basic2DParaCrystalBuilder::createSample "MultiLayer * Basic2DParaCrystalBuilder::createSample(size_t index=0)
@@ -169,7 +169,7 @@ C++ includes: ParaCrystalBuilder.h
%feature("docstring") BasicLattice::BasicLattice "BasicLattice::BasicLattice(double length1, double length2, double angle, double rotation_angle=0.0)
";
-%feature("docstring") BasicLattice::clone "BasicLattice * BasicLattice::clone() const
+%feature("docstring") BasicLattice::clone "BasicLattice * BasicLattice::clone() const
";
%feature("docstring") BasicLattice::accept "void BasicLattice::accept(INodeVisitor *visitor) const final
@@ -177,16 +177,16 @@ C++ includes: ParaCrystalBuilder.h
Calls the INodeVisitor's visit method.
";
-%feature("docstring") BasicLattice::length1 "virtual double BasicLattice::length1() const
+%feature("docstring") BasicLattice::length1 "virtual double BasicLattice::length1() const
";
-%feature("docstring") BasicLattice::length2 "virtual double BasicLattice::length2() const
+%feature("docstring") BasicLattice::length2 "virtual double BasicLattice::length2() const
";
-%feature("docstring") BasicLattice::latticeAngle "virtual double BasicLattice::latticeAngle() const
+%feature("docstring") BasicLattice::latticeAngle "virtual double BasicLattice::latticeAngle() const
";
-%feature("docstring") BasicLattice::unitCellArea "double BasicLattice::unitCellArea() const
+%feature("docstring") BasicLattice::unitCellArea "double BasicLattice::unitCellArea() const
";
@@ -298,14 +298,14 @@ Returns this, trivially converted to complex type.
Returns real parts.
";
-%feature("docstring") BasicVector3D::dot "auto BasicVector3D< T >::dot(const BasicVector3D< U > &v) const -> decltype(this->x()*v.x())
+%feature("docstring") BasicVector3D::dot "auto BasicVector3D< T >::dot(const BasicVector3D< U > &v) const -> decltype(this->x() *v.x())
Returns dot product of vectors (antilinear in the first [=self] argument).
Returns dot product of (complex) vectors (antilinear in the first [=self] argument).
";
-%feature("docstring") BasicVector3D::cross "auto BasicVector3D< T >::cross(const BasicVector3D< U > &v) const -> BasicVector3D< decltype(this->x()*v.x())>
+%feature("docstring") BasicVector3D::cross "auto BasicVector3D< T >::cross(const BasicVector3D< U > &v) const -> BasicVector3D< decltype(this->x() *v.x())>
Returns cross product of vectors (linear in both arguments).
@@ -394,7 +394,7 @@ Sets the beam intensity in neutrons/sec.
Sets the polarization density matrix according to the given Bloch vector.
";
-%feature("docstring") Beam::getBlochVector "kvector_t Beam::getBlochVector() const
+%feature("docstring") Beam::getBlochVector "kvector_t Beam::getBlochVector() const
";
%feature("docstring") Beam::getPolarization "Eigen::Matrix2cd Beam::getPolarization() const
@@ -402,13 +402,13 @@ Sets the polarization density matrix according to the given Bloch vector.
Returns the polarization density matrix (in spin basis along z-axis)
";
-%feature("docstring") Beam::getWavelength "double Beam::getWavelength() const
+%feature("docstring") Beam::getWavelength "double Beam::getWavelength() const
";
-%feature("docstring") Beam::getAlpha "double Beam::getAlpha() const
+%feature("docstring") Beam::getAlpha "double Beam::getAlpha() const
";
-%feature("docstring") Beam::getPhi "double Beam::getPhi() const
+%feature("docstring") Beam::getPhi "double Beam::getPhi() const
";
%feature("docstring") Beam::accept "void Beam::accept(INodeVisitor *visitor) const final
@@ -426,10 +426,10 @@ Calls the INodeVisitor's visit method.
%feature("docstring") Bin1D::Bin1D "Bin1D::Bin1D(double lower, double upper)
";
-%feature("docstring") Bin1D::getMidPoint "double Bin1D::getMidPoint() const
+%feature("docstring") Bin1D::getMidPoint "double Bin1D::getMidPoint() const
";
-%feature("docstring") Bin1D::getBinSize "double Bin1D::getBinSize() const
+%feature("docstring") Bin1D::getBinSize "double Bin1D::getBinSize() const
";
@@ -452,10 +452,10 @@ C++ includes: Bin.h
creation on Bin1DCVector from alpha and phi bins
";
-%feature("docstring") Bin1DCVector::getMidPoint "cvector_t Bin1DCVector::getMidPoint() const
+%feature("docstring") Bin1DCVector::getMidPoint "cvector_t Bin1DCVector::getMidPoint() const
";
-%feature("docstring") Bin1DCVector::getDelta "cvector_t Bin1DCVector::getDelta() const
+%feature("docstring") Bin1DCVector::getDelta "cvector_t Bin1DCVector::getDelta() const
";
@@ -478,10 +478,10 @@ C++ includes: Bin.h
creation on Bin1DKVector from alpha and phi bins
";
-%feature("docstring") Bin1DKVector::getMidPoint "kvector_t Bin1DKVector::getMidPoint() const
+%feature("docstring") Bin1DKVector::getMidPoint "kvector_t Bin1DKVector::getMidPoint() const
";
-%feature("docstring") Bin1DKVector::getDelta "kvector_t Bin1DKVector::getDelta() const
+%feature("docstring") Bin1DKVector::getDelta "kvector_t Bin1DKVector::getDelta() const
";
@@ -531,7 +531,7 @@ C++ includes: BoxCompositionBuilder.h
%feature("docstring") BoxCompositionRotateXBuilder::BoxCompositionRotateXBuilder "BoxCompositionRotateXBuilder::BoxCompositionRotateXBuilder()
";
-%feature("docstring") BoxCompositionRotateXBuilder::buildSample "MultiLayer * BoxCompositionRotateXBuilder::buildSample() const
+%feature("docstring") BoxCompositionRotateXBuilder::buildSample "MultiLayer * BoxCompositionRotateXBuilder::buildSample() const
";
@@ -546,7 +546,7 @@ C++ includes: BoxCompositionBuilder.h
%feature("docstring") BoxCompositionRotateYBuilder::BoxCompositionRotateYBuilder "BoxCompositionRotateYBuilder::BoxCompositionRotateYBuilder()
";
-%feature("docstring") BoxCompositionRotateYBuilder::buildSample "MultiLayer * BoxCompositionRotateYBuilder::buildSample() const
+%feature("docstring") BoxCompositionRotateYBuilder::buildSample "MultiLayer * BoxCompositionRotateYBuilder::buildSample() const
";
@@ -561,7 +561,7 @@ C++ includes: BoxCompositionBuilder.h
%feature("docstring") BoxCompositionRotateZandYBuilder::BoxCompositionRotateZandYBuilder "BoxCompositionRotateZandYBuilder::BoxCompositionRotateZandYBuilder()
";
-%feature("docstring") BoxCompositionRotateZandYBuilder::buildSample "MultiLayer * BoxCompositionRotateZandYBuilder::buildSample() const
+%feature("docstring") BoxCompositionRotateZandYBuilder::buildSample "MultiLayer * BoxCompositionRotateZandYBuilder::buildSample() const
";
@@ -576,7 +576,7 @@ C++ includes: BoxCompositionBuilder.h
%feature("docstring") BoxCompositionRotateZBuilder::BoxCompositionRotateZBuilder "BoxCompositionRotateZBuilder::BoxCompositionRotateZBuilder()
";
-%feature("docstring") BoxCompositionRotateZBuilder::buildSample "MultiLayer * BoxCompositionRotateZBuilder::buildSample() const
+%feature("docstring") BoxCompositionRotateZBuilder::buildSample "MultiLayer * BoxCompositionRotateZBuilder::buildSample() const
";
@@ -591,7 +591,7 @@ C++ includes: BoxesSquareLatticeBuilder.h
%feature("docstring") BoxesSquareLatticeBuilder::BoxesSquareLatticeBuilder "BoxesSquareLatticeBuilder::BoxesSquareLatticeBuilder()
";
-%feature("docstring") BoxesSquareLatticeBuilder::buildSample "MultiLayer * BoxesSquareLatticeBuilder::buildSample() const
+%feature("docstring") BoxesSquareLatticeBuilder::buildSample "MultiLayer * BoxesSquareLatticeBuilder::buildSample() const
";
@@ -606,7 +606,7 @@ C++ includes: BoxCompositionBuilder.h
%feature("docstring") BoxStackCompositionBuilder::BoxStackCompositionBuilder "BoxStackCompositionBuilder::BoxStackCompositionBuilder()
";
-%feature("docstring") BoxStackCompositionBuilder::buildSample "MultiLayer * BoxStackCompositionBuilder::buildSample() const
+%feature("docstring") BoxStackCompositionBuilder::buildSample "MultiLayer * BoxStackCompositionBuilder::buildSample() const
";
@@ -639,7 +639,7 @@ C++ includes: TwoDimLatticeBuilder.h
%feature("docstring") CenteredSquareLatticeBuilder::CenteredSquareLatticeBuilder "CenteredSquareLatticeBuilder::CenteredSquareLatticeBuilder()
";
-%feature("docstring") CenteredSquareLatticeBuilder::buildSample "MultiLayer * CenteredSquareLatticeBuilder::buildSample() const
+%feature("docstring") CenteredSquareLatticeBuilder::buildSample "MultiLayer * CenteredSquareLatticeBuilder::buildSample() const
";
@@ -687,10 +687,10 @@ C++ includes: ComputationStatus.h
%feature("docstring") ComputationStatus::ComputationStatus "ComputationStatus::ComputationStatus()
";
-%feature("docstring") ComputationStatus::isCompleted "bool ComputationStatus::isCompleted() const
+%feature("docstring") ComputationStatus::isCompleted "bool ComputationStatus::isCompleted() const
";
-%feature("docstring") ComputationStatus::errorMessage "std::string ComputationStatus::errorMessage() const
+%feature("docstring") ComputationStatus::errorMessage "std::string ComputationStatus::errorMessage() const
";
%feature("docstring") ComputationStatus::setRunning "void ComputationStatus::setRunning()
@@ -717,7 +717,7 @@ C++ includes: ParticleDistributionsBuilder.h
%feature("docstring") ConesWithLimitsDistributionBuilder::ConesWithLimitsDistributionBuilder "ConesWithLimitsDistributionBuilder::ConesWithLimitsDistributionBuilder()
";
-%feature("docstring") ConesWithLimitsDistributionBuilder::buildSample "MultiLayer * ConesWithLimitsDistributionBuilder::buildSample() const
+%feature("docstring") ConesWithLimitsDistributionBuilder::buildSample "MultiLayer * ConesWithLimitsDistributionBuilder::buildSample() const
";
@@ -735,10 +735,10 @@ C++ includes: ConstantBackground.h
%feature("docstring") ConstantBackground::~ConstantBackground "ConstantBackground::~ConstantBackground()
";
-%feature("docstring") ConstantBackground::clone "ConstantBackground * ConstantBackground::clone() const overridefinal
+%feature("docstring") ConstantBackground::clone "ConstantBackground * ConstantBackground::clone() const override final
";
-%feature("docstring") ConstantBackground::backgroundValue "double ConstantBackground::backgroundValue() const
+%feature("docstring") ConstantBackground::backgroundValue "double ConstantBackground::backgroundValue() const
";
%feature("docstring") ConstantBackground::accept "void ConstantBackground::accept(INodeVisitor *visitor) const override
@@ -746,7 +746,7 @@ C++ includes: ConstantBackground.h
Calls the INodeVisitor's visit method.
";
-%feature("docstring") ConstantBackground::addBackGround "void ConstantBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const overridefinal
+%feature("docstring") ConstantBackground::addBackGround "void ConstantBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const override final
";
@@ -820,7 +820,7 @@ Constructor taking a 2 dimensional resolution function as argument.
Convolve given intensities with the encapsulated resolution.
";
-%feature("docstring") ConvolutionDetectorResolution::clone "ConvolutionDetectorResolution * ConvolutionDetectorResolution::clone() const
+%feature("docstring") ConvolutionDetectorResolution::clone "ConvolutionDetectorResolution * ConvolutionDetectorResolution::clone() const
";
%feature("docstring") ConvolutionDetectorResolution::accept "void ConvolutionDetectorResolution::accept(INodeVisitor *visitor) const final
@@ -828,7 +828,7 @@ Convolve given intensities with the encapsulated resolution.
Calls the INodeVisitor's visit method.
";
-%feature("docstring") ConvolutionDetectorResolution::getResolutionFunction2D "const IResolutionFunction2D * ConvolutionDetectorResolution::getResolutionFunction2D() const
+%feature("docstring") ConvolutionDetectorResolution::getResolutionFunction2D "const IResolutionFunction2D * ConvolutionDetectorResolution::getResolutionFunction2D() const
";
%feature("docstring") ConvolutionDetectorResolution::getChildren "std::vector< const INode * > ConvolutionDetectorResolution::getChildren() const
@@ -884,7 +884,7 @@ C++ includes: CoreShellParticleBuilder.h
%feature("docstring") CoreShellBoxRotateZandYBuilder::CoreShellBoxRotateZandYBuilder "CoreShellBoxRotateZandYBuilder::CoreShellBoxRotateZandYBuilder()
";
-%feature("docstring") CoreShellBoxRotateZandYBuilder::buildSample "MultiLayer * CoreShellBoxRotateZandYBuilder::buildSample() const
+%feature("docstring") CoreShellBoxRotateZandYBuilder::buildSample "MultiLayer * CoreShellBoxRotateZandYBuilder::buildSample() const
";
@@ -899,7 +899,7 @@ C++ includes: CoreShellParticleBuilder.h
%feature("docstring") CoreShellParticleBuilder::CoreShellParticleBuilder "CoreShellParticleBuilder::CoreShellParticleBuilder()
";
-%feature("docstring") CoreShellParticleBuilder::buildSample "MultiLayer * CoreShellParticleBuilder::buildSample() const
+%feature("docstring") CoreShellParticleBuilder::buildSample "MultiLayer * CoreShellParticleBuilder::buildSample() const
";
@@ -914,7 +914,7 @@ C++ includes: RipplesBuilder.h
%feature("docstring") CosineRippleBuilder::CosineRippleBuilder "CosineRippleBuilder::CosineRippleBuilder()
";
-%feature("docstring") CosineRippleBuilder::buildSample "MultiLayer * CosineRippleBuilder::buildSample() const
+%feature("docstring") CosineRippleBuilder::buildSample "MultiLayer * CosineRippleBuilder::buildSample() const
";
@@ -932,33 +932,33 @@ C++ includes: Crystal.h
%feature("docstring") Crystal::~Crystal "Crystal::~Crystal()
";
-%feature("docstring") Crystal::clone "Crystal * Crystal::clone() const overridefinal
+%feature("docstring") Crystal::clone "Crystal * Crystal::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") Crystal::accept "void Crystal::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") Crystal::accept "void Crystal::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") Crystal::createTotalFormFactor "IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const overridefinal
+%feature("docstring") Crystal::createTotalFormFactor "IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const override final
Creates a total form factor for the mesocrystal with a specific shape and content The bulk content of the mesocrystal is encapsulated by the IClusteredParticles object itself
";
-%feature("docstring") Crystal::homogeneousRegions "std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const overridefinal
+%feature("docstring") Crystal::homogeneousRegions "std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const override final
Creates region information with volumetric densities instead of absolute volume These densities need to be multiplied by the total mesocrystal volume
";
-%feature("docstring") Crystal::transformedLattice "Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const
+%feature("docstring") Crystal::transformedLattice "Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const
";
%feature("docstring") Crystal::setDWFactor "void Crystal::setDWFactor(double dw_factor)
";
-%feature("docstring") Crystal::getChildren "std::vector< const INode * > Crystal::getChildren() const overridefinal
+%feature("docstring") Crystal::getChildren "std::vector< const INode * > Crystal::getChildren() const override final
Returns a vector of children (const).
";
@@ -984,16 +984,16 @@ C++ includes: CumulativeValue.h
%feature("docstring") CumulativeValue::add "void CumulativeValue::add(double value, double weight=1.0)
";
-%feature("docstring") CumulativeValue::getNumberOfEntries "int CumulativeValue::getNumberOfEntries() const
+%feature("docstring") CumulativeValue::getNumberOfEntries "int CumulativeValue::getNumberOfEntries() const
";
-%feature("docstring") CumulativeValue::getContent "double CumulativeValue::getContent() const
+%feature("docstring") CumulativeValue::getContent "double CumulativeValue::getContent() const
";
-%feature("docstring") CumulativeValue::getAverage "double CumulativeValue::getAverage() const
+%feature("docstring") CumulativeValue::getAverage "double CumulativeValue::getAverage() const
";
-%feature("docstring") CumulativeValue::getRMS "double CumulativeValue::getRMS() const
+%feature("docstring") CumulativeValue::getRMS "double CumulativeValue::getRMS() const
";
@@ -1038,7 +1038,7 @@ clone function
retrieve a 1d bin for the given index
";
-%feature("docstring") CustomBinAxis::getBinCenters "std::vector< double > CustomBinAxis::getBinCenters() const
+%feature("docstring") CustomBinAxis::getBinCenters "std::vector< double > CustomBinAxis::getBinCenters() const
";
%feature("docstring") CustomBinAxis::createClippedAxis "CustomBinAxis * CustomBinAxis::createClippedAxis(double left, double right) const
@@ -1058,7 +1058,7 @@ C++ includes: CustomMorphologyBuilder.h
%feature("docstring") CustomMorphologyBuilder::CustomMorphologyBuilder "CustomMorphologyBuilder::CustomMorphologyBuilder()
";
-%feature("docstring") CustomMorphologyBuilder::buildSample "MultiLayer * CustomMorphologyBuilder::buildSample() const
+%feature("docstring") CustomMorphologyBuilder::buildSample "MultiLayer * CustomMorphologyBuilder::buildSample() const
";
@@ -1073,7 +1073,7 @@ C++ includes: CylindersAndPrismsBuilder.h
%feature("docstring") CylindersAndPrismsBuilder::CylindersAndPrismsBuilder "CylindersAndPrismsBuilder::CylindersAndPrismsBuilder()
";
-%feature("docstring") CylindersAndPrismsBuilder::buildSample "MultiLayer * CylindersAndPrismsBuilder::buildSample() const
+%feature("docstring") CylindersAndPrismsBuilder::buildSample "MultiLayer * CylindersAndPrismsBuilder::buildSample() const
";
@@ -1088,7 +1088,7 @@ C++ includes: CylindersBuilder.h
%feature("docstring") CylindersInBABuilder::CylindersInBABuilder "CylindersInBABuilder::CylindersInBABuilder()
";
-%feature("docstring") CylindersInBABuilder::buildSample "MultiLayer * CylindersInBABuilder::buildSample() const
+%feature("docstring") CylindersInBABuilder::buildSample "MultiLayer * CylindersInBABuilder::buildSample() const
";
@@ -1103,7 +1103,7 @@ C++ includes: CylindersBuilder.h
%feature("docstring") CylindersInDWBABuilder::CylindersInDWBABuilder "CylindersInDWBABuilder::CylindersInDWBABuilder()
";
-%feature("docstring") CylindersInDWBABuilder::buildSample "MultiLayer * CylindersInDWBABuilder::buildSample() const
+%feature("docstring") CylindersInDWBABuilder::buildSample "MultiLayer * CylindersInDWBABuilder::buildSample() const
";
@@ -1118,7 +1118,7 @@ C++ includes: SizeDistributionModelsBuilder.h
%feature("docstring") CylindersInSSCABuilder::CylindersInSSCABuilder "CylindersInSSCABuilder::CylindersInSSCABuilder()
";
-%feature("docstring") CylindersInSSCABuilder::buildSample "MultiLayer * CylindersInSSCABuilder::buildSample() const
+%feature("docstring") CylindersInSSCABuilder::buildSample "MultiLayer * CylindersInSSCABuilder::buildSample() const
";
@@ -1133,7 +1133,7 @@ C++ includes: ParticleDistributionsBuilder.h
%feature("docstring") CylindersWithSizeDistributionBuilder::CylindersWithSizeDistributionBuilder "CylindersWithSizeDistributionBuilder::CylindersWithSizeDistributionBuilder()
";
-%feature("docstring") CylindersWithSizeDistributionBuilder::buildSample "MultiLayer * CylindersWithSizeDistributionBuilder::buildSample() const
+%feature("docstring") CylindersWithSizeDistributionBuilder::buildSample "MultiLayer * CylindersWithSizeDistributionBuilder::buildSample() const
";
@@ -1213,7 +1213,7 @@ Retrieve the analyzer characteristics.
will always return positive value
";
-%feature("docstring") DetectionProperties::analyzerTotalTransmission "double DetectionProperties::analyzerTotalTransmission() const
+%feature("docstring") DetectionProperties::analyzerTotalTransmission "double DetectionProperties::analyzerTotalTransmission() const
";
%feature("docstring") DetectionProperties::accept "void DetectionProperties::accept(INodeVisitor *visitor) const final
@@ -1258,13 +1258,13 @@ Init the map of masks for the given detector plane.
%feature("docstring") DetectorMask::initMaskData "void DetectorMask::initMaskData(const OutputData< double > &data)
";
-%feature("docstring") DetectorMask::isMasked "bool DetectorMask::isMasked(size_t index) const
+%feature("docstring") DetectorMask::isMasked "bool DetectorMask::isMasked(size_t index) const
";
-%feature("docstring") DetectorMask::getMaskData "const OutputData<bool>* DetectorMask::getMaskData() const
+%feature("docstring") DetectorMask::getMaskData "const OutputData<bool>* DetectorMask::getMaskData() const
";
-%feature("docstring") DetectorMask::createHistogram "Histogram2D * DetectorMask::createHistogram() const
+%feature("docstring") DetectorMask::createHistogram "Histogram2D * DetectorMask::createHistogram() const
";
%feature("docstring") DetectorMask::removeMasks "void DetectorMask::removeMasks()
@@ -1277,13 +1277,13 @@ remove all masks and return object to initial state
returns true if has masks
";
-%feature("docstring") DetectorMask::numberOfMaskedChannels "int DetectorMask::numberOfMaskedChannels() const
+%feature("docstring") DetectorMask::numberOfMaskedChannels "int DetectorMask::numberOfMaskedChannels() const
";
-%feature("docstring") DetectorMask::numberOfMasks "size_t DetectorMask::numberOfMasks() const
+%feature("docstring") DetectorMask::numberOfMasks "size_t DetectorMask::numberOfMasks() const
";
-%feature("docstring") DetectorMask::getMaskShape "const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const
+%feature("docstring") DetectorMask::getMaskShape "const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const
";
@@ -1317,7 +1317,7 @@ Returns the distribution-specific probability density for value x.
Returns the distribution-specific mean.
";
-%feature("docstring") DistributionCosine::getSigma "double DistributionCosine::getSigma() const
+%feature("docstring") DistributionCosine::getSigma "double DistributionCosine::getSigma() const
";
%feature("docstring") DistributionCosine::equidistantPoints "std::vector< double > DistributionCosine::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
@@ -1366,10 +1366,10 @@ Returns the distribution-specific probability density for value x.
Returns the distribution-specific mean.
";
-%feature("docstring") DistributionGate::getMin "double DistributionGate::getMin() const
+%feature("docstring") DistributionGate::getMin "double DistributionGate::getMin() const
";
-%feature("docstring") DistributionGate::getMax "double DistributionGate::getMax() const
+%feature("docstring") DistributionGate::getMax "double DistributionGate::getMax() const
";
%feature("docstring") DistributionGate::equidistantPoints "std::vector< double > DistributionGate::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
@@ -1418,7 +1418,7 @@ Returns the distribution-specific probability density for value x.
Returns the distribution-specific mean.
";
-%feature("docstring") DistributionGaussian::getStdDev "double DistributionGaussian::getStdDev() const
+%feature("docstring") DistributionGaussian::getStdDev "double DistributionGaussian::getStdDev() const
";
%feature("docstring") DistributionGaussian::equidistantPoints "std::vector< double > DistributionGaussian::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
@@ -1469,7 +1469,7 @@ get the total number of parameter value combinations (product of the individual
set the parameter values of the simulation object to a specific combination of values, determined by the index (which must be smaller than the total number of combinations) and returns the weight associated with this combination of parameter values
";
-%feature("docstring") DistributionHandler::getDistributions "const DistributionHandler::Distributions_t & DistributionHandler::getDistributions() const
+%feature("docstring") DistributionHandler::getDistributions "const DistributionHandler::Distributions_t & DistributionHandler::getDistributions() const
";
@@ -1503,10 +1503,10 @@ Returns the distribution-specific probability density for value x.
Returns the distribution-specific mean.
";
-%feature("docstring") DistributionLogNormal::getMedian "double DistributionLogNormal::getMedian() const
+%feature("docstring") DistributionLogNormal::getMedian "double DistributionLogNormal::getMedian() const
";
-%feature("docstring") DistributionLogNormal::getScalePar "double DistributionLogNormal::getScalePar() const
+%feature("docstring") DistributionLogNormal::getScalePar "double DistributionLogNormal::getScalePar() const
";
%feature("docstring") DistributionLogNormal::equidistantPoints "std::vector< double > DistributionLogNormal::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
@@ -1560,7 +1560,7 @@ Returns the distribution-specific probability density for value x.
Returns the distribution-specific mean.
";
-%feature("docstring") DistributionLorentz::getHWHM "double DistributionLorentz::getHWHM() const
+%feature("docstring") DistributionLorentz::getHWHM "double DistributionLorentz::getHWHM() const
";
%feature("docstring") DistributionLorentz::equidistantPoints "std::vector< double > DistributionLorentz::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
@@ -1609,13 +1609,13 @@ Returns the distribution-specific probability density for value x.
Returns the distribution-specific mean.
";
-%feature("docstring") DistributionTrapezoid::getLeftWidth "double DistributionTrapezoid::getLeftWidth() const
+%feature("docstring") DistributionTrapezoid::getLeftWidth "double DistributionTrapezoid::getLeftWidth() const
";
-%feature("docstring") DistributionTrapezoid::getMiddleWidth "double DistributionTrapezoid::getMiddleWidth() const
+%feature("docstring") DistributionTrapezoid::getMiddleWidth "double DistributionTrapezoid::getMiddleWidth() const
";
-%feature("docstring") DistributionTrapezoid::getRightWidth "double DistributionTrapezoid::getRightWidth() const
+%feature("docstring") DistributionTrapezoid::getRightWidth "double DistributionTrapezoid::getRightWidth() const
";
%feature("docstring") DistributionTrapezoid::equidistantPoints "std::vector< double > DistributionTrapezoid::equidistantPoints(size_t nbr_samples, double sigma_factor, const RealLimits &limits=RealLimits()) const
@@ -1727,7 +1727,7 @@ theta:
Angle of Ellipse rotation in radians
";
-%feature("docstring") Ellipse::clone "Ellipse* Ellipse::clone() const
+%feature("docstring") Ellipse::clone "Ellipse* Ellipse::clone() const
";
%feature("docstring") Ellipse::contains "bool Ellipse::contains(double x, double y) const
@@ -1740,19 +1740,19 @@ Returns true if point with given coordinates is inside or on border of the shape
Returns true if area defined by two bins is inside or on border of ellipse; more precisely, if mid point of two bins satisfy this condition.
";
-%feature("docstring") Ellipse::getCenterX "double Ellipse::getCenterX() const
+%feature("docstring") Ellipse::getCenterX "double Ellipse::getCenterX() const
";
-%feature("docstring") Ellipse::getCenterY "double Ellipse::getCenterY() const
+%feature("docstring") Ellipse::getCenterY "double Ellipse::getCenterY() const
";
-%feature("docstring") Ellipse::getRadiusX "double Ellipse::getRadiusX() const
+%feature("docstring") Ellipse::getRadiusX "double Ellipse::getRadiusX() const
";
-%feature("docstring") Ellipse::getRadiusY "double Ellipse::getRadiusY() const
+%feature("docstring") Ellipse::getRadiusY "double Ellipse::getRadiusY() const
";
-%feature("docstring") Ellipse::getTheta "double Ellipse::getTheta() const
+%feature("docstring") Ellipse::getTheta "double Ellipse::getTheta() const
";
@@ -1817,25 +1817,25 @@ C++ includes: FitElement.h
%feature("docstring") FitElement::FitElement "FitElement::FitElement(const FitElement &other)
";
-%feature("docstring") FitElement::getIndex "size_t FitElement::getIndex() const
+%feature("docstring") FitElement::getIndex "size_t FitElement::getIndex() const
";
-%feature("docstring") FitElement::getSimulValue "double FitElement::getSimulValue() const
+%feature("docstring") FitElement::getSimulValue "double FitElement::getSimulValue() const
";
-%feature("docstring") FitElement::getRealValue "double FitElement::getRealValue() const
+%feature("docstring") FitElement::getRealValue "double FitElement::getRealValue() const
";
-%feature("docstring") FitElement::getWeight "double FitElement::getWeight() const
+%feature("docstring") FitElement::getWeight "double FitElement::getWeight() const
";
-%feature("docstring") FitElement::getSquaredDifference "double FitElement::getSquaredDifference() const
+%feature("docstring") FitElement::getSquaredDifference "double FitElement::getSquaredDifference() const
";
%feature("docstring") FitElement::setSquaredDifference "void FitElement::setSquaredDifference(double value)
";
-%feature("docstring") FitElement::getResidual "double FitElement::getResidual() const
+%feature("docstring") FitElement::getResidual "double FitElement::getResidual() const
";
%feature("docstring") FitElement::setResidual "void FitElement::setResidual(double value)
@@ -1918,7 +1918,7 @@ Updates ChiSquared map from external vector and returns const reference to it. U
Returns a vector of children (const).
";
-%feature("docstring") FitObject::getDefaultAxisUnits "std::string FitObject::getDefaultAxisUnits() const
+%feature("docstring") FitObject::getDefaultAxisUnits "std::string FitObject::getDefaultAxisUnits() const
";
@@ -1942,7 +1942,7 @@ C++ includes: FitParameter.h
%feature("docstring") FitParameter::~FitParameter "FitParameter::~FitParameter() final
";
-%feature("docstring") FitParameter::clone "FitParameter * FitParameter::clone() const
+%feature("docstring") FitParameter::clone "FitParameter * FitParameter::clone() const
";
%feature("docstring") FitParameter::setValue "void FitParameter::setValue(double value) final
@@ -1965,7 +1965,7 @@ Adds real parameter to the collection.
Adds parameters from pool which match given wildcard.
";
-%feature("docstring") FitParameter::patterns "std::vector< std::string > FitParameter::patterns() const
+%feature("docstring") FitParameter::patterns "std::vector< std::string > FitParameter::patterns() const
";
%feature("docstring") FitParameter::matchedParameterNames "std::vector< std::string > FitParameter::matchedParameterNames() const
@@ -2001,7 +2001,7 @@ C++ includes: FitStrategyAdjustParameters.h
%feature("docstring") FitStrategyAdjustParameters::~FitStrategyAdjustParameters "virtual FitStrategyAdjustParameters::~FitStrategyAdjustParameters()
";
-%feature("docstring") FitStrategyAdjustParameters::clone "virtual FitStrategyAdjustParameters* FitStrategyAdjustParameters::clone() const
+%feature("docstring") FitStrategyAdjustParameters::clone "virtual FitStrategyAdjustParameters* FitStrategyAdjustParameters::clone() const
";
%feature("docstring") FitStrategyAdjustParameters::execute "void FitStrategyAdjustParameters::execute()
@@ -2039,7 +2039,7 @@ C++ includes: IFitStrategy.h
%feature("docstring") FitStrategyDefault::FitStrategyDefault "FitStrategyDefault::FitStrategyDefault()
";
-%feature("docstring") FitStrategyDefault::clone "FitStrategyDefault * FitStrategyDefault::clone() const
+%feature("docstring") FitStrategyDefault::clone "FitStrategyDefault * FitStrategyDefault::clone() const
";
%feature("docstring") FitStrategyDefault::execute "void FitStrategyDefault::execute()
@@ -2063,7 +2063,7 @@ C++ includes: FitStrategyAdjustParameters.h
%feature("docstring") FitStrategyFixParameters::~FitStrategyFixParameters "virtual FitStrategyFixParameters::~FitStrategyFixParameters()
";
-%feature("docstring") FitStrategyFixParameters::clone "virtual FitStrategyFixParameters* FitStrategyFixParameters::clone() const
+%feature("docstring") FitStrategyFixParameters::clone "virtual FitStrategyFixParameters* FitStrategyFixParameters::clone() const
";
%feature("docstring") FitStrategyFixParameters::clear "virtual void FitStrategyFixParameters::clear()
@@ -2090,7 +2090,7 @@ C++ includes: FitStrategyAdjustParameters.h
%feature("docstring") FitStrategyReleaseParameters::~FitStrategyReleaseParameters "virtual FitStrategyReleaseParameters::~FitStrategyReleaseParameters()
";
-%feature("docstring") FitStrategyReleaseParameters::clone "virtual FitStrategyReleaseParameters* FitStrategyReleaseParameters::clone() const
+%feature("docstring") FitStrategyReleaseParameters::clone "virtual FitStrategyReleaseParameters* FitStrategyReleaseParameters::clone() const
";
%feature("docstring") FitStrategyReleaseParameters::clear "virtual void FitStrategyReleaseParameters::clear()
@@ -2313,13 +2313,13 @@ Returns minimum chi squared value found.
%feature("docstring") FitSuite::isInterrupted "bool FitSuite::isInterrupted()
";
-%feature("docstring") FitSuite::getRealOutputData "const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const
+%feature("docstring") FitSuite::getRealOutputData "const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const
";
-%feature("docstring") FitSuite::getSimulationOutputData "const OutputData< double > * FitSuite::getSimulationOutputData(size_t i_item=0) const
+%feature("docstring") FitSuite::getSimulationOutputData "const OutputData< double > * FitSuite::getSimulationOutputData(size_t i_item=0) const
";
-%feature("docstring") FitSuite::getChiSquaredOutputData "const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const
+%feature("docstring") FitSuite::getChiSquaredOutputData "const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const
";
%feature("docstring") FitSuite::parametersToString "std::string FitSuite::parametersToString() const
@@ -2381,10 +2381,10 @@ evaluate method for gradients and residuals called directly from the minimizer
evaluate residual and derivative for given data element
";
-%feature("docstring") FitSuiteGradientFunction::getNCallsTotal "virtual size_t FitSuiteGradientFunction::getNCallsTotal() const
+%feature("docstring") FitSuiteGradientFunction::getNCallsTotal "virtual size_t FitSuiteGradientFunction::getNCallsTotal() const
";
-%feature("docstring") FitSuiteGradientFunction::getNCallsGradient "virtual size_t FitSuiteGradientFunction::getNCallsGradient() const
+%feature("docstring") FitSuiteGradientFunction::getNCallsGradient "virtual size_t FitSuiteGradientFunction::getNCallsGradient() const
";
@@ -2454,7 +2454,7 @@ Runs a single minimization round (called by FitSuiteStrategy)
Returns reference to the kit with data.
";
-%feature("docstring") FitSuiteImpl::fitObjects "const FitSuiteObjects* FitSuiteImpl::fitObjects() const
+%feature("docstring") FitSuiteImpl::fitObjects "const FitSuiteObjects* FitSuiteImpl::fitObjects() const
";
%feature("docstring") FitSuiteImpl::fitParameters "FitParameterSet * FitSuiteImpl::fitParameters()
@@ -2506,10 +2506,10 @@ Sets fit options.
%feature("docstring") FitSuiteImpl::resetInterrupt "void FitSuiteImpl::resetInterrupt()
";
-%feature("docstring") FitSuiteImpl::isInterrupted "bool FitSuiteImpl::isInterrupted() const
+%feature("docstring") FitSuiteImpl::isInterrupted "bool FitSuiteImpl::isInterrupted() const
";
-%feature("docstring") FitSuiteImpl::kernel "const FitKernel * FitSuiteImpl::kernel() const
+%feature("docstring") FitSuiteImpl::kernel "const FitKernel * FitSuiteImpl::kernel() const
";
%feature("docstring") FitSuiteImpl::setupToString "std::string FitSuiteImpl::setupToString()
@@ -2618,7 +2618,7 @@ index accross all element in FitElement vector
clear all data
";
-%feature("docstring") FitSuiteObjects::size "size_t FitSuiteObjects::size() const
+%feature("docstring") FitSuiteObjects::size "size_t FitSuiteObjects::size() const
";
%feature("docstring") FitSuiteObjects::begin "iterator FitSuiteObjects::begin()
@@ -2632,7 +2632,7 @@ clear all data
Returns a vector of children (const).
";
-%feature("docstring") FitSuiteObjects::getDefaultAxesUnits "std::string FitSuiteObjects::getDefaultAxesUnits(size_t i_item=0) const
+%feature("docstring") FitSuiteObjects::getDefaultAxesUnits "std::string FitSuiteObjects::getDefaultAxesUnits(size_t i_item=0) const
";
@@ -2682,10 +2682,10 @@ C++ includes: FitSuiteStrategies.h
%feature("docstring") FitSuiteStrategies::minimize "void FitSuiteStrategies::minimize()
";
-%feature("docstring") FitSuiteStrategies::currentStrategyIndex "size_t FitSuiteStrategies::currentStrategyIndex() const
+%feature("docstring") FitSuiteStrategies::currentStrategyIndex "size_t FitSuiteStrategies::currentStrategyIndex() const
";
-%feature("docstring") FitSuiteStrategies::size "size_t FitSuiteStrategies::size() const
+%feature("docstring") FitSuiteStrategies::size "size_t FitSuiteStrategies::size() const
";
%feature("docstring") FitSuiteStrategies::clear "void FitSuiteStrategies::clear()
@@ -2751,7 +2751,7 @@ Returns value of first point of axis.
Returns value of last point of axis.
";
-%feature("docstring") FixedBinAxis::getBinCenter "double FixedBinAxis::getBinCenter(size_t index) const
+%feature("docstring") FixedBinAxis::getBinCenter "double FixedBinAxis::getBinCenter(size_t index) const
";
%feature("docstring") FixedBinAxis::findClosestIndex "size_t FixedBinAxis::findClosestIndex(double value) const
@@ -2759,10 +2759,10 @@ Returns value of last point of axis.
find bin index which is best match for given value
";
-%feature("docstring") FixedBinAxis::getBinCenters "std::vector< double > FixedBinAxis::getBinCenters() const
+%feature("docstring") FixedBinAxis::getBinCenters "std::vector< double > FixedBinAxis::getBinCenters() const
";
-%feature("docstring") FixedBinAxis::getBinBoundaries "std::vector< double > FixedBinAxis::getBinBoundaries() const
+%feature("docstring") FixedBinAxis::getBinBoundaries "std::vector< double > FixedBinAxis::getBinBoundaries() const
";
%feature("docstring") FixedBinAxis::createClippedAxis "FixedBinAxis * FixedBinAxis::createClippedAxis(double left, double right) const
@@ -2806,26 +2806,26 @@ alpha:
dihedral angle in radians between base and facet
";
-%feature("docstring") FormFactorAnisoPyramid::clone "FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const overridefinal
+%feature("docstring") FormFactorAnisoPyramid::clone "FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorAnisoPyramid::accept "void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorAnisoPyramid::accept "void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorAnisoPyramid::getLength "double FormFactorAnisoPyramid::getLength() const
+%feature("docstring") FormFactorAnisoPyramid::getLength "double FormFactorAnisoPyramid::getLength() const
";
-%feature("docstring") FormFactorAnisoPyramid::getWidth "double FormFactorAnisoPyramid::getWidth() const
+%feature("docstring") FormFactorAnisoPyramid::getWidth "double FormFactorAnisoPyramid::getWidth() const
";
-%feature("docstring") FormFactorAnisoPyramid::getHeight "double FormFactorAnisoPyramid::getHeight() const
+%feature("docstring") FormFactorAnisoPyramid::getHeight "double FormFactorAnisoPyramid::getHeight() const
";
-%feature("docstring") FormFactorAnisoPyramid::getAlpha "double FormFactorAnisoPyramid::getAlpha() const
+%feature("docstring") FormFactorAnisoPyramid::getAlpha "double FormFactorAnisoPyramid::getAlpha() const
";
@@ -2854,31 +2854,31 @@ height:
height of the box in nanometers
";
-%feature("docstring") FormFactorBox::clone "FormFactorBox* FormFactorBox::clone() const overridefinal
+%feature("docstring") FormFactorBox::clone "FormFactorBox* FormFactorBox::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorBox::accept "void FormFactorBox::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorBox::accept "void FormFactorBox::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorBox::getLength "double FormFactorBox::getLength() const
+%feature("docstring") FormFactorBox::getLength "double FormFactorBox::getLength() const
";
-%feature("docstring") FormFactorBox::getHeight "double FormFactorBox::getHeight() const
+%feature("docstring") FormFactorBox::getHeight "double FormFactorBox::getHeight() const
";
-%feature("docstring") FormFactorBox::getWidth "double FormFactorBox::getWidth() const
+%feature("docstring") FormFactorBox::getWidth "double FormFactorBox::getWidth() const
";
-%feature("docstring") FormFactorBox::radialExtension "double FormFactorBox::radialExtension() const overridefinal
+%feature("docstring") FormFactorBox::radialExtension "double FormFactorBox::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorBox::evaluate_for_q "complex_t FormFactorBox::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorBox::evaluate_for_q "complex_t FormFactorBox::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -2901,16 +2901,16 @@ C++ includes: FormFactorCoherentPart.h
%feature("docstring") FormFactorCoherentPart::~FormFactorCoherentPart "FormFactorCoherentPart::~FormFactorCoherentPart()
";
-%feature("docstring") FormFactorCoherentPart::evaluate "complex_t FormFactorCoherentPart::evaluate(const SimulationElement &sim_element) const
+%feature("docstring") FormFactorCoherentPart::evaluate "complex_t FormFactorCoherentPart::evaluate(const SimulationElement &sim_element) const
";
-%feature("docstring") FormFactorCoherentPart::evaluatePol "Eigen::Matrix2cd FormFactorCoherentPart::evaluatePol(const SimulationElement &sim_element) const
+%feature("docstring") FormFactorCoherentPart::evaluatePol "Eigen::Matrix2cd FormFactorCoherentPart::evaluatePol(const SimulationElement &sim_element) const
";
%feature("docstring") FormFactorCoherentPart::setSpecularInfo "void FormFactorCoherentPart::setSpecularInfo(const IFresnelMap *p_fresnel_map, size_t layer_index)
";
-%feature("docstring") FormFactorCoherentPart::radialExtension "double FormFactorCoherentPart::radialExtension() const
+%feature("docstring") FormFactorCoherentPart::radialExtension "double FormFactorCoherentPart::radialExtension() const
";
@@ -2928,28 +2928,28 @@ C++ includes: FormFactorCoherentSum.h
%feature("docstring") FormFactorCoherentSum::~FormFactorCoherentSum "FormFactorCoherentSum::~FormFactorCoherentSum()
";
-%feature("docstring") FormFactorCoherentSum::clone "FormFactorCoherentSum * FormFactorCoherentSum::clone() const
+%feature("docstring") FormFactorCoherentSum::clone "FormFactorCoherentSum * FormFactorCoherentSum::clone() const
";
%feature("docstring") FormFactorCoherentSum::addCoherentPart "void FormFactorCoherentSum::addCoherentPart(const FormFactorCoherentPart &part)
";
-%feature("docstring") FormFactorCoherentSum::evaluate "complex_t FormFactorCoherentSum::evaluate(const SimulationElement &sim_element) const
+%feature("docstring") FormFactorCoherentSum::evaluate "complex_t FormFactorCoherentSum::evaluate(const SimulationElement &sim_element) const
";
-%feature("docstring") FormFactorCoherentSum::evaluatePol "Eigen::Matrix2cd FormFactorCoherentSum::evaluatePol(const SimulationElement &sim_element) const
+%feature("docstring") FormFactorCoherentSum::evaluatePol "Eigen::Matrix2cd FormFactorCoherentSum::evaluatePol(const SimulationElement &sim_element) const
";
%feature("docstring") FormFactorCoherentSum::setSpecularInfo "void FormFactorCoherentSum::setSpecularInfo(const IFresnelMap *p_fresnel_map, size_t layer_index)
";
-%feature("docstring") FormFactorCoherentSum::relativeAbundance "double FormFactorCoherentSum::relativeAbundance() const
+%feature("docstring") FormFactorCoherentSum::relativeAbundance "double FormFactorCoherentSum::relativeAbundance() const
";
%feature("docstring") FormFactorCoherentSum::scaleRelativeAbundance "void FormFactorCoherentSum::scaleRelativeAbundance(double total_abundance)
";
-%feature("docstring") FormFactorCoherentSum::radialExtension "double FormFactorCoherentSum::radialExtension() const
+%feature("docstring") FormFactorCoherentSum::radialExtension "double FormFactorCoherentSum::radialExtension() const
";
@@ -2990,31 +2990,31 @@ alpha:
angle between the base and the side surface in radians
";
-%feature("docstring") FormFactorCone::clone "FormFactorCone* FormFactorCone::clone() const overridefinal
+%feature("docstring") FormFactorCone::clone "FormFactorCone* FormFactorCone::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorCone::accept "void FormFactorCone::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorCone::accept "void FormFactorCone::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorCone::getHeight "double FormFactorCone::getHeight() const
+%feature("docstring") FormFactorCone::getHeight "double FormFactorCone::getHeight() const
";
-%feature("docstring") FormFactorCone::getAlpha "double FormFactorCone::getAlpha() const
+%feature("docstring") FormFactorCone::getAlpha "double FormFactorCone::getAlpha() const
";
-%feature("docstring") FormFactorCone::getRadius "double FormFactorCone::getRadius() const
+%feature("docstring") FormFactorCone::getRadius "double FormFactorCone::getRadius() const
";
-%feature("docstring") FormFactorCone::radialExtension "double FormFactorCone::radialExtension() const overridefinal
+%feature("docstring") FormFactorCone::radialExtension "double FormFactorCone::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorCone::evaluate_for_q "complex_t FormFactorCone::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorCone::evaluate_for_q "complex_t FormFactorCone::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3045,23 +3045,23 @@ alpha:
dihedral angle in radians between base and facet
";
-%feature("docstring") FormFactorCone6::clone "FormFactorCone6* FormFactorCone6::clone() const overridefinal
+%feature("docstring") FormFactorCone6::clone "FormFactorCone6* FormFactorCone6::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorCone6::accept "void FormFactorCone6::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorCone6::accept "void FormFactorCone6::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorCone6::getBaseEdge "double FormFactorCone6::getBaseEdge() const
+%feature("docstring") FormFactorCone6::getBaseEdge "double FormFactorCone6::getBaseEdge() const
";
-%feature("docstring") FormFactorCone6::getHeight "double FormFactorCone6::getHeight() const
+%feature("docstring") FormFactorCone6::getHeight "double FormFactorCone6::getHeight() const
";
-%feature("docstring") FormFactorCone6::getAlpha "double FormFactorCone6::getAlpha() const
+%feature("docstring") FormFactorCone6::getAlpha "double FormFactorCone6::getAlpha() const
";
@@ -3078,45 +3078,45 @@ C++ includes: FormFactorCoreShell.h
%feature("docstring") FormFactorCoreShell::FormFactorCoreShell "FormFactorCoreShell::FormFactorCoreShell(IFormFactor *core, IFormFactor *shell)
";
-%feature("docstring") FormFactorCoreShell::~FormFactorCoreShell "FormFactorCoreShell::~FormFactorCoreShell() overridefinal
+%feature("docstring") FormFactorCoreShell::~FormFactorCoreShell "FormFactorCoreShell::~FormFactorCoreShell() override final
";
-%feature("docstring") FormFactorCoreShell::clone "FormFactorCoreShell * FormFactorCoreShell::clone() const overridefinal
+%feature("docstring") FormFactorCoreShell::clone "FormFactorCoreShell * FormFactorCoreShell::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorCoreShell::accept "void FormFactorCoreShell::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorCoreShell::accept "void FormFactorCoreShell::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorCoreShell::radialExtension "double FormFactorCoreShell::radialExtension() const overridefinal
+%feature("docstring") FormFactorCoreShell::radialExtension "double FormFactorCoreShell::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorCoreShell::bottomZ "double FormFactorCoreShell::bottomZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorCoreShell::bottomZ "double FormFactorCoreShell::bottomZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorCoreShell::topZ "double FormFactorCoreShell::topZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorCoreShell::topZ "double FormFactorCoreShell::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorCoreShell::setAmbientMaterial "void FormFactorCoreShell::setAmbientMaterial(Material material) overridefinal
+%feature("docstring") FormFactorCoreShell::setAmbientMaterial "void FormFactorCoreShell::setAmbientMaterial(Material material) override final
Passes the material in which this particle is embedded.
";
-%feature("docstring") FormFactorCoreShell::evaluate "complex_t FormFactorCoreShell::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorCoreShell::evaluate "complex_t FormFactorCoreShell::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
";
-%feature("docstring") FormFactorCoreShell::evaluatePol "Eigen::Matrix2cd FormFactorCoreShell::evaluatePol(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorCoreShell::evaluatePol "Eigen::Matrix2cd FormFactorCoreShell::evaluatePol(const WavevectorInfo &wavevectors) const override final
Calculates and returns a polarized form factor calculation in DWBA.
";
@@ -3133,15 +3133,15 @@ C++ includes: FormFactorCrystal.h
%feature("docstring") FormFactorCrystal::FormFactorCrystal "FormFactorCrystal::FormFactorCrystal(const Lattice &lattice, const IFormFactor &basis_form_factor, const IFormFactor &meso_form_factor)
";
-%feature("docstring") FormFactorCrystal::~FormFactorCrystal "FormFactorCrystal::~FormFactorCrystal() overridefinal
+%feature("docstring") FormFactorCrystal::~FormFactorCrystal "FormFactorCrystal::~FormFactorCrystal() override final
";
-%feature("docstring") FormFactorCrystal::clone "FormFactorCrystal* FormFactorCrystal::clone() const overridefinal
+%feature("docstring") FormFactorCrystal::clone "FormFactorCrystal* FormFactorCrystal::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorCrystal::accept "void FormFactorCrystal::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorCrystal::accept "void FormFactorCrystal::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
@@ -3151,12 +3151,12 @@ Calls the INodeVisitor's visit method.
Passes the material in which this particle is embedded.
";
-%feature("docstring") FormFactorCrystal::volume "double FormFactorCrystal::volume() const overridefinal
+%feature("docstring") FormFactorCrystal::volume "double FormFactorCrystal::volume() const override final
Returns the total volume of the particle of this form factor's shape.
";
-%feature("docstring") FormFactorCrystal::radialExtension "double FormFactorCrystal::radialExtension() const overridefinal
+%feature("docstring") FormFactorCrystal::radialExtension "double FormFactorCrystal::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
@@ -3166,17 +3166,17 @@ Returns the (approximate in some cases) radial size of the particle of this form
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorCrystal::topZ "double FormFactorCrystal::topZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorCrystal::topZ "double FormFactorCrystal::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorCrystal::evaluate "complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorCrystal::evaluate "complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
";
-%feature("docstring") FormFactorCrystal::evaluatePol "Eigen::Matrix2cd FormFactorCrystal::evaluatePol(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorCrystal::evaluatePol "Eigen::Matrix2cd FormFactorCrystal::evaluatePol(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for matrix interactions.
";
@@ -3210,26 +3210,26 @@ alpha:
dihedral angle in radians between base and facet
";
-%feature("docstring") FormFactorCuboctahedron::clone "FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const overridefinal
+%feature("docstring") FormFactorCuboctahedron::clone "FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorCuboctahedron::accept "void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorCuboctahedron::accept "void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorCuboctahedron::getLength "double FormFactorCuboctahedron::getLength() const
+%feature("docstring") FormFactorCuboctahedron::getLength "double FormFactorCuboctahedron::getLength() const
";
-%feature("docstring") FormFactorCuboctahedron::getHeight "double FormFactorCuboctahedron::getHeight() const
+%feature("docstring") FormFactorCuboctahedron::getHeight "double FormFactorCuboctahedron::getHeight() const
";
-%feature("docstring") FormFactorCuboctahedron::getHeightRatio "double FormFactorCuboctahedron::getHeightRatio() const
+%feature("docstring") FormFactorCuboctahedron::getHeightRatio "double FormFactorCuboctahedron::getHeightRatio() const
";
-%feature("docstring") FormFactorCuboctahedron::getAlpha "double FormFactorCuboctahedron::getAlpha() const
+%feature("docstring") FormFactorCuboctahedron::getAlpha "double FormFactorCuboctahedron::getAlpha() const
";
@@ -3255,28 +3255,28 @@ height:
height of the cylinder in nanometers
";
-%feature("docstring") FormFactorCylinder::clone "FormFactorCylinder* FormFactorCylinder::clone() const overridefinal
+%feature("docstring") FormFactorCylinder::clone "FormFactorCylinder* FormFactorCylinder::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorCylinder::accept "void FormFactorCylinder::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorCylinder::accept "void FormFactorCylinder::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorCylinder::getHeight "double FormFactorCylinder::getHeight() const
+%feature("docstring") FormFactorCylinder::getHeight "double FormFactorCylinder::getHeight() const
";
-%feature("docstring") FormFactorCylinder::getRadius "double FormFactorCylinder::getRadius() const
+%feature("docstring") FormFactorCylinder::getRadius "double FormFactorCylinder::getRadius() const
";
-%feature("docstring") FormFactorCylinder::radialExtension "double FormFactorCylinder::radialExtension() const overridefinal
+%feature("docstring") FormFactorCylinder::radialExtension "double FormFactorCylinder::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorCylinder::evaluate_for_q "complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorCylinder::evaluate_for_q "complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3300,22 +3300,22 @@ Anisotropic Debye-Waller factor.
Isotropic Debye-Waller factor.
";
-%feature("docstring") FormFactorDecoratorDebyeWaller::clone "FormFactorDecoratorDebyeWaller* FormFactorDecoratorDebyeWaller::clone() const overridefinal
+%feature("docstring") FormFactorDecoratorDebyeWaller::clone "FormFactorDecoratorDebyeWaller* FormFactorDecoratorDebyeWaller::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorDecoratorDebyeWaller::accept "void FormFactorDecoratorDebyeWaller::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorDecoratorDebyeWaller::accept "void FormFactorDecoratorDebyeWaller::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorDecoratorDebyeWaller::evaluate "complex_t FormFactorDecoratorDebyeWaller::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorDecoratorDebyeWaller::evaluate "complex_t FormFactorDecoratorDebyeWaller::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
";
-%feature("docstring") FormFactorDecoratorDebyeWaller::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorDebyeWaller::evaluatePol(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorDecoratorDebyeWaller::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorDebyeWaller::evaluatePol(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for matrix interactions.
";
@@ -3332,15 +3332,15 @@ C++ includes: FormFactorDecoratorMaterial.h
%feature("docstring") FormFactorDecoratorMaterial::FormFactorDecoratorMaterial "FormFactorDecoratorMaterial::FormFactorDecoratorMaterial(const IFormFactor &form_factor)
";
-%feature("docstring") FormFactorDecoratorMaterial::~FormFactorDecoratorMaterial "FormFactorDecoratorMaterial::~FormFactorDecoratorMaterial() overridefinal
+%feature("docstring") FormFactorDecoratorMaterial::~FormFactorDecoratorMaterial "FormFactorDecoratorMaterial::~FormFactorDecoratorMaterial() override final
";
-%feature("docstring") FormFactorDecoratorMaterial::clone "FormFactorDecoratorMaterial * FormFactorDecoratorMaterial::clone() const overridefinal
+%feature("docstring") FormFactorDecoratorMaterial::clone "FormFactorDecoratorMaterial * FormFactorDecoratorMaterial::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorDecoratorMaterial::accept "void FormFactorDecoratorMaterial::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorDecoratorMaterial::accept "void FormFactorDecoratorMaterial::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
@@ -3360,7 +3360,7 @@ Sets the ambient material.
Returns scattering amplitude for complex wavevectors ki, kf.
";
-%feature("docstring") FormFactorDecoratorMaterial::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorMaterial::evaluatePol(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorDecoratorMaterial::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorMaterial::evaluatePol(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for matrix interactions.
";
@@ -3377,32 +3377,32 @@ C++ includes: FormFactorDecoratorPositionFactor.h
%feature("docstring") FormFactorDecoratorPositionFactor::FormFactorDecoratorPositionFactor "FormFactorDecoratorPositionFactor::FormFactorDecoratorPositionFactor(const IFormFactor &form_factor, const kvector_t &position)
";
-%feature("docstring") FormFactorDecoratorPositionFactor::clone "FormFactorDecoratorPositionFactor* FormFactorDecoratorPositionFactor::clone() const overridefinal
+%feature("docstring") FormFactorDecoratorPositionFactor::clone "FormFactorDecoratorPositionFactor* FormFactorDecoratorPositionFactor::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorDecoratorPositionFactor::accept "void FormFactorDecoratorPositionFactor::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorDecoratorPositionFactor::accept "void FormFactorDecoratorPositionFactor::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorDecoratorPositionFactor::bottomZ "double FormFactorDecoratorPositionFactor::bottomZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorDecoratorPositionFactor::bottomZ "double FormFactorDecoratorPositionFactor::bottomZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorDecoratorPositionFactor::topZ "double FormFactorDecoratorPositionFactor::topZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorDecoratorPositionFactor::topZ "double FormFactorDecoratorPositionFactor::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorDecoratorPositionFactor::evaluate "complex_t FormFactorDecoratorPositionFactor::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorDecoratorPositionFactor::evaluate "complex_t FormFactorDecoratorPositionFactor::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
";
-%feature("docstring") FormFactorDecoratorPositionFactor::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorPositionFactor::evaluatePol(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorDecoratorPositionFactor::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorPositionFactor::evaluatePol(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for matrix interactions.
";
@@ -3421,32 +3421,32 @@ C++ includes: FormFactorDecoratorRotation.h
Constructor, setting form factor and rotation.
";
-%feature("docstring") FormFactorDecoratorRotation::clone "FormFactorDecoratorRotation * FormFactorDecoratorRotation::clone() const overridefinal
+%feature("docstring") FormFactorDecoratorRotation::clone "FormFactorDecoratorRotation * FormFactorDecoratorRotation::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorDecoratorRotation::accept "void FormFactorDecoratorRotation::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorDecoratorRotation::accept "void FormFactorDecoratorRotation::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorDecoratorRotation::bottomZ "double FormFactorDecoratorRotation::bottomZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorDecoratorRotation::bottomZ "double FormFactorDecoratorRotation::bottomZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorDecoratorRotation::topZ "double FormFactorDecoratorRotation::topZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorDecoratorRotation::topZ "double FormFactorDecoratorRotation::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorDecoratorRotation::evaluate "complex_t FormFactorDecoratorRotation::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorDecoratorRotation::evaluate "complex_t FormFactorDecoratorRotation::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
";
-%feature("docstring") FormFactorDecoratorRotation::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorRotation::evaluatePol(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorDecoratorRotation::evaluatePol "Eigen::Matrix2cd FormFactorDecoratorRotation::evaluatePol(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for matrix interactions.
";
@@ -3479,17 +3479,17 @@ edge:
length of the edge in nanometers
";
-%feature("docstring") FormFactorDodecahedron::clone "FormFactorDodecahedron* FormFactorDodecahedron::clone() const overridefinal
+%feature("docstring") FormFactorDodecahedron::clone "FormFactorDodecahedron* FormFactorDodecahedron::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorDodecahedron::accept "void FormFactorDodecahedron::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorDodecahedron::accept "void FormFactorDodecahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorDodecahedron::getEdge "double FormFactorDodecahedron::getEdge() const
+%feature("docstring") FormFactorDodecahedron::getEdge "double FormFactorDodecahedron::getEdge() const
";
@@ -3504,22 +3504,22 @@ C++ includes: FormFactorDot.h
%feature("docstring") FormFactorDot::FormFactorDot "FormFactorDot::FormFactorDot()
";
-%feature("docstring") FormFactorDot::clone "FormFactorDot* FormFactorDot::clone() const overridefinal
+%feature("docstring") FormFactorDot::clone "FormFactorDot* FormFactorDot::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorDot::accept "void FormFactorDot::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorDot::accept "void FormFactorDot::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorDot::radialExtension "double FormFactorDot::radialExtension() const overridefinal
+%feature("docstring") FormFactorDot::radialExtension "double FormFactorDot::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorDot::evaluate_for_q "complex_t FormFactorDot::evaluate_for_q(cvector_t) const overridefinal
+%feature("docstring") FormFactorDot::evaluate_for_q "complex_t FormFactorDot::evaluate_for_q(cvector_t) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3675,31 +3675,31 @@ height:
height of the ellipsoidal cylinder in nanometers
";
-%feature("docstring") FormFactorEllipsoidalCylinder::clone "FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const overridefinal
+%feature("docstring") FormFactorEllipsoidalCylinder::clone "FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorEllipsoidalCylinder::accept "void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorEllipsoidalCylinder::accept "void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorEllipsoidalCylinder::getRadiusX "double FormFactorEllipsoidalCylinder::getRadiusX() const
+%feature("docstring") FormFactorEllipsoidalCylinder::getRadiusX "double FormFactorEllipsoidalCylinder::getRadiusX() const
";
-%feature("docstring") FormFactorEllipsoidalCylinder::getRadiusY "double FormFactorEllipsoidalCylinder::getRadiusY() const
+%feature("docstring") FormFactorEllipsoidalCylinder::getRadiusY "double FormFactorEllipsoidalCylinder::getRadiusY() const
";
-%feature("docstring") FormFactorEllipsoidalCylinder::getHeight "double FormFactorEllipsoidalCylinder::getHeight() const
+%feature("docstring") FormFactorEllipsoidalCylinder::getHeight "double FormFactorEllipsoidalCylinder::getHeight() const
";
-%feature("docstring") FormFactorEllipsoidalCylinder::radialExtension "double FormFactorEllipsoidalCylinder::radialExtension() const overridefinal
+%feature("docstring") FormFactorEllipsoidalCylinder::radialExtension "double FormFactorEllipsoidalCylinder::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorEllipsoidalCylinder::evaluate_for_q "complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorEllipsoidalCylinder::evaluate_for_q "complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3724,35 +3724,35 @@ radius:
radius of the sphere in nanometers
";
-%feature("docstring") FormFactorFullSphere::clone "FormFactorFullSphere* FormFactorFullSphere::clone() const overridefinal
+%feature("docstring") FormFactorFullSphere::clone "FormFactorFullSphere* FormFactorFullSphere::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorFullSphere::accept "void FormFactorFullSphere::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorFullSphere::accept "void FormFactorFullSphere::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorFullSphere::getRadius "double FormFactorFullSphere::getRadius() const
+%feature("docstring") FormFactorFullSphere::getRadius "double FormFactorFullSphere::getRadius() const
";
-%feature("docstring") FormFactorFullSphere::radialExtension "double FormFactorFullSphere::radialExtension() const overridefinal
+%feature("docstring") FormFactorFullSphere::radialExtension "double FormFactorFullSphere::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorFullSphere::bottomZ "double FormFactorFullSphere::bottomZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorFullSphere::bottomZ "double FormFactorFullSphere::bottomZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorFullSphere::topZ "double FormFactorFullSphere::topZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorFullSphere::topZ "double FormFactorFullSphere::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorFullSphere::evaluate_for_q "complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorFullSphere::evaluate_for_q "complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3780,28 +3780,28 @@ height:
height of the full spheroid in nanometers
";
-%feature("docstring") FormFactorFullSpheroid::clone "FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const overridefinal
+%feature("docstring") FormFactorFullSpheroid::clone "FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorFullSpheroid::accept "void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorFullSpheroid::accept "void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorFullSpheroid::getHeight "double FormFactorFullSpheroid::getHeight() const
+%feature("docstring") FormFactorFullSpheroid::getHeight "double FormFactorFullSpheroid::getHeight() const
";
-%feature("docstring") FormFactorFullSpheroid::getRadius "double FormFactorFullSpheroid::getRadius() const
+%feature("docstring") FormFactorFullSpheroid::getRadius "double FormFactorFullSpheroid::getRadius() const
";
-%feature("docstring") FormFactorFullSpheroid::radialExtension "double FormFactorFullSpheroid::radialExtension() const overridefinal
+%feature("docstring") FormFactorFullSpheroid::radialExtension "double FormFactorFullSpheroid::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorFullSpheroid::evaluate_for_q "complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorFullSpheroid::evaluate_for_q "complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3821,28 +3821,28 @@ C++ includes: FormFactorGauss.h
%feature("docstring") FormFactorGauss::FormFactorGauss "FormFactorGauss::FormFactorGauss(double width, double height)
";
-%feature("docstring") FormFactorGauss::clone "FormFactorGauss* FormFactorGauss::clone() const overridefinal
+%feature("docstring") FormFactorGauss::clone "FormFactorGauss* FormFactorGauss::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorGauss::accept "void FormFactorGauss::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorGauss::accept "void FormFactorGauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorGauss::getWidth "double FormFactorGauss::getWidth() const
+%feature("docstring") FormFactorGauss::getWidth "double FormFactorGauss::getWidth() const
";
-%feature("docstring") FormFactorGauss::getHeight "double FormFactorGauss::getHeight() const
+%feature("docstring") FormFactorGauss::getHeight "double FormFactorGauss::getHeight() const
";
-%feature("docstring") FormFactorGauss::radialExtension "double FormFactorGauss::radialExtension() const overridefinal
+%feature("docstring") FormFactorGauss::radialExtension "double FormFactorGauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorGauss::evaluate_for_q "complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorGauss::evaluate_for_q "complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3876,31 +3876,31 @@ height of the hemi ellipsoid in nanometers
%feature("docstring") FormFactorHemiEllipsoid::~FormFactorHemiEllipsoid "virtual FormFactorHemiEllipsoid::~FormFactorHemiEllipsoid()
";
-%feature("docstring") FormFactorHemiEllipsoid::clone "FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const overridefinal
+%feature("docstring") FormFactorHemiEllipsoid::clone "FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorHemiEllipsoid::accept "void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorHemiEllipsoid::accept "void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorHemiEllipsoid::getHeight "double FormFactorHemiEllipsoid::getHeight() const
+%feature("docstring") FormFactorHemiEllipsoid::getHeight "double FormFactorHemiEllipsoid::getHeight() const
";
-%feature("docstring") FormFactorHemiEllipsoid::getRadiusX "double FormFactorHemiEllipsoid::getRadiusX() const
+%feature("docstring") FormFactorHemiEllipsoid::getRadiusX "double FormFactorHemiEllipsoid::getRadiusX() const
";
-%feature("docstring") FormFactorHemiEllipsoid::getRadiusY "double FormFactorHemiEllipsoid::getRadiusY() const
+%feature("docstring") FormFactorHemiEllipsoid::getRadiusY "double FormFactorHemiEllipsoid::getRadiusY() const
";
-%feature("docstring") FormFactorHemiEllipsoid::radialExtension "double FormFactorHemiEllipsoid::radialExtension() const overridefinal
+%feature("docstring") FormFactorHemiEllipsoid::radialExtension "double FormFactorHemiEllipsoid::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorHemiEllipsoid::evaluate_for_q "complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorHemiEllipsoid::evaluate_for_q "complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -3925,17 +3925,17 @@ edge:
length of the edge in nanometers
";
-%feature("docstring") FormFactorIcosahedron::clone "FormFactorIcosahedron* FormFactorIcosahedron::clone() const overridefinal
+%feature("docstring") FormFactorIcosahedron::clone "FormFactorIcosahedron* FormFactorIcosahedron::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorIcosahedron::accept "void FormFactorIcosahedron::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorIcosahedron::accept "void FormFactorIcosahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorIcosahedron::getEdge "double FormFactorIcosahedron::getEdge() const
+%feature("docstring") FormFactorIcosahedron::getEdge "double FormFactorIcosahedron::getEdge() const
";
@@ -3964,31 +3964,31 @@ height:
of Box
";
-%feature("docstring") FormFactorLongBoxGauss::clone "FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const overridefinal
+%feature("docstring") FormFactorLongBoxGauss::clone "FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorLongBoxGauss::accept "void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorLongBoxGauss::accept "void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorLongBoxGauss::getLength "double FormFactorLongBoxGauss::getLength() const
+%feature("docstring") FormFactorLongBoxGauss::getLength "double FormFactorLongBoxGauss::getLength() const
";
-%feature("docstring") FormFactorLongBoxGauss::getHeight "double FormFactorLongBoxGauss::getHeight() const
+%feature("docstring") FormFactorLongBoxGauss::getHeight "double FormFactorLongBoxGauss::getHeight() const
";
-%feature("docstring") FormFactorLongBoxGauss::getWidth "double FormFactorLongBoxGauss::getWidth() const
+%feature("docstring") FormFactorLongBoxGauss::getWidth "double FormFactorLongBoxGauss::getWidth() const
";
-%feature("docstring") FormFactorLongBoxGauss::radialExtension "double FormFactorLongBoxGauss::radialExtension() const overridefinal
+%feature("docstring") FormFactorLongBoxGauss::radialExtension "double FormFactorLongBoxGauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorLongBoxGauss::evaluate_for_q "complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorLongBoxGauss::evaluate_for_q "complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4019,31 +4019,31 @@ height:
of Box
";
-%feature("docstring") FormFactorLongBoxLorentz::clone "FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const overridefinal
+%feature("docstring") FormFactorLongBoxLorentz::clone "FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorLongBoxLorentz::accept "void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorLongBoxLorentz::accept "void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorLongBoxLorentz::getLength "double FormFactorLongBoxLorentz::getLength() const
+%feature("docstring") FormFactorLongBoxLorentz::getLength "double FormFactorLongBoxLorentz::getLength() const
";
-%feature("docstring") FormFactorLongBoxLorentz::getHeight "double FormFactorLongBoxLorentz::getHeight() const
+%feature("docstring") FormFactorLongBoxLorentz::getHeight "double FormFactorLongBoxLorentz::getHeight() const
";
-%feature("docstring") FormFactorLongBoxLorentz::getWidth "double FormFactorLongBoxLorentz::getWidth() const
+%feature("docstring") FormFactorLongBoxLorentz::getWidth "double FormFactorLongBoxLorentz::getWidth() const
";
-%feature("docstring") FormFactorLongBoxLorentz::radialExtension "double FormFactorLongBoxLorentz::radialExtension() const overridefinal
+%feature("docstring") FormFactorLongBoxLorentz::radialExtension "double FormFactorLongBoxLorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorLongBoxLorentz::evaluate_for_q "complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorLongBoxLorentz::evaluate_for_q "complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4074,31 +4074,31 @@ height:
of cosine cross section
";
-%feature("docstring") FormFactorLongRipple1Gauss::clone "FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const overridefinal
+%feature("docstring") FormFactorLongRipple1Gauss::clone "FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorLongRipple1Gauss::accept "void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorLongRipple1Gauss::accept "void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorLongRipple1Gauss::getHeight "double FormFactorLongRipple1Gauss::getHeight() const
+%feature("docstring") FormFactorLongRipple1Gauss::getHeight "double FormFactorLongRipple1Gauss::getHeight() const
";
-%feature("docstring") FormFactorLongRipple1Gauss::getWidth "double FormFactorLongRipple1Gauss::getWidth() const
+%feature("docstring") FormFactorLongRipple1Gauss::getWidth "double FormFactorLongRipple1Gauss::getWidth() const
";
-%feature("docstring") FormFactorLongRipple1Gauss::getLength "double FormFactorLongRipple1Gauss::getLength() const
+%feature("docstring") FormFactorLongRipple1Gauss::getLength "double FormFactorLongRipple1Gauss::getLength() const
";
-%feature("docstring") FormFactorLongRipple1Gauss::radialExtension "double FormFactorLongRipple1Gauss::radialExtension() const overridefinal
+%feature("docstring") FormFactorLongRipple1Gauss::radialExtension "double FormFactorLongRipple1Gauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorLongRipple1Gauss::evaluate_for_q "complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorLongRipple1Gauss::evaluate_for_q "complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
";
@@ -4129,31 +4129,31 @@ height:
of cosine cross section
";
-%feature("docstring") FormFactorLongRipple1Lorentz::clone "FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const overridefinal
+%feature("docstring") FormFactorLongRipple1Lorentz::clone "FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorLongRipple1Lorentz::accept "void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorLongRipple1Lorentz::accept "void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorLongRipple1Lorentz::radialExtension "double FormFactorLongRipple1Lorentz::radialExtension() const overridefinal
+%feature("docstring") FormFactorLongRipple1Lorentz::radialExtension "double FormFactorLongRipple1Lorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorLongRipple1Lorentz::getHeight "double FormFactorLongRipple1Lorentz::getHeight() const
+%feature("docstring") FormFactorLongRipple1Lorentz::getHeight "double FormFactorLongRipple1Lorentz::getHeight() const
";
-%feature("docstring") FormFactorLongRipple1Lorentz::getWidth "double FormFactorLongRipple1Lorentz::getWidth() const
+%feature("docstring") FormFactorLongRipple1Lorentz::getWidth "double FormFactorLongRipple1Lorentz::getWidth() const
";
-%feature("docstring") FormFactorLongRipple1Lorentz::getLength "double FormFactorLongRipple1Lorentz::getLength() const
+%feature("docstring") FormFactorLongRipple1Lorentz::getLength "double FormFactorLongRipple1Lorentz::getLength() const
";
-%feature("docstring") FormFactorLongRipple1Lorentz::evaluate_for_q "complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorLongRipple1Lorentz::evaluate_for_q "complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
";
@@ -4187,34 +4187,34 @@ asymmetry:
length of triangular cross section
";
-%feature("docstring") FormFactorLongRipple2Gauss::clone "FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const overridefinal
+%feature("docstring") FormFactorLongRipple2Gauss::clone "FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorLongRipple2Gauss::accept "void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorLongRipple2Gauss::accept "void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorLongRipple2Gauss::getHeight "double FormFactorLongRipple2Gauss::getHeight() const
+%feature("docstring") FormFactorLongRipple2Gauss::getHeight "double FormFactorLongRipple2Gauss::getHeight() const
";
-%feature("docstring") FormFactorLongRipple2Gauss::getWidth "double FormFactorLongRipple2Gauss::getWidth() const
+%feature("docstring") FormFactorLongRipple2Gauss::getWidth "double FormFactorLongRipple2Gauss::getWidth() const
";
-%feature("docstring") FormFactorLongRipple2Gauss::getLength "double FormFactorLongRipple2Gauss::getLength() const
+%feature("docstring") FormFactorLongRipple2Gauss::getLength "double FormFactorLongRipple2Gauss::getLength() const
";
-%feature("docstring") FormFactorLongRipple2Gauss::getAsymmetry "double FormFactorLongRipple2Gauss::getAsymmetry() const
+%feature("docstring") FormFactorLongRipple2Gauss::getAsymmetry "double FormFactorLongRipple2Gauss::getAsymmetry() const
";
-%feature("docstring") FormFactorLongRipple2Gauss::radialExtension "double FormFactorLongRipple2Gauss::radialExtension() const overridefinal
+%feature("docstring") FormFactorLongRipple2Gauss::radialExtension "double FormFactorLongRipple2Gauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorLongRipple2Gauss::evaluate_for_q "complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorLongRipple2Gauss::evaluate_for_q "complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
";
@@ -4246,34 +4246,34 @@ asymmetry:
length of triangular cross section
";
-%feature("docstring") FormFactorLongRipple2Lorentz::clone "FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const overridefinal
+%feature("docstring") FormFactorLongRipple2Lorentz::clone "FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorLongRipple2Lorentz::accept "void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorLongRipple2Lorentz::accept "void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorLongRipple2Lorentz::getHeight "double FormFactorLongRipple2Lorentz::getHeight() const
+%feature("docstring") FormFactorLongRipple2Lorentz::getHeight "double FormFactorLongRipple2Lorentz::getHeight() const
";
-%feature("docstring") FormFactorLongRipple2Lorentz::getWidth "double FormFactorLongRipple2Lorentz::getWidth() const
+%feature("docstring") FormFactorLongRipple2Lorentz::getWidth "double FormFactorLongRipple2Lorentz::getWidth() const
";
-%feature("docstring") FormFactorLongRipple2Lorentz::getLength "double FormFactorLongRipple2Lorentz::getLength() const
+%feature("docstring") FormFactorLongRipple2Lorentz::getLength "double FormFactorLongRipple2Lorentz::getLength() const
";
-%feature("docstring") FormFactorLongRipple2Lorentz::getAsymmetry "double FormFactorLongRipple2Lorentz::getAsymmetry() const
+%feature("docstring") FormFactorLongRipple2Lorentz::getAsymmetry "double FormFactorLongRipple2Lorentz::getAsymmetry() const
";
-%feature("docstring") FormFactorLongRipple2Lorentz::radialExtension "double FormFactorLongRipple2Lorentz::radialExtension() const overridefinal
+%feature("docstring") FormFactorLongRipple2Lorentz::radialExtension "double FormFactorLongRipple2Lorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorLongRipple2Lorentz::evaluate_for_q "complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorLongRipple2Lorentz::evaluate_for_q "complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
";
@@ -4293,28 +4293,28 @@ C++ includes: FormFactorLorentz.h
%feature("docstring") FormFactorLorentz::FormFactorLorentz "FormFactorLorentz::FormFactorLorentz(double width, double height)
";
-%feature("docstring") FormFactorLorentz::clone "FormFactorLorentz* FormFactorLorentz::clone() const overridefinal
+%feature("docstring") FormFactorLorentz::clone "FormFactorLorentz* FormFactorLorentz::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorLorentz::accept "void FormFactorLorentz::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorLorentz::accept "void FormFactorLorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorLorentz::getWidth "double FormFactorLorentz::getWidth() const
+%feature("docstring") FormFactorLorentz::getWidth "double FormFactorLorentz::getWidth() const
";
-%feature("docstring") FormFactorLorentz::getHeight "double FormFactorLorentz::getHeight() const
+%feature("docstring") FormFactorLorentz::getHeight "double FormFactorLorentz::getHeight() const
";
-%feature("docstring") FormFactorLorentz::radialExtension "double FormFactorLorentz::radialExtension() const overridefinal
+%feature("docstring") FormFactorLorentz::radialExtension "double FormFactorLorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorLorentz::evaluate_for_q "complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorLorentz::evaluate_for_q "complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4331,20 +4331,20 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") FormFactorPolygonalPrism::FormFactorPolygonalPrism "FormFactorPolygonalPrism::FormFactorPolygonalPrism(double height)
";
-%feature("docstring") FormFactorPolygonalPrism::evaluate_for_q "complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorPolygonalPrism::evaluate_for_q "complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const override final
Returns the form factor F(q) of this polyhedron, respecting the offset height/2.
";
-%feature("docstring") FormFactorPolygonalPrism::volume "double FormFactorPolygonalPrism::volume() const overridefinal
+%feature("docstring") FormFactorPolygonalPrism::volume "double FormFactorPolygonalPrism::volume() const override final
Returns the volume of this prism.
";
-%feature("docstring") FormFactorPolygonalPrism::getHeight "double FormFactorPolygonalPrism::getHeight() const
+%feature("docstring") FormFactorPolygonalPrism::getHeight "double FormFactorPolygonalPrism::getHeight() const
";
-%feature("docstring") FormFactorPolygonalPrism::radialExtension "double FormFactorPolygonalPrism::radialExtension() const overridefinal
+%feature("docstring") FormFactorPolygonalPrism::radialExtension "double FormFactorPolygonalPrism::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
@@ -4361,7 +4361,7 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") FormFactorPolygonalSurface::FormFactorPolygonalSurface "FormFactorPolygonalSurface::FormFactorPolygonalSurface()
";
-%feature("docstring") FormFactorPolygonalSurface::evaluate_for_q "complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorPolygonalSurface::evaluate_for_q "complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4371,7 +4371,7 @@ Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This m
Returns the total volume of the particle of this form factor's shape.
";
-%feature("docstring") FormFactorPolygonalSurface::radialExtension "double FormFactorPolygonalSurface::radialExtension() const overridefinal
+%feature("docstring") FormFactorPolygonalSurface::radialExtension "double FormFactorPolygonalSurface::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
@@ -4388,7 +4388,7 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") FormFactorPolyhedron::FormFactorPolyhedron "FormFactorPolyhedron::FormFactorPolyhedron()
";
-%feature("docstring") FormFactorPolyhedron::evaluate_for_q "complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorPolyhedron::evaluate_for_q "complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const override final
Returns the form factor F(q) of this polyhedron, respecting the offset z_origin.
";
@@ -4398,12 +4398,12 @@ Returns the form factor F(q) of this polyhedron, respecting the offset z_origin.
Returns the form factor F(q) of this polyhedron, with origin at z=0.
";
-%feature("docstring") FormFactorPolyhedron::volume "double FormFactorPolyhedron::volume() const overridefinal
+%feature("docstring") FormFactorPolyhedron::volume "double FormFactorPolyhedron::volume() const override final
Returns the total volume of the particle of this form factor's shape.
";
-%feature("docstring") FormFactorPolyhedron::radialExtension "double FormFactorPolyhedron::radialExtension() const overridefinal
+%feature("docstring") FormFactorPolyhedron::radialExtension "double FormFactorPolyhedron::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
@@ -4436,17 +4436,17 @@ height:
height in nanometers
";
-%feature("docstring") FormFactorPrism3::clone "FormFactorPrism3* FormFactorPrism3::clone() const overridefinal
+%feature("docstring") FormFactorPrism3::clone "FormFactorPrism3* FormFactorPrism3::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorPrism3::accept "void FormFactorPrism3::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorPrism3::accept "void FormFactorPrism3::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorPrism3::getBaseEdge "double FormFactorPrism3::getBaseEdge() const
+%feature("docstring") FormFactorPrism3::getBaseEdge "double FormFactorPrism3::getBaseEdge() const
";
@@ -4472,17 +4472,17 @@ height:
height in nanometers
";
-%feature("docstring") FormFactorPrism6::clone "FormFactorPrism6* FormFactorPrism6::clone() const overridefinal
+%feature("docstring") FormFactorPrism6::clone "FormFactorPrism6* FormFactorPrism6::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorPrism6::accept "void FormFactorPrism6::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorPrism6::accept "void FormFactorPrism6::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorPrism6::getBaseEdge "double FormFactorPrism6::getBaseEdge() const
+%feature("docstring") FormFactorPrism6::getBaseEdge "double FormFactorPrism6::getBaseEdge() const
";
@@ -4511,23 +4511,23 @@ alpha:
dihedral angle between the base and a side face in radians
";
-%feature("docstring") FormFactorPyramid::clone "FormFactorPyramid* FormFactorPyramid::clone() const overridefinal
+%feature("docstring") FormFactorPyramid::clone "FormFactorPyramid* FormFactorPyramid::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorPyramid::accept "void FormFactorPyramid::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorPyramid::accept "void FormFactorPyramid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorPyramid::getHeight "double FormFactorPyramid::getHeight() const
+%feature("docstring") FormFactorPyramid::getHeight "double FormFactorPyramid::getHeight() const
";
-%feature("docstring") FormFactorPyramid::getBaseEdge "double FormFactorPyramid::getBaseEdge() const
+%feature("docstring") FormFactorPyramid::getBaseEdge "double FormFactorPyramid::getBaseEdge() const
";
-%feature("docstring") FormFactorPyramid::getAlpha "double FormFactorPyramid::getAlpha() const
+%feature("docstring") FormFactorPyramid::getAlpha "double FormFactorPyramid::getAlpha() const
";
@@ -4556,31 +4556,31 @@ height:
height of the ripple in nanometers
";
-%feature("docstring") FormFactorRipple1::clone "FormFactorRipple1* FormFactorRipple1::clone() const overridefinal
+%feature("docstring") FormFactorRipple1::clone "FormFactorRipple1* FormFactorRipple1::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorRipple1::accept "void FormFactorRipple1::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorRipple1::accept "void FormFactorRipple1::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorRipple1::getLength "double FormFactorRipple1::getLength() const
+%feature("docstring") FormFactorRipple1::getLength "double FormFactorRipple1::getLength() const
";
-%feature("docstring") FormFactorRipple1::getHeight "double FormFactorRipple1::getHeight() const
+%feature("docstring") FormFactorRipple1::getHeight "double FormFactorRipple1::getHeight() const
";
-%feature("docstring") FormFactorRipple1::getWidth "double FormFactorRipple1::getWidth() const
+%feature("docstring") FormFactorRipple1::getWidth "double FormFactorRipple1::getWidth() const
";
-%feature("docstring") FormFactorRipple1::radialExtension "double FormFactorRipple1::radialExtension() const overridefinal
+%feature("docstring") FormFactorRipple1::radialExtension "double FormFactorRipple1::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorRipple1::evaluate_for_q "complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorRipple1::evaluate_for_q "complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
";
@@ -4614,34 +4614,34 @@ asymmetry:
asymmetry length of the triangular profile in nanometers
";
-%feature("docstring") FormFactorRipple2::clone "FormFactorRipple2* FormFactorRipple2::clone() const overridefinal
+%feature("docstring") FormFactorRipple2::clone "FormFactorRipple2* FormFactorRipple2::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorRipple2::accept "void FormFactorRipple2::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorRipple2::accept "void FormFactorRipple2::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorRipple2::getHeight "double FormFactorRipple2::getHeight() const
+%feature("docstring") FormFactorRipple2::getHeight "double FormFactorRipple2::getHeight() const
";
-%feature("docstring") FormFactorRipple2::getWidth "double FormFactorRipple2::getWidth() const
+%feature("docstring") FormFactorRipple2::getWidth "double FormFactorRipple2::getWidth() const
";
-%feature("docstring") FormFactorRipple2::getLength "double FormFactorRipple2::getLength() const
+%feature("docstring") FormFactorRipple2::getLength "double FormFactorRipple2::getLength() const
";
-%feature("docstring") FormFactorRipple2::getAsymmetry "double FormFactorRipple2::getAsymmetry() const
+%feature("docstring") FormFactorRipple2::getAsymmetry "double FormFactorRipple2::getAsymmetry() const
";
-%feature("docstring") FormFactorRipple2::radialExtension "double FormFactorRipple2::radialExtension() const overridefinal
+%feature("docstring") FormFactorRipple2::radialExtension "double FormFactorRipple2::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorRipple2::evaluate_for_q "complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorRipple2::evaluate_for_q "complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
";
@@ -4658,22 +4658,22 @@ C++ includes: FormFactorSphereGaussianRadius.h
%feature("docstring") FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius "FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)
";
-%feature("docstring") FormFactorSphereGaussianRadius::clone "FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const overridefinal
+%feature("docstring") FormFactorSphereGaussianRadius::clone "FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorSphereGaussianRadius::accept "void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorSphereGaussianRadius::accept "void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorSphereGaussianRadius::radialExtension "double FormFactorSphereGaussianRadius::radialExtension() const overridefinal
+%feature("docstring") FormFactorSphereGaussianRadius::radialExtension "double FormFactorSphereGaussianRadius::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorSphereGaussianRadius::evaluate_for_q "complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorSphereGaussianRadius::evaluate_for_q "complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4690,22 +4690,22 @@ C++ includes: FormFactorSphereLogNormalRadius.h
%feature("docstring") FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius "FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples)
";
-%feature("docstring") FormFactorSphereLogNormalRadius::clone "FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const overridefinal
+%feature("docstring") FormFactorSphereLogNormalRadius::clone "FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorSphereLogNormalRadius::accept "void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorSphereLogNormalRadius::accept "void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorSphereLogNormalRadius::radialExtension "double FormFactorSphereLogNormalRadius::radialExtension() const overridefinal
+%feature("docstring") FormFactorSphereLogNormalRadius::radialExtension "double FormFactorSphereLogNormalRadius::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorSphereLogNormalRadius::evaluate_for_q "complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorSphereLogNormalRadius::evaluate_for_q "complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4722,22 +4722,22 @@ C++ includes: FormFactorSphereUniformRadius.h
%feature("docstring") FormFactorSphereUniformRadius::FormFactorSphereUniformRadius "FormFactorSphereUniformRadius::FormFactorSphereUniformRadius(double mean, double full_width)
";
-%feature("docstring") FormFactorSphereUniformRadius::clone "FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const overridefinal
+%feature("docstring") FormFactorSphereUniformRadius::clone "FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorSphereUniformRadius::accept "void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorSphereUniformRadius::accept "void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorSphereUniformRadius::radialExtension "double FormFactorSphereUniformRadius::radialExtension() const overridefinal
+%feature("docstring") FormFactorSphereUniformRadius::radialExtension "double FormFactorSphereUniformRadius::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorSphereUniformRadius::evaluate_for_q "complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorSphereUniformRadius::evaluate_for_q "complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4768,23 +4768,23 @@ alpha:
dihedral angle in radians between base and facet
";
-%feature("docstring") FormFactorTetrahedron::clone "FormFactorTetrahedron* FormFactorTetrahedron::clone() const overridefinal
+%feature("docstring") FormFactorTetrahedron::clone "FormFactorTetrahedron* FormFactorTetrahedron::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorTetrahedron::accept "void FormFactorTetrahedron::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorTetrahedron::accept "void FormFactorTetrahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorTetrahedron::getBaseEdge "double FormFactorTetrahedron::getBaseEdge() const
+%feature("docstring") FormFactorTetrahedron::getBaseEdge "double FormFactorTetrahedron::getBaseEdge() const
";
-%feature("docstring") FormFactorTetrahedron::getHeight "double FormFactorTetrahedron::getHeight() const
+%feature("docstring") FormFactorTetrahedron::getHeight "double FormFactorTetrahedron::getHeight() const
";
-%feature("docstring") FormFactorTetrahedron::getAlpha "double FormFactorTetrahedron::getAlpha() const
+%feature("docstring") FormFactorTetrahedron::getAlpha "double FormFactorTetrahedron::getAlpha() const
";
@@ -4799,17 +4799,17 @@ C++ includes: FormFactorTriangle.h
%feature("docstring") FormFactorTriangle::FormFactorTriangle "FormFactorTriangle::FormFactorTriangle(const double base_edge)
";
-%feature("docstring") FormFactorTriangle::clone "FormFactorTriangle* FormFactorTriangle::clone() const overridefinal
+%feature("docstring") FormFactorTriangle::clone "FormFactorTriangle* FormFactorTriangle::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorTriangle::accept "void FormFactorTriangle::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorTriangle::accept "void FormFactorTriangle::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorTriangle::getBaseEdge "double FormFactorTriangle::getBaseEdge() const
+%feature("docstring") FormFactorTriangle::getBaseEdge "double FormFactorTriangle::getBaseEdge() const
";
@@ -4835,20 +4835,20 @@ removed_length:
removed length from each edge of the cube in nanometers
";
-%feature("docstring") FormFactorTruncatedCube::clone "FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const overridefinal
+%feature("docstring") FormFactorTruncatedCube::clone "FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorTruncatedCube::accept "void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorTruncatedCube::accept "void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorTruncatedCube::getLength "double FormFactorTruncatedCube::getLength() const
+%feature("docstring") FormFactorTruncatedCube::getLength "double FormFactorTruncatedCube::getLength() const
";
-%feature("docstring") FormFactorTruncatedCube::getRemovedLength "double FormFactorTruncatedCube::getRemovedLength() const
+%feature("docstring") FormFactorTruncatedCube::getRemovedLength "double FormFactorTruncatedCube::getRemovedLength() const
";
@@ -4877,31 +4877,31 @@ dh:
length of cup truncated from the top
";
-%feature("docstring") FormFactorTruncatedSphere::clone "FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const overridefinal
+%feature("docstring") FormFactorTruncatedSphere::clone "FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorTruncatedSphere::accept "void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorTruncatedSphere::accept "void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorTruncatedSphere::getHeight "double FormFactorTruncatedSphere::getHeight() const
+%feature("docstring") FormFactorTruncatedSphere::getHeight "double FormFactorTruncatedSphere::getHeight() const
";
-%feature("docstring") FormFactorTruncatedSphere::getRadius "double FormFactorTruncatedSphere::getRadius() const
+%feature("docstring") FormFactorTruncatedSphere::getRadius "double FormFactorTruncatedSphere::getRadius() const
";
-%feature("docstring") FormFactorTruncatedSphere::getRemovedTop "double FormFactorTruncatedSphere::getRemovedTop() const
+%feature("docstring") FormFactorTruncatedSphere::getRemovedTop "double FormFactorTruncatedSphere::getRemovedTop() const
";
-%feature("docstring") FormFactorTruncatedSphere::radialExtension "double FormFactorTruncatedSphere::radialExtension() const overridefinal
+%feature("docstring") FormFactorTruncatedSphere::radialExtension "double FormFactorTruncatedSphere::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorTruncatedSphere::evaluate_for_q "complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorTruncatedSphere::evaluate_for_q "complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
";
@@ -4935,34 +4935,34 @@ dh:
length of cup truncated from the top
";
-%feature("docstring") FormFactorTruncatedSpheroid::clone "FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const overridefinal
+%feature("docstring") FormFactorTruncatedSpheroid::clone "FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorTruncatedSpheroid::accept "void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorTruncatedSpheroid::accept "void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorTruncatedSpheroid::getRadius "double FormFactorTruncatedSpheroid::getRadius() const
+%feature("docstring") FormFactorTruncatedSpheroid::getRadius "double FormFactorTruncatedSpheroid::getRadius() const
";
-%feature("docstring") FormFactorTruncatedSpheroid::getHeight "double FormFactorTruncatedSpheroid::getHeight() const
+%feature("docstring") FormFactorTruncatedSpheroid::getHeight "double FormFactorTruncatedSpheroid::getHeight() const
";
-%feature("docstring") FormFactorTruncatedSpheroid::getHeightFlattening "double FormFactorTruncatedSpheroid::getHeightFlattening() const
+%feature("docstring") FormFactorTruncatedSpheroid::getHeightFlattening "double FormFactorTruncatedSpheroid::getHeightFlattening() const
";
-%feature("docstring") FormFactorTruncatedSpheroid::getRemovedTop "double FormFactorTruncatedSpheroid::getRemovedTop() const
+%feature("docstring") FormFactorTruncatedSpheroid::getRemovedTop "double FormFactorTruncatedSpheroid::getRemovedTop() const
";
-%feature("docstring") FormFactorTruncatedSpheroid::radialExtension "double FormFactorTruncatedSpheroid::radialExtension() const overridefinal
+%feature("docstring") FormFactorTruncatedSpheroid::radialExtension "double FormFactorTruncatedSpheroid::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorTruncatedSpheroid::evaluate_for_q "complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const overridefinal
+%feature("docstring") FormFactorTruncatedSpheroid::evaluate_for_q "complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
";
@@ -4981,30 +4981,30 @@ C++ includes: FormFactorWeighted.h
%feature("docstring") FormFactorWeighted::FormFactorWeighted "FormFactorWeighted::FormFactorWeighted()
";
-%feature("docstring") FormFactorWeighted::~FormFactorWeighted "FormFactorWeighted::~FormFactorWeighted() overridefinal
+%feature("docstring") FormFactorWeighted::~FormFactorWeighted "FormFactorWeighted::~FormFactorWeighted() override final
";
-%feature("docstring") FormFactorWeighted::clone "FormFactorWeighted * FormFactorWeighted::clone() const overridefinal
+%feature("docstring") FormFactorWeighted::clone "FormFactorWeighted * FormFactorWeighted::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") FormFactorWeighted::accept "void FormFactorWeighted::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") FormFactorWeighted::accept "void FormFactorWeighted::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") FormFactorWeighted::radialExtension "double FormFactorWeighted::radialExtension() const overridefinal
+%feature("docstring") FormFactorWeighted::radialExtension "double FormFactorWeighted::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
";
-%feature("docstring") FormFactorWeighted::bottomZ "double FormFactorWeighted::bottomZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorWeighted::bottomZ "double FormFactorWeighted::bottomZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
-%feature("docstring") FormFactorWeighted::topZ "double FormFactorWeighted::topZ(const IRotation &rotation) const overridefinal
+%feature("docstring") FormFactorWeighted::topZ "double FormFactorWeighted::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
";
@@ -5012,17 +5012,17 @@ Returns the z-coordinate of the lowest point in this shape after a given rotatio
%feature("docstring") FormFactorWeighted::addFormFactor "void FormFactorWeighted::addFormFactor(const IFormFactor &form_factor, double weight=1.0)
";
-%feature("docstring") FormFactorWeighted::setAmbientMaterial "void FormFactorWeighted::setAmbientMaterial(Material material) overridefinal
+%feature("docstring") FormFactorWeighted::setAmbientMaterial "void FormFactorWeighted::setAmbientMaterial(Material material) override final
Passes the material in which this particle is embedded.
";
-%feature("docstring") FormFactorWeighted::evaluate "complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorWeighted::evaluate "complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
";
-%feature("docstring") FormFactorWeighted::evaluatePol "Eigen::Matrix2cd FormFactorWeighted::evaluatePol(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") FormFactorWeighted::evaluatePol "Eigen::Matrix2cd FormFactorWeighted::evaluatePol(const WavevectorInfo &wavevectors) const override final
Calculates and returns a polarized form factor calculation in DWBA.
";
@@ -5039,7 +5039,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction1DCauchy::FTDecayFunction1DCauchy "FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(double decay_length)
";
-%feature("docstring") FTDecayFunction1DCauchy::clone "FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const
+%feature("docstring") FTDecayFunction1DCauchy::clone "FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const
";
%feature("docstring") FTDecayFunction1DCauchy::accept "void FTDecayFunction1DCauchy::accept(INodeVisitor *visitor) const final
@@ -5062,7 +5062,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction1DGauss::FTDecayFunction1DGauss "FTDecayFunction1DGauss::FTDecayFunction1DGauss(double decay_length)
";
-%feature("docstring") FTDecayFunction1DGauss::clone "FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const
+%feature("docstring") FTDecayFunction1DGauss::clone "FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const
";
%feature("docstring") FTDecayFunction1DGauss::accept "void FTDecayFunction1DGauss::accept(INodeVisitor *visitor) const final
@@ -5085,7 +5085,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction1DTriangle::FTDecayFunction1DTriangle "FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(double decay_length)
";
-%feature("docstring") FTDecayFunction1DTriangle::clone "FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const
+%feature("docstring") FTDecayFunction1DTriangle::clone "FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const
";
%feature("docstring") FTDecayFunction1DTriangle::accept "void FTDecayFunction1DTriangle::accept(INodeVisitor *visitor) const final
@@ -5119,7 +5119,7 @@ eta:
parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)
";
-%feature("docstring") FTDecayFunction1DVoigt::clone "FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const
+%feature("docstring") FTDecayFunction1DVoigt::clone "FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const
";
%feature("docstring") FTDecayFunction1DVoigt::accept "void FTDecayFunction1DVoigt::accept(INodeVisitor *visitor) const final
@@ -5130,7 +5130,7 @@ Calls the INodeVisitor's visit method.
%feature("docstring") FTDecayFunction1DVoigt::evaluate "double FTDecayFunction1DVoigt::evaluate(double q) const final
";
-%feature("docstring") FTDecayFunction1DVoigt::eEta "double FTDecayFunction1DVoigt::eEta() const
+%feature("docstring") FTDecayFunction1DVoigt::eEta "double FTDecayFunction1DVoigt::eEta() const
";
@@ -5145,7 +5145,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction2DCauchy::FTDecayFunction2DCauchy "FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0)
";
-%feature("docstring") FTDecayFunction2DCauchy::clone "FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const
+%feature("docstring") FTDecayFunction2DCauchy::clone "FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const
";
%feature("docstring") FTDecayFunction2DCauchy::accept "void FTDecayFunction2DCauchy::accept(INodeVisitor *visitor) const final
@@ -5170,7 +5170,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction2DGauss::FTDecayFunction2DGauss "FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0)
";
-%feature("docstring") FTDecayFunction2DGauss::clone "FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const
+%feature("docstring") FTDecayFunction2DGauss::clone "FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const
";
%feature("docstring") FTDecayFunction2DGauss::accept "void FTDecayFunction2DGauss::accept(INodeVisitor *visitor) const final
@@ -5212,7 +5212,7 @@ gamma:
distribution orientation with respect to the first lattice vector in radians
";
-%feature("docstring") FTDecayFunction2DVoigt::clone "FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const
+%feature("docstring") FTDecayFunction2DVoigt::clone "FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const
";
%feature("docstring") FTDecayFunction2DVoigt::accept "void FTDecayFunction2DVoigt::accept(INodeVisitor *visitor) const final
@@ -5225,7 +5225,7 @@ Calls the INodeVisitor's visit method.
evaluate Fourier transformed decay function for q in X,Y coordinates
";
-%feature("docstring") FTDecayFunction2DVoigt::eta "double FTDecayFunction2DVoigt::eta() const
+%feature("docstring") FTDecayFunction2DVoigt::eta "double FTDecayFunction2DVoigt::eta() const
";
@@ -5389,7 +5389,7 @@ Calls the INodeVisitor's visit method.
Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1.
";
-%feature("docstring") FTDistribution1DVoigt::eta "double FTDistribution1DVoigt::eta() const
+%feature("docstring") FTDistribution1DVoigt::eta "double FTDistribution1DVoigt::eta() const
";
@@ -5546,7 +5546,7 @@ Calls the INodeVisitor's visit method.
evaluate Fourier transformed distribution for q in X,Y coordinates the original distribution (in real space) is assumed to be normalized: total integral is equal to 1
";
-%feature("docstring") FTDistribution2DVoigt::eta "double FTDistribution2DVoigt::eta() const
+%feature("docstring") FTDistribution2DVoigt::eta "double FTDistribution2DVoigt::eta() const
";
@@ -5570,7 +5570,7 @@ C++ includes: GISASSimulation.h
%feature("docstring") GISASSimulation::~GISASSimulation "GISASSimulation::~GISASSimulation() final
";
-%feature("docstring") GISASSimulation::clone "GISASSimulation* GISASSimulation::clone() const
+%feature("docstring") GISASSimulation::clone "GISASSimulation* GISASSimulation::clone() const
";
%feature("docstring") GISASSimulation::accept "void GISASSimulation::accept(INodeVisitor *visitor) const final
@@ -5690,7 +5690,7 @@ Sets rectangular region of interest with lower left and upper right corners defi
%feature("docstring") HexagonalLattice::HexagonalLattice "HexagonalLattice::HexagonalLattice(double length, double rotation_angle=0.0)
";
-%feature("docstring") HexagonalLattice::clone "HexagonalLattice * HexagonalLattice::clone() const
+%feature("docstring") HexagonalLattice::clone "HexagonalLattice * HexagonalLattice::clone() const
";
%feature("docstring") HexagonalLattice::accept "void HexagonalLattice::accept(INodeVisitor *visitor) const final
@@ -5698,16 +5698,16 @@ Sets rectangular region of interest with lower left and upper right corners defi
Calls the INodeVisitor's visit method.
";
-%feature("docstring") HexagonalLattice::length1 "virtual double HexagonalLattice::length1() const
+%feature("docstring") HexagonalLattice::length1 "virtual double HexagonalLattice::length1() const
";
-%feature("docstring") HexagonalLattice::length2 "virtual double HexagonalLattice::length2() const
+%feature("docstring") HexagonalLattice::length2 "virtual double HexagonalLattice::length2() const
";
-%feature("docstring") HexagonalLattice::latticeAngle "double HexagonalLattice::latticeAngle() const
+%feature("docstring") HexagonalLattice::latticeAngle "double HexagonalLattice::latticeAngle() const
";
-%feature("docstring") HexagonalLattice::unitCellArea "double HexagonalLattice::unitCellArea() const
+%feature("docstring") HexagonalLattice::unitCellArea "double HexagonalLattice::unitCellArea() const
";
@@ -5722,7 +5722,7 @@ C++ includes: ParaCrystalBuilder.h
%feature("docstring") HexParaCrystalBuilder::HexParaCrystalBuilder "HexParaCrystalBuilder::HexParaCrystalBuilder()
";
-%feature("docstring") HexParaCrystalBuilder::buildSample "MultiLayer * HexParaCrystalBuilder::buildSample() const
+%feature("docstring") HexParaCrystalBuilder::buildSample "MultiLayer * HexParaCrystalBuilder::buildSample() const
";
@@ -5982,7 +5982,7 @@ C++ includes: HomogeneousMultilayerBuilder.h
%feature("docstring") HomogeneousMultilayerBuilder::HomogeneousMultilayerBuilder "HomogeneousMultilayerBuilder::HomogeneousMultilayerBuilder()
";
-%feature("docstring") HomogeneousMultilayerBuilder::buildSample "MultiLayer * HomogeneousMultilayerBuilder::buildSample() const
+%feature("docstring") HomogeneousMultilayerBuilder::buildSample "MultiLayer * HomogeneousMultilayerBuilder::buildSample() const
";
@@ -6012,7 +6012,7 @@ y:
The value at which it crosses y-axes
";
-%feature("docstring") HorizontalLine::clone "HorizontalLine* HorizontalLine::clone() const
+%feature("docstring") HorizontalLine::clone "HorizontalLine* HorizontalLine::clone() const
";
%feature("docstring") HorizontalLine::contains "bool HorizontalLine::contains(double x, double y) const
@@ -6025,7 +6025,7 @@ Returns true if point with given coordinates is inside or on border of the shape
Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition).
";
-%feature("docstring") HorizontalLine::getYpos "double HorizontalLine::getYpos() const
+%feature("docstring") HorizontalLine::getYpos "double HorizontalLine::getYpos() const
";
@@ -6055,7 +6055,7 @@ Returns a clone of this ISample object.
Calls the INodeVisitor's visit method.
";
-%feature("docstring") IAbstractParticle::abundance "double IAbstractParticle::abundance() const
+%feature("docstring") IAbstractParticle::abundance "double IAbstractParticle::abundance() const
";
%feature("docstring") IAbstractParticle::setAbundance "void IAbstractParticle::setAbundance(double abundance)
@@ -6146,10 +6146,10 @@ find bin index which is best match for given value
find index of bin that contains the given value returns size() when value is not found
";
-%feature("docstring") IAxis::getBinCenters "std::vector< double > IAxis::getBinCenters() const
+%feature("docstring") IAxis::getBinCenters "std::vector< double > IAxis::getBinCenters() const
";
-%feature("docstring") IAxis::getBinBoundaries "std::vector< double > IAxis::getBinBoundaries() const
+%feature("docstring") IAxis::getBinBoundaries "std::vector< double > IAxis::getBinBoundaries() const
";
%feature("docstring") IAxis::createClippedAxis "IAxis * IAxis::createClippedAxis(double left, double right) const
@@ -6311,19 +6311,19 @@ Controlled by the multi-threading machinery in Simulation::runSingleSimulation(
C++ includes: IComputation.h
";
-%feature("docstring") IComputation::IComputation "IComputation::IComputation(ProgressHandler &progress, const std::vector< SimulationElement >::iterator &start, const std::vector< SimulationElement >::iterator &end)
+%feature("docstring") IComputation::IComputation "IComputation::IComputation(const SimulationOptions &options, ProgressHandler &progress, const std::vector< SimulationElement >::iterator &start, const std::vector< SimulationElement >::iterator &end, const MultiLayer &sample)
";
%feature("docstring") IComputation::~IComputation "IComputation::~IComputation()
";
-%feature("docstring") IComputation::run "virtual void IComputation::run()=0
+%feature("docstring") IComputation::run "void IComputation::run()
";
-%feature("docstring") IComputation::isCompleted "bool IComputation::isCompleted() const
+%feature("docstring") IComputation::isCompleted "bool IComputation::isCompleted() const
";
-%feature("docstring") IComputation::errorMessage "std::string IComputation::errorMessage() const
+%feature("docstring") IComputation::errorMessage "std::string IComputation::errorMessage() const
";
@@ -6390,7 +6390,7 @@ Inits detector with the beam settings.
%feature("docstring") IDetector::addAxis "void IDetector::addAxis(const IAxis &axis)
";
-%feature("docstring") IDetector::getAxis "const IAxis & IDetector::getAxis(size_t index) const
+%feature("docstring") IDetector::getAxis "const IAxis & IDetector::getAxis(size_t index) const
";
%feature("docstring") IDetector::dimension "size_t IDetector::dimension() const
@@ -6692,10 +6692,10 @@ Registers object's creation function and store object description.
Returns number of registered objects.
";
-%feature("docstring") IFactory::begin "const_iterator IFactory< Key, AbstractProduct >::begin() const
+%feature("docstring") IFactory::begin "const_iterator IFactory< Key, AbstractProduct >::begin() const
";
-%feature("docstring") IFactory::end "const_iterator IFactory< Key, AbstractProduct >::end() const
+%feature("docstring") IFactory::end "const_iterator IFactory< Key, AbstractProduct >::end() const
";
@@ -6762,7 +6762,7 @@ C++ includes: FitSuiteFunctions.h
%feature("docstring") IFitSuiteFunction::init "virtual void IFitSuiteFunction::init(FitSuiteImpl *fit_suite)
";
-%feature("docstring") IFitSuiteFunction::getNCalls "virtual size_t IFitSuiteFunction::getNCalls() const
+%feature("docstring") IFitSuiteFunction::getNCalls "virtual size_t IFitSuiteFunction::getNCalls() const
";
@@ -6963,6 +6963,11 @@ Retrieves the amplitude coefficients for a (time-reversed) outgoing wavevector.
Retrieves the amplitude coefficients for an incoming wavevector.
";
+%feature("docstring") IFresnelMap::fillSpecularData "virtual void IFresnelMap::fillSpecularData(SimulationElement &sim_element) const =0
+
+Fills simulation element specular data.
+";
+
%feature("docstring") IFresnelMap::setMultilayer "void IFresnelMap::setMultilayer(const MultiLayer &multilayer)
Sets the multilayer to be used for the Fresnel calculations.
@@ -6999,7 +7004,7 @@ half-width of the distribution in nanometers
%feature("docstring") IFTDecayFunction1D::evaluate "virtual double IFTDecayFunction1D::evaluate(double q) const =0
";
-%feature("docstring") IFTDecayFunction1D::decayLength "double IFTDecayFunction1D::decayLength() const
+%feature("docstring") IFTDecayFunction1D::decayLength "double IFTDecayFunction1D::decayLength() const
";
@@ -7097,7 +7102,7 @@ Returns Fourier transform of this distribution; is a decay function starting at
%feature("docstring") IFTDistribution1D::setOmega "void IFTDistribution1D::setOmega(double omega)
";
-%feature("docstring") IFTDistribution1D::omega "double IFTDistribution1D::omega() const
+%feature("docstring") IFTDistribution1D::omega "double IFTDistribution1D::omega() const
";
@@ -7132,16 +7137,16 @@ angle in direct space between first lattice vector and x-axis of the distributio
%feature("docstring") IFTDistribution2D::setGamma "void IFTDistribution2D::setGamma(double gamma)
";
-%feature("docstring") IFTDistribution2D::gamma "double IFTDistribution2D::gamma() const
+%feature("docstring") IFTDistribution2D::gamma "double IFTDistribution2D::gamma() const
";
-%feature("docstring") IFTDistribution2D::delta "double IFTDistribution2D::delta() const
+%feature("docstring") IFTDistribution2D::delta "double IFTDistribution2D::delta() const
";
-%feature("docstring") IFTDistribution2D::omegaX "double IFTDistribution2D::omegaX() const
+%feature("docstring") IFTDistribution2D::omegaX "double IFTDistribution2D::omegaX() const
";
-%feature("docstring") IFTDistribution2D::omegaY "double IFTDistribution2D::omegaY() const
+%feature("docstring") IFTDistribution2D::omegaY "double IFTDistribution2D::omegaY() const
";
%feature("docstring") IFTDistribution2D::evaluate "virtual double IFTDistribution2D::evaluate(double qx, double qy) const =0
@@ -7307,7 +7312,7 @@ The global bin index
The value accumulated by the bin (integral)
";
-%feature("docstring") IHistogram::getData "const OutputData<CumulativeValue>& IHistogram::getData() const
+%feature("docstring") IHistogram::getData "const OutputData<CumulativeValue>& IHistogram::getData() const
";
%feature("docstring") IHistogram::getData "OutputData<CumulativeValue>& IHistogram::getData()
@@ -7441,7 +7446,7 @@ Loads histogram from file, the shape of array in file should match Following for
Sets axes units.
";
-%feature("docstring") IHistogram::axesUnits "std::string IHistogram::axesUnits() const
+%feature("docstring") IHistogram::axesUnits "std::string IHistogram::axesUnits() const
";
@@ -7601,10 +7606,10 @@ Returns z-part of the two wavevector eigenmodes.
Scalar value getters; these throw errors by default as they should only be used when the derived object is really scalar
";
-%feature("docstring") ILayerRTCoefficients::getScalarR "virtual complex_t ILayerRTCoefficients::getScalarR() const
+%feature("docstring") ILayerRTCoefficients::getScalarR "virtual complex_t ILayerRTCoefficients::getScalarR() const
";
-%feature("docstring") ILayerRTCoefficients::getScalarKz "virtual complex_t ILayerRTCoefficients::getScalarKz() const
+%feature("docstring") ILayerRTCoefficients::getScalarKz "virtual complex_t ILayerRTCoefficients::getScalarKz() const
";
@@ -7709,7 +7714,7 @@ C++ includes: INamed.h
%feature("docstring") INamed::~INamed "INamed::~INamed()
";
-%feature("docstring") INamed::getName "std::string INamed::getName() const
+%feature("docstring") INamed::getName "std::string INamed::getName() const
";
@@ -7724,7 +7729,7 @@ C++ includes: InfinitePlane.h
%feature("docstring") InfinitePlane::InfinitePlane "InfinitePlane::InfinitePlane()
";
-%feature("docstring") InfinitePlane::clone "InfinitePlane* InfinitePlane::clone() const
+%feature("docstring") InfinitePlane::clone "InfinitePlane* InfinitePlane::clone() const
";
%feature("docstring") InfinitePlane::contains "bool InfinitePlane::contains(double, double) const
@@ -7773,7 +7778,7 @@ Returns a vector of children (const).
%feature("docstring") INode::setParent "void INode::setParent(const INode *newParent)
";
-%feature("docstring") INode::parent "const INode * INode::parent() const
+%feature("docstring") INode::parent "const INode * INode::parent() const
";
%feature("docstring") INode::parent "INode * INode::parent()
@@ -8177,7 +8182,7 @@ Calls the INodeVisitor's visit method.
%feature("docstring") Instrument::getBeam "Beam& Instrument::getBeam()
";
-%feature("docstring") Instrument::getBeam "const Beam& Instrument::getBeam() const
+%feature("docstring") Instrument::getBeam "const Beam& Instrument::getBeam() const
";
%feature("docstring") Instrument::setBeam "void Instrument::setBeam(const Beam &beam)
@@ -8216,7 +8221,7 @@ Returns the detector data.
Returns 2D detector data if detector is truly 2D. Otherwise returns nullptr.
";
-%feature("docstring") Instrument::getDetectorMask "const DetectorMask * Instrument::getDetectorMask() const
+%feature("docstring") Instrument::getDetectorMask "const DetectorMask * Instrument::getDetectorMask() const
";
%feature("docstring") Instrument::getDetectorAxis "const IAxis & Instrument::getDetectorAxis(size_t index) const
@@ -8386,10 +8391,10 @@ C++ includes: IIntensityFunction.h
%feature("docstring") IntensityFunctionLog::~IntensityFunctionLog "virtual IntensityFunctionLog::~IntensityFunctionLog()
";
-%feature("docstring") IntensityFunctionLog::clone "virtual IntensityFunctionLog* IntensityFunctionLog::clone() const
+%feature("docstring") IntensityFunctionLog::clone "virtual IntensityFunctionLog* IntensityFunctionLog::clone() const
";
-%feature("docstring") IntensityFunctionLog::evaluate "double IntensityFunctionLog::evaluate(double value) const
+%feature("docstring") IntensityFunctionLog::evaluate "double IntensityFunctionLog::evaluate(double value) const
";
@@ -8404,10 +8409,10 @@ C++ includes: IIntensityFunction.h
%feature("docstring") IntensityFunctionSqrt::~IntensityFunctionSqrt "virtual IntensityFunctionSqrt::~IntensityFunctionSqrt()
";
-%feature("docstring") IntensityFunctionSqrt::clone "virtual IntensityFunctionSqrt* IntensityFunctionSqrt::clone() const
+%feature("docstring") IntensityFunctionSqrt::clone "virtual IntensityFunctionSqrt* IntensityFunctionSqrt::clone() const
";
-%feature("docstring") IntensityFunctionSqrt::evaluate "double IntensityFunctionSqrt::evaluate(double value) const
+%feature("docstring") IntensityFunctionSqrt::evaluate "double IntensityFunctionSqrt::evaluate(double value) const
";
@@ -8425,7 +8430,7 @@ C++ includes: IIntensityNormalizer.h
%feature("docstring") IntensityNormalizer::~IntensityNormalizer "virtual IntensityNormalizer::~IntensityNormalizer()
";
-%feature("docstring") IntensityNormalizer::clone "IntensityNormalizer * IntensityNormalizer::clone() const
+%feature("docstring") IntensityNormalizer::clone "IntensityNormalizer * IntensityNormalizer::clone() const
";
%feature("docstring") IntensityNormalizer::accept "void IntensityNormalizer::accept(INodeVisitor *visitor) const
@@ -8433,7 +8438,7 @@ C++ includes: IIntensityNormalizer.h
Calls the INodeVisitor's visit method.
";
-%feature("docstring") IntensityNormalizer::createNormalizedData "OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const
+%feature("docstring") IntensityNormalizer::createNormalizedData "OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const
";
%feature("docstring") IntensityNormalizer::apply "void IntensityNormalizer::apply(OutputData< double > &data) const final
@@ -8515,7 +8520,7 @@ decay:
one-dimensional decay function in reciprocal space
";
-%feature("docstring") InterferenceFunction1DLattice::getLatticeParameters "Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const
+%feature("docstring") InterferenceFunction1DLattice::getLatticeParameters "Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const
";
%feature("docstring") InterferenceFunction1DLattice::evaluate "double InterferenceFunction1DLattice::evaluate(const kvector_t q) const final
@@ -8592,10 +8597,10 @@ Evaluates the interference function for a given wavevector transfer (only the re
%feature("docstring") InterferenceFunction2DLattice::setIntegrationOverXi "void InterferenceFunction2DLattice::setIntegrationOverXi(bool integrate_xi)
";
-%feature("docstring") InterferenceFunction2DLattice::integrationOverXi "bool InterferenceFunction2DLattice::integrationOverXi() const
+%feature("docstring") InterferenceFunction2DLattice::integrationOverXi "bool InterferenceFunction2DLattice::integrationOverXi() const
";
-%feature("docstring") InterferenceFunction2DLattice::lattice "const Lattice2D & InterferenceFunction2DLattice::lattice() const
+%feature("docstring") InterferenceFunction2DLattice::lattice "const Lattice2D & InterferenceFunction2DLattice::lattice() const
";
%feature("docstring") InterferenceFunction2DLattice::getParticleDensity "double InterferenceFunction2DLattice::getParticleDensity() const final
@@ -8608,7 +8613,7 @@ Returns the particle density associated with this 2d lattice.
Returns a vector of children (const).
";
-%feature("docstring") InterferenceFunction2DLattice::onChange "void InterferenceFunction2DLattice::onChange() overridefinal
+%feature("docstring") InterferenceFunction2DLattice::onChange "void InterferenceFunction2DLattice::onChange() override final
Action to be taken in inherited class when a parameter has changed.
";
@@ -8705,7 +8710,7 @@ the damping (coherence) length of the paracrystal in nanometers
Evaluates the interference function for a given wavevector transfer (only the real x and y components are relevant)
";
-%feature("docstring") InterferenceFunction2DParaCrystal::domainSizes "std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const
+%feature("docstring") InterferenceFunction2DParaCrystal::domainSizes "std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const
";
%feature("docstring") InterferenceFunction2DParaCrystal::setIntegrationOverXi "void InterferenceFunction2DParaCrystal::setIntegrationOverXi(bool integrate_xi)
@@ -8719,13 +8724,13 @@ integrate_xi:
integration flag
";
-%feature("docstring") InterferenceFunction2DParaCrystal::integrationOverXi "bool InterferenceFunction2DParaCrystal::integrationOverXi() const
+%feature("docstring") InterferenceFunction2DParaCrystal::integrationOverXi "bool InterferenceFunction2DParaCrystal::integrationOverXi() const
";
-%feature("docstring") InterferenceFunction2DParaCrystal::dampingLength "double InterferenceFunction2DParaCrystal::dampingLength() const
+%feature("docstring") InterferenceFunction2DParaCrystal::dampingLength "double InterferenceFunction2DParaCrystal::dampingLength() const
";
-%feature("docstring") InterferenceFunction2DParaCrystal::lattice "const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const
+%feature("docstring") InterferenceFunction2DParaCrystal::lattice "const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const
";
%feature("docstring") InterferenceFunction2DParaCrystal::getParticleDensity "double InterferenceFunction2DParaCrystal::getParticleDensity() const final
@@ -8825,7 +8830,7 @@ size:
size of coherence domain along the lattice main axis in nanometers
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::domainSize "double InterferenceFunctionRadialParaCrystal::domainSize() const
+%feature("docstring") InterferenceFunctionRadialParaCrystal::domainSize "double InterferenceFunctionRadialParaCrystal::domainSize() const
";
%feature("docstring") InterferenceFunctionRadialParaCrystal::evaluate "double InterferenceFunctionRadialParaCrystal::evaluate(const kvector_t q) const final
@@ -8833,7 +8838,7 @@ size of coherence domain along the lattice main axis in nanometers
Evaluates the interference function for a given wavevector transfer (only the real x and y components are relevant)
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::FTPDF "complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const
+%feature("docstring") InterferenceFunctionRadialParaCrystal::FTPDF "complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const
";
%feature("docstring") InterferenceFunctionRadialParaCrystal::setProbabilityDistribution "void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(const IFTDistribution1D &pdf)
@@ -8847,10 +8852,10 @@ pdf:
probability distribution (Fourier transform of probability density)
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::peakDistance "double InterferenceFunctionRadialParaCrystal::peakDistance() const
+%feature("docstring") InterferenceFunctionRadialParaCrystal::peakDistance "double InterferenceFunctionRadialParaCrystal::peakDistance() const
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::dampingLength "double InterferenceFunctionRadialParaCrystal::dampingLength() const
+%feature("docstring") InterferenceFunctionRadialParaCrystal::dampingLength "double InterferenceFunctionRadialParaCrystal::dampingLength() const
";
%feature("docstring") InterferenceFunctionRadialParaCrystal::getChildren "std::vector< const INode * > InterferenceFunctionRadialParaCrystal::getChildren() const override
@@ -8953,7 +8958,7 @@ C++ includes: IParameter.h
Returns true if wrapped parameter was not initialized with proper real value.
";
-%feature("docstring") IParameter::getData "T& IParameter< T >::getData() const
+%feature("docstring") IParameter::getData "T& IParameter< T >::getData() const
";
%feature("docstring") IParameter::setData "void IParameter< T >::setData(T &data)
@@ -9090,7 +9095,7 @@ z:
z-coordinate in nanometers
";
-%feature("docstring") IParticle::translate "void IParticle::translate(kvector_t translation) overridefinal
+%feature("docstring") IParticle::translate "void IParticle::translate(kvector_t translation) override final
Translates the particle.
";
@@ -9169,13 +9174,13 @@ Templated object registry.
C++ includes: IRegistry.h
";
-%feature("docstring") IRegistry::getItem "const ValueType* IRegistry< ValueType >::getItem(const std::string &key) const
+%feature("docstring") IRegistry::getItem "const ValueType* IRegistry< ValueType >::getItem(const std::string &key) const
";
%feature("docstring") IRegistry::keys "std::vector<std::string> IRegistry< ValueType >::keys()
";
-%feature("docstring") IRegistry::size "size_t IRegistry< ValueType >::size() const
+%feature("docstring") IRegistry::size "size_t IRegistry< ValueType >::size() const
";
@@ -9427,7 +9432,7 @@ C++ includes: NodeIterator.h
%feature("docstring") IteratorMemento::get_state "IteratorState& IteratorMemento::get_state()
";
-%feature("docstring") IteratorMemento::empty "bool IteratorMemento::empty() const
+%feature("docstring") IteratorMemento::empty "bool IteratorMemento::empty() const
";
%feature("docstring") IteratorMemento::reset "void IteratorMemento::reset()
@@ -9439,7 +9444,7 @@ C++ includes: NodeIterator.h
%feature("docstring") IteratorMemento::next "void IteratorMemento::next()
";
-%feature("docstring") IteratorMemento::size "size_t IteratorMemento::size() const
+%feature("docstring") IteratorMemento::size "size_t IteratorMemento::size() const
";
@@ -9454,16 +9459,16 @@ C++ includes: NodeIterator.h
%feature("docstring") IteratorState::IteratorState "IteratorState::IteratorState(const INode *single_element)
";
-%feature("docstring") IteratorState::IteratorState "IteratorState::IteratorState(std::vector< const INode * > samples)
+%feature("docstring") IteratorState::IteratorState "IteratorState::IteratorState(std::vector< const INode *> samples)
";
%feature("docstring") IteratorState::~IteratorState "virtual IteratorState::~IteratorState()
";
-%feature("docstring") IteratorState::getCurrent "const INode* IteratorState::getCurrent() const
+%feature("docstring") IteratorState::getCurrent "const INode* IteratorState::getCurrent() const
";
-%feature("docstring") IteratorState::isEnd "bool IteratorState::isEnd() const
+%feature("docstring") IteratorState::isEnd "bool IteratorState::isEnd() const
";
%feature("docstring") IteratorState::next "void IteratorState::next()
@@ -9485,7 +9490,7 @@ C++ includes: CylindersBuilder.h
%feature("docstring") LargeCylindersInDWBABuilder::LargeCylindersInDWBABuilder "LargeCylindersInDWBABuilder::LargeCylindersInDWBABuilder()
";
-%feature("docstring") LargeCylindersInDWBABuilder::buildSample "MultiLayer * LargeCylindersInDWBABuilder::buildSample() const
+%feature("docstring") LargeCylindersInDWBABuilder::buildSample "MultiLayer * LargeCylindersInDWBABuilder::buildSample() const
";
@@ -9586,7 +9591,7 @@ C++ includes: LatticeBuilder.h
%feature("docstring") Lattice1DBuilder::Lattice1DBuilder "Lattice1DBuilder::Lattice1DBuilder()
";
-%feature("docstring") Lattice1DBuilder::buildSample "MultiLayer * Lattice1DBuilder::buildSample() const
+%feature("docstring") Lattice1DBuilder::buildSample "MultiLayer * Lattice1DBuilder::buildSample() const
";
@@ -9635,10 +9640,10 @@ xi:
%feature("docstring") Lattice2D::unitCellArea "virtual double Lattice2D::unitCellArea() const =0
";
-%feature("docstring") Lattice2D::rotationAngle "double Lattice2D::rotationAngle() const
+%feature("docstring") Lattice2D::rotationAngle "double Lattice2D::rotationAngle() const
";
-%feature("docstring") Lattice2D::reciprocalBases "Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const
+%feature("docstring") Lattice2D::reciprocalBases "Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const
";
%feature("docstring") Lattice2D::setRotationEnabled "void Lattice2D::setRotationEnabled(bool enabled)
@@ -9670,15 +9675,15 @@ thickness of a layer in nanometers
%feature("docstring") Layer::~Layer "Layer::~Layer()
";
-%feature("docstring") Layer::clone "Layer * Layer::clone() const overridefinal
+%feature("docstring") Layer::clone "Layer * Layer::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") Layer::cloneInvertB "Layer * Layer::cloneInvertB() const
+%feature("docstring") Layer::cloneInvertB "Layer * Layer::cloneInvertB() const
";
-%feature("docstring") Layer::accept "void Layer::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") Layer::accept "void Layer::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
@@ -9688,10 +9693,10 @@ Calls the INodeVisitor's visit method.
Sets layer thickness in nanometers.
";
-%feature("docstring") Layer::thickness "double Layer::thickness() const
+%feature("docstring") Layer::thickness "double Layer::thickness() const
";
-%feature("docstring") Layer::material "const Material* Layer::material() const overridefinal
+%feature("docstring") Layer::material "const Material* Layer::material() const override final
Returns nullptr, unless overwritten to return a specific material.
";
@@ -9702,13 +9707,13 @@ Returns nullptr, unless overwritten to return a specific material.
%feature("docstring") Layer::addLayout "void Layer::addLayout(const ILayout &decoration)
";
-%feature("docstring") Layer::numberOfLayouts "size_t Layer::numberOfLayouts() const
+%feature("docstring") Layer::numberOfLayouts "size_t Layer::numberOfLayouts() const
";
-%feature("docstring") Layer::layouts "std::vector< const ILayout * > Layer::layouts() const
+%feature("docstring") Layer::layouts "std::vector< const ILayout * > Layer::layouts() const
";
-%feature("docstring") Layer::getChildren "std::vector< const INode * > Layer::getChildren() const overridefinal
+%feature("docstring") Layer::getChildren "std::vector< const INode * > Layer::getChildren() const override final
Returns a vector of children (const).
";
@@ -9719,10 +9724,10 @@ Returns a vector of children (const).
%feature("docstring") Layer::setNumberOfSlices "void Layer::setNumberOfSlices(unsigned int n_slices)
";
-%feature("docstring") Layer::numberOfSlices "unsigned int Layer::numberOfSlices() const
+%feature("docstring") Layer::numberOfSlices "unsigned int Layer::numberOfSlices() const
";
-%feature("docstring") Layer::slice "SafePointerVector< Layer > Layer::slice(ZLimits limits, ELayerType layer_type) const
+%feature("docstring") Layer::slice "SafePointerVector< Layer > Layer::slice(ZLimits limits, ELayerType layer_type) const
";
%feature("docstring") Layer::scalarReducedPotential "complex_t Layer::scalarReducedPotential(kvector_t k, double n_ref) const
@@ -9796,10 +9801,10 @@ Sets roughness of the interface.
Returns roughness of the interface.
";
-%feature("docstring") LayerInterface::topLayer "const Layer * LayerInterface::topLayer() const
+%feature("docstring") LayerInterface::topLayer "const Layer * LayerInterface::topLayer() const
";
-%feature("docstring") LayerInterface::bottomLayer "const Layer * LayerInterface::bottomLayer() const
+%feature("docstring") LayerInterface::bottomLayer "const Layer * LayerInterface::bottomLayer() const
";
%feature("docstring") LayerInterface::getChildren "std::vector< const INode * > LayerInterface::getChildren() const
@@ -9907,7 +9912,7 @@ C++ includes: LayersWithAbsorptionBuilder.h
%feature("docstring") LayersWithAbsorptionBuilder::~LayersWithAbsorptionBuilder "LayersWithAbsorptionBuilder::~LayersWithAbsorptionBuilder()
";
-%feature("docstring") LayersWithAbsorptionBuilder::buildSample "MultiLayer * LayersWithAbsorptionBuilder::buildSample() const
+%feature("docstring") LayersWithAbsorptionBuilder::buildSample "MultiLayer * LayersWithAbsorptionBuilder::buildSample() const
";
%feature("docstring") LayersWithAbsorptionBuilder::createSample "MultiLayer * LayersWithAbsorptionBuilder::createSample(size_t index=0)
@@ -9934,7 +9939,7 @@ C++ includes: LayoutStrategyBuilder.h
%feature("docstring") LayoutStrategyBuilder::releaseStrategy "IInterferenceFunctionStrategy * LayoutStrategyBuilder::releaseStrategy()
";
-%feature("docstring") LayoutStrategyBuilder::regionMap "std::map< size_t, std::vector< HomogeneousRegion > > LayoutStrategyBuilder::regionMap() const
+%feature("docstring") LayoutStrategyBuilder::regionMap "std::map< size_t, std::vector< HomogeneousRegion > > LayoutStrategyBuilder::regionMap() const
";
@@ -9949,7 +9954,7 @@ C++ includes: Line.h
%feature("docstring") Line::Line "Line::Line(double x1, double y1, double x2, double y2)
";
-%feature("docstring") Line::clone "Line* Line::clone() const
+%feature("docstring") Line::clone "Line* Line::clone() const
";
%feature("docstring") Line::contains "bool Line::contains(double x, double y) const
@@ -9980,13 +9985,13 @@ C++ includes: LLData.h
%feature("docstring") LLData::~LLData "LLData< T >::~LLData()
";
-%feature("docstring") LLData::meanValues "LLData<double> LLData< T >::meanValues() const
+%feature("docstring") LLData::meanValues "LLData<double> LLData< T >::meanValues() const
";
%feature("docstring") LLData::atCoordinate "T & LLData< T >::atCoordinate(int *coordinate)
";
-%feature("docstring") LLData::atCoordinate "const T & LLData< T >::atCoordinate(int *coordinate) const
+%feature("docstring") LLData::atCoordinate "const T & LLData< T >::atCoordinate(int *coordinate) const
";
%feature("docstring") LLData::setAll "void LLData< T >::setAll(const T &value)
@@ -9995,16 +10000,16 @@ C++ includes: LLData.h
%feature("docstring") LLData::scaleAll "void LLData< T >::scaleAll(const T &factor)
";
-%feature("docstring") LLData::getTotalSize "size_t LLData< T >::getTotalSize() const
+%feature("docstring") LLData::getTotalSize "size_t LLData< T >::getTotalSize() const
";
-%feature("docstring") LLData::getRank "size_t LLData< T >::getRank() const
+%feature("docstring") LLData::getRank "size_t LLData< T >::getRank() const
";
-%feature("docstring") LLData::getDimensions "const int* LLData< T >::getDimensions() const
+%feature("docstring") LLData::getDimensions "const int* LLData< T >::getDimensions() const
";
-%feature("docstring") LLData::getTotalSum "T LLData< T >::getTotalSum() const
+%feature("docstring") LLData::getTotalSum "T LLData< T >::getTotalSum() const
";
@@ -10026,7 +10031,7 @@ C++ includes: MagneticParticlesBuilder.h
%feature("docstring") MagneticCylindersBuilder::MagneticCylindersBuilder "MagneticCylindersBuilder::MagneticCylindersBuilder()
";
-%feature("docstring") MagneticCylindersBuilder::buildSample "MultiLayer * MagneticCylindersBuilder::buildSample() const
+%feature("docstring") MagneticCylindersBuilder::buildSample "MultiLayer * MagneticCylindersBuilder::buildSample() const
";
@@ -10051,30 +10056,30 @@ Constructs basic material with name and magnetization.
Returns pointer to a copy of material.
";
-%feature("docstring") MagneticMaterialImpl::inverted "MagneticMaterialImpl * MagneticMaterialImpl::inverted() const overridefinal
+%feature("docstring") MagneticMaterialImpl::inverted "MagneticMaterialImpl * MagneticMaterialImpl::inverted() const override final
Constructs a material with inverted magnetization.
";
-%feature("docstring") MagneticMaterialImpl::isScalarMaterial "bool MagneticMaterialImpl::isScalarMaterial() const overridefinal
+%feature("docstring") MagneticMaterialImpl::isScalarMaterial "bool MagneticMaterialImpl::isScalarMaterial() const override final
Indicates whether the interaction with the material is scalar. This means that different polarization states will be diffracted equally
";
-%feature("docstring") MagneticMaterialImpl::isMagneticMaterial "bool MagneticMaterialImpl::isMagneticMaterial() const overridefinal
+%feature("docstring") MagneticMaterialImpl::isMagneticMaterial "bool MagneticMaterialImpl::isMagneticMaterial() const override final
";
-%feature("docstring") MagneticMaterialImpl::magnetization "kvector_t MagneticMaterialImpl::magnetization() const overridefinal
+%feature("docstring") MagneticMaterialImpl::magnetization "kvector_t MagneticMaterialImpl::magnetization() const override final
Returns the magnetization (in A/m)
";
-%feature("docstring") MagneticMaterialImpl::polarizedSubtrSLD "Eigen::Matrix2cd MagneticMaterialImpl::polarizedSubtrSLD(const WavevectorInfo &wavevectors) const overridefinal
+%feature("docstring") MagneticMaterialImpl::polarizedSubtrSLD "Eigen::Matrix2cd MagneticMaterialImpl::polarizedSubtrSLD(const WavevectorInfo &wavevectors) const override final
Returns ( $ \\\\pi/\\\\lambda^2 $ - sld) matrix with magnetization corrections.
";
-%feature("docstring") MagneticMaterialImpl::transformedMaterial "MagneticMaterialImpl * MagneticMaterialImpl::transformedMaterial(const Transform3D &transform) const overridefinal
+%feature("docstring") MagneticMaterialImpl::transformedMaterial "MagneticMaterialImpl * MagneticMaterialImpl::transformedMaterial(const Transform3D &transform) const override final
";
@@ -10089,7 +10094,7 @@ C++ includes: MagneticParticlesBuilder.h
%feature("docstring") MagneticParticleZeroFieldBuilder::MagneticParticleZeroFieldBuilder "MagneticParticleZeroFieldBuilder::MagneticParticleZeroFieldBuilder()
";
-%feature("docstring") MagneticParticleZeroFieldBuilder::buildSample "MultiLayer * MagneticParticleZeroFieldBuilder::buildSample() const
+%feature("docstring") MagneticParticleZeroFieldBuilder::buildSample "MultiLayer * MagneticParticleZeroFieldBuilder::buildSample() const
";
@@ -10104,7 +10109,7 @@ C++ includes: MagneticLayersBuilder.h
%feature("docstring") MagneticRotationBuilder::MagneticRotationBuilder "MagneticRotationBuilder::MagneticRotationBuilder()
";
-%feature("docstring") MagneticRotationBuilder::buildSample "MultiLayer * MagneticRotationBuilder::buildSample() const
+%feature("docstring") MagneticRotationBuilder::buildSample "MultiLayer * MagneticRotationBuilder::buildSample() const
";
@@ -10119,7 +10124,7 @@ C++ includes: MagneticParticlesBuilder.h
%feature("docstring") MagneticSpheresBuilder::MagneticSpheresBuilder "MagneticSpheresBuilder::MagneticSpheresBuilder()
";
-%feature("docstring") MagneticSpheresBuilder::buildSample "MultiLayer * MagneticSpheresBuilder::buildSample() const
+%feature("docstring") MagneticSpheresBuilder::buildSample "MultiLayer * MagneticSpheresBuilder::buildSample() const
";
@@ -10134,7 +10139,7 @@ C++ includes: MagneticLayersBuilder.h
%feature("docstring") MagneticSubstrateZeroFieldBuilder::MagneticSubstrateZeroFieldBuilder "MagneticSubstrateZeroFieldBuilder::MagneticSubstrateZeroFieldBuilder()
";
-%feature("docstring") MagneticSubstrateZeroFieldBuilder::buildSample "MultiLayer * MagneticSubstrateZeroFieldBuilder::buildSample() const
+%feature("docstring") MagneticSubstrateZeroFieldBuilder::buildSample "MultiLayer * MagneticSubstrateZeroFieldBuilder::buildSample() const
";
@@ -10181,7 +10186,7 @@ Returns squared refractive index.
Indicates whether the interaction with the material is scalar. This means that different polarization states will be diffracted equally
";
-%feature("docstring") Material::isMagneticMaterial "bool Material::isMagneticMaterial() const
+%feature("docstring") Material::isMagneticMaterial "bool Material::isMagneticMaterial() const
";
%feature("docstring") Material::getName "std::string Material::getName() const
@@ -10224,7 +10229,7 @@ Returns ( $ \\\\pi/\\\\lambda^2 $ - sld), sld (in $nm^{-2}$) being the scatter
Returns ( $ \\\\pi/\\\\lambda^2 $ - sld) matrix with magnetization corrections.
";
-%feature("docstring") Material::transformedMaterial "Material Material::transformedMaterial(const Transform3D &transform) const
+%feature("docstring") Material::transformedMaterial "Material Material::transformedMaterial(const Transform3D &transform) const
";
@@ -10286,24 +10291,29 @@ C++ includes: MatrixFresnelMap.h
%feature("docstring") MatrixFresnelMap::MatrixFresnelMap "MatrixFresnelMap::MatrixFresnelMap()
";
-%feature("docstring") MatrixFresnelMap::~MatrixFresnelMap "MatrixFresnelMap::~MatrixFresnelMap() final
+%feature("docstring") MatrixFresnelMap::~MatrixFresnelMap "MatrixFresnelMap::~MatrixFresnelMap()
";
-%feature("docstring") MatrixFresnelMap::getOutCoefficients "const ILayerRTCoefficients * MatrixFresnelMap::getOutCoefficients(const SimulationElement &sim_element, size_t layer_index) const finaloverride
+%feature("docstring") MatrixFresnelMap::getOutCoefficients "const ILayerRTCoefficients * MatrixFresnelMap::getOutCoefficients(const SimulationElement &sim_element, size_t layer_index) const final override
Retrieves the amplitude coefficients for a (time-reversed) outgoing wavevector.
";
-%feature("docstring") MatrixFresnelMap::getInCoefficients "const ILayerRTCoefficients * MatrixFresnelMap::getInCoefficients(const SimulationElement &sim_element, size_t layer_index) const finaloverride
+%feature("docstring") MatrixFresnelMap::getInCoefficients "const ILayerRTCoefficients * MatrixFresnelMap::getInCoefficients(const SimulationElement &sim_element, size_t layer_index) const final override
Retrieves the amplitude coefficients for an incoming wavevector.
";
-%feature("docstring") MatrixFresnelMap::setMultilayer "void MatrixFresnelMap::setMultilayer(const MultiLayer &multilayer) finaloverride
+%feature("docstring") MatrixFresnelMap::setMultilayer "void MatrixFresnelMap::setMultilayer(const MultiLayer &multilayer) final override
Sets the multilayer to be used for the Fresnel calculations.
";
+%feature("docstring") MatrixFresnelMap::fillSpecularData "void MatrixFresnelMap::fillSpecularData(SimulationElement &sim_element) const override
+
+Fills simulation element specular data.
+";
+
// File: classMatrixRTCoefficients.xml
%feature("docstring") MatrixRTCoefficients "
@@ -10319,7 +10329,7 @@ C++ includes: MatrixRTCoefficients.h
%feature("docstring") MatrixRTCoefficients::~MatrixRTCoefficients "virtual MatrixRTCoefficients::~MatrixRTCoefficients()
";
-%feature("docstring") MatrixRTCoefficients::clone "MatrixRTCoefficients * MatrixRTCoefficients::clone() const
+%feature("docstring") MatrixRTCoefficients::clone "MatrixRTCoefficients * MatrixRTCoefficients::clone() const
";
%feature("docstring") MatrixRTCoefficients::T1plus "Eigen::Vector2cd MatrixRTCoefficients::T1plus() const
@@ -10327,25 +10337,25 @@ C++ includes: MatrixRTCoefficients.h
The following functions return the transmitted and reflected amplitudes for different incoming beam polarizations and eigenmodes
";
-%feature("docstring") MatrixRTCoefficients::R1plus "Eigen::Vector2cd MatrixRTCoefficients::R1plus() const
+%feature("docstring") MatrixRTCoefficients::R1plus "Eigen::Vector2cd MatrixRTCoefficients::R1plus() const
";
-%feature("docstring") MatrixRTCoefficients::T2plus "Eigen::Vector2cd MatrixRTCoefficients::T2plus() const
+%feature("docstring") MatrixRTCoefficients::T2plus "Eigen::Vector2cd MatrixRTCoefficients::T2plus() const
";
-%feature("docstring") MatrixRTCoefficients::R2plus "Eigen::Vector2cd MatrixRTCoefficients::R2plus() const
+%feature("docstring") MatrixRTCoefficients::R2plus "Eigen::Vector2cd MatrixRTCoefficients::R2plus() const
";
-%feature("docstring") MatrixRTCoefficients::T1min "Eigen::Vector2cd MatrixRTCoefficients::T1min() const
+%feature("docstring") MatrixRTCoefficients::T1min "Eigen::Vector2cd MatrixRTCoefficients::T1min() const
";
-%feature("docstring") MatrixRTCoefficients::R1min "Eigen::Vector2cd MatrixRTCoefficients::R1min() const
+%feature("docstring") MatrixRTCoefficients::R1min "Eigen::Vector2cd MatrixRTCoefficients::R1min() const
";
-%feature("docstring") MatrixRTCoefficients::T2min "Eigen::Vector2cd MatrixRTCoefficients::T2min() const
+%feature("docstring") MatrixRTCoefficients::T2min "Eigen::Vector2cd MatrixRTCoefficients::T2min() const
";
-%feature("docstring") MatrixRTCoefficients::R2min "Eigen::Vector2cd MatrixRTCoefficients::R2min() const
+%feature("docstring") MatrixRTCoefficients::R2min "Eigen::Vector2cd MatrixRTCoefficients::R2min() const
";
%feature("docstring") MatrixRTCoefficients::getKz "virtual Eigen::Vector2cd MatrixRTCoefficients::getKz() const
@@ -10368,22 +10378,22 @@ C++ includes: MesoCrystal.h
%feature("docstring") MesoCrystal::~MesoCrystal "MesoCrystal::~MesoCrystal()
";
-%feature("docstring") MesoCrystal::clone "MesoCrystal * MesoCrystal::clone() const overridefinal
+%feature("docstring") MesoCrystal::clone "MesoCrystal * MesoCrystal::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") MesoCrystal::accept "void MesoCrystal::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") MesoCrystal::accept "void MesoCrystal::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") MesoCrystal::createSlicedParticle "SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const overridefinal
+%feature("docstring") MesoCrystal::createSlicedParticle "SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const override final
Create a sliced form factor for this particle.
";
-%feature("docstring") MesoCrystal::getChildren "std::vector< const INode * > MesoCrystal::getChildren() const overridefinal
+%feature("docstring") MesoCrystal::getChildren "std::vector< const INode * > MesoCrystal::getChildren() const override final
Returns a vector of children (const).
";
@@ -10400,7 +10410,7 @@ C++ includes: MesoCrystalBuilder.h
%feature("docstring") MesoCrystalBuilder::MesoCrystalBuilder "MesoCrystalBuilder::MesoCrystalBuilder()
";
-%feature("docstring") MesoCrystalBuilder::buildSample "MultiLayer * MesoCrystalBuilder::buildSample() const
+%feature("docstring") MesoCrystalBuilder::buildSample "MultiLayer * MesoCrystalBuilder::buildSample() const
";
@@ -10420,15 +10430,15 @@ C++ includes: MultiLayer.h
%feature("docstring") MultiLayer::~MultiLayer "MultiLayer::~MultiLayer()
";
-%feature("docstring") MultiLayer::accept "virtual void MultiLayer::accept(INodeVisitor *visitor) const finaloverride
+%feature("docstring") MultiLayer::accept "virtual void MultiLayer::accept(INodeVisitor *visitor) const final override
Calls the INodeVisitor's visit method.
";
-%feature("docstring") MultiLayer::numberOfLayers "size_t MultiLayer::numberOfLayers() const
+%feature("docstring") MultiLayer::numberOfLayers "size_t MultiLayer::numberOfLayers() const
";
-%feature("docstring") MultiLayer::numberOfInterfaces "size_t MultiLayer::numberOfInterfaces() const
+%feature("docstring") MultiLayer::numberOfInterfaces "size_t MultiLayer::numberOfInterfaces() const
";
%feature("docstring") MultiLayer::addLayer "void MultiLayer::addLayer(const Layer &layer)
@@ -10492,7 +10502,7 @@ Returns layer material.
Changes a layer's material.
";
-%feature("docstring") MultiLayer::clone "MultiLayer * MultiLayer::clone() const finaloverride
+%feature("docstring") MultiLayer::clone "MultiLayer * MultiLayer::clone() const final override
Returns a clone of multilayer with clones of all layers and recreated interfaces between layers
";
@@ -10502,7 +10512,7 @@ Returns a clone of multilayer with clones of all layers and recreated interfaces
Returns a clone with inverted magnetic fields.
";
-%feature("docstring") MultiLayer::cloneSliced "MultiLayer * MultiLayer::cloneSliced(bool use_average_layers) const
+%feature("docstring") MultiLayer::cloneSliced "std::unique_ptr< MultiLayer > MultiLayer::cloneSliced(bool use_average_layers) const
Returns a clone of multilayer where the original layers may be sliced into several sublayers for usage with the graded layer approximation
";
@@ -10554,7 +10564,7 @@ returns layer index corresponding to given global z coordinate The top interface
returns layer index corresponding to given global z coordinate The top interface position of a layer is considered to belong to the layer beneath
";
-%feature("docstring") MultiLayer::containsMagneticMaterial "bool MultiLayer::containsMagneticMaterial() const
+%feature("docstring") MultiLayer::containsMagneticMaterial "bool MultiLayer::containsMagneticMaterial() const
";
%feature("docstring") MultiLayer::containsCompatibleMaterials "bool MultiLayer::containsCompatibleMaterials() const
@@ -10567,13 +10577,13 @@ Returns true if the multilayer contains non-default materials of one type only.
precalculate the magnetic B fields in each layer
";
-%feature("docstring") MultiLayer::hasRoughness "bool MultiLayer::hasRoughness() const
+%feature("docstring") MultiLayer::hasRoughness "bool MultiLayer::hasRoughness() const
";
-%feature("docstring") MultiLayer::totalNofLayouts "size_t MultiLayer::totalNofLayouts() const
+%feature("docstring") MultiLayer::totalNofLayouts "size_t MultiLayer::totalNofLayouts() const
";
-%feature("docstring") MultiLayer::getChildren "std::vector< const INode * > MultiLayer::getChildren() const finaloverride
+%feature("docstring") MultiLayer::getChildren "std::vector< const INode * > MultiLayer::getChildren() const final override
Returns a vector of children (const).
";
@@ -10590,7 +10600,7 @@ C++ includes: MultiLayerWithRoughnessBuilder.h
%feature("docstring") MultiLayerWithRoughnessBuilder::MultiLayerWithRoughnessBuilder "MultiLayerWithRoughnessBuilder::MultiLayerWithRoughnessBuilder()
";
-%feature("docstring") MultiLayerWithRoughnessBuilder::buildSample "MultiLayer * MultiLayerWithRoughnessBuilder::buildSample() const
+%feature("docstring") MultiLayerWithRoughnessBuilder::buildSample "MultiLayer * MultiLayerWithRoughnessBuilder::buildSample() const
";
@@ -10605,7 +10615,7 @@ C++ includes: MultipleLayoutBuilder.h
%feature("docstring") MultipleLayoutBuilder::MultipleLayoutBuilder "MultipleLayoutBuilder::MultipleLayoutBuilder()
";
-%feature("docstring") MultipleLayoutBuilder::buildSample "MultiLayer * MultipleLayoutBuilder::buildSample() const
+%feature("docstring") MultipleLayoutBuilder::buildSample "MultiLayer * MultipleLayoutBuilder::buildSample() const
";
@@ -10634,10 +10644,22 @@ C++ includes: NodeIterator.h
%feature("docstring") NodeIterator::getCurrent "const INode * NodeIterator< Strategy >::getCurrent()
";
-%feature("docstring") NodeIterator::isDone "bool NodeIterator< Strategy >::isDone() const
+%feature("docstring") NodeIterator::isDone "bool NodeIterator< Strategy >::isDone() const
+";
+
+%feature("docstring") NodeIterator::depth "int NodeIterator< Strategy >::depth() const
";
-%feature("docstring") NodeIterator::depth "int NodeIterator< Strategy >::depth() const
+
+// File: classNormalizingSpecularComputationTerm.xml
+%feature("docstring") NormalizingSpecularComputationTerm "
+
+Computes the specular scattering. Used by DWBAComputation. Differs from SpecularComputationTerm by multilying intensity by normalization factor $sin \\\\alpha / \\\\Omega$.
+
+C++ includes: NormalizingSpecularComputationTerm.h
+";
+
+%feature("docstring") NormalizingSpecularComputationTerm::NormalizingSpecularComputationTerm "NormalizingSpecularComputationTerm::NormalizingSpecularComputationTerm(const MultiLayer *p_multi_layer, const IFresnelMap *p_fresnel_map)
";
@@ -10675,7 +10697,7 @@ C++ includes: OffSpecSimulation.h
%feature("docstring") OffSpecSimulation::~OffSpecSimulation "OffSpecSimulation::~OffSpecSimulation() final
";
-%feature("docstring") OffSpecSimulation::clone "OffSpecSimulation* OffSpecSimulation::clone() const
+%feature("docstring") OffSpecSimulation::clone "OffSpecSimulation* OffSpecSimulation::clone() const
";
%feature("docstring") OffSpecSimulation::accept "void OffSpecSimulation::accept(INodeVisitor *visitor) const final
@@ -10740,10 +10762,10 @@ C++ includes: OrderedMap.h
%feature("docstring") OrderedMap::clear "void OrderedMap< Key, Object >::clear()
";
-%feature("docstring") OrderedMap::begin "const_iterator OrderedMap< Key, Object >::begin() const
+%feature("docstring") OrderedMap::begin "const_iterator OrderedMap< Key, Object >::begin() const
";
-%feature("docstring") OrderedMap::end "const_iterator OrderedMap< Key, Object >::end() const
+%feature("docstring") OrderedMap::end "const_iterator OrderedMap< Key, Object >::end() const
";
%feature("docstring") OrderedMap::begin "iterator OrderedMap< Key, Object >::begin()
@@ -10761,7 +10783,7 @@ C++ includes: OrderedMap.h
%feature("docstring") OrderedMap::find "iterator OrderedMap< Key, Object >::find(const Key &key)
";
-%feature("docstring") OrderedMap::find "const_iterator OrderedMap< Key, Object >::find(const Key &key) const
+%feature("docstring") OrderedMap::find "const_iterator OrderedMap< Key, Object >::find(const Key &key) const
";
%feature("docstring") OrderedMap::erase "size_t OrderedMap< Key, Object >::erase(const Key &key)
@@ -10795,7 +10817,7 @@ C++ includes: OutputData.h
%feature("docstring") OutputData::~OutputData "OutputData< T >::~OutputData()
";
-%feature("docstring") OutputData::clone "OutputData< T > * OutputData< T >::clone() const
+%feature("docstring") OutputData::clone "OutputData< T > * OutputData< T >::clone() const
";
%feature("docstring") OutputData::copyFrom "void OutputData< T >::copyFrom(const OutputData< T > &x)
@@ -10804,7 +10826,7 @@ C++ includes: OutputData.h
%feature("docstring") OutputData::copyShapeFrom "void OutputData< T >::copyShapeFrom(const OutputData< U > &other)
";
-%feature("docstring") OutputData::meanValues "OutputData< double > * OutputData< T >::meanValues() const
+%feature("docstring") OutputData::meanValues "OutputData< double > * OutputData< T >::meanValues() const
";
%feature("docstring") OutputData::addAxis "void OutputData< T >::addAxis(const IAxis &new_axis)
@@ -11273,7 +11295,7 @@ get number of samples for this distribution
get the sigma factor
";
-%feature("docstring") ParameterDistribution::getDistribution "const IDistribution1D * ParameterDistribution::getDistribution() const
+%feature("docstring") ParameterDistribution::getDistribution "const IDistribution1D * ParameterDistribution::getDistribution() const
";
%feature("docstring") ParameterDistribution::getDistribution "IDistribution1D * ParameterDistribution::getDistribution()
@@ -11289,13 +11311,13 @@ generate list of sampled values with their weight
get list of linked parameter names
";
-%feature("docstring") ParameterDistribution::getLimits "RealLimits ParameterDistribution::getLimits() const
+%feature("docstring") ParameterDistribution::getLimits "RealLimits ParameterDistribution::getLimits() const
";
-%feature("docstring") ParameterDistribution::getMinValue "double ParameterDistribution::getMinValue() const
+%feature("docstring") ParameterDistribution::getMinValue "double ParameterDistribution::getMinValue() const
";
-%feature("docstring") ParameterDistribution::getMaxValue "double ParameterDistribution::getMaxValue() const
+%feature("docstring") ParameterDistribution::getMaxValue "double ParameterDistribution::getMaxValue() const
";
@@ -11319,7 +11341,7 @@ C++ includes: ParameterPattern.h
%feature("docstring") ParameterPattern::add "ParameterPattern & ParameterPattern::add(std::string object_type)
";
-%feature("docstring") ParameterPattern::toStdString "std::string ParameterPattern::toStdString() const
+%feature("docstring") ParameterPattern::toStdString "std::string ParameterPattern::toStdString() const
";
@@ -11406,7 +11428,7 @@ Sets value of the nonzero parameters that match pattern ('*' allowed), or throw
Sets value of the one parameter that matches pattern ('*' allowed), or throws.
";
-%feature("docstring") ParameterPool::parameterNames "std::vector< std::string > ParameterPool::parameterNames() const
+%feature("docstring") ParameterPool::parameterNames "std::vector< std::string > ParameterPool::parameterNames() const
";
%feature("docstring") ParameterPool::removeParameter "void ParameterPool::removeParameter(const std::string &name)
@@ -11447,17 +11469,17 @@ C++ includes: Particle.h
%feature("docstring") Particle::Particle "Particle::Particle(Material material, const IFormFactor &form_factor, const IRotation &rotation)
";
-%feature("docstring") Particle::clone "Particle * Particle::clone() const overridefinal
+%feature("docstring") Particle::clone "Particle * Particle::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") Particle::accept "void Particle::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") Particle::accept "void Particle::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") Particle::createSlicedParticle "SlicedParticle Particle::createSlicedParticle(ZLimits limits) const overridefinal
+%feature("docstring") Particle::createSlicedParticle "SlicedParticle Particle::createSlicedParticle(ZLimits limits) const override final
Create a sliced form factor for this particle.
";
@@ -11465,7 +11487,7 @@ Create a sliced form factor for this particle.
%feature("docstring") Particle::setMaterial "void Particle::setMaterial(Material material)
";
-%feature("docstring") Particle::material "const Material* Particle::material() const overridefinal
+%feature("docstring") Particle::material "const Material* Particle::material() const override final
Returns nullptr, unless overwritten to return a specific material.
";
@@ -11473,7 +11495,7 @@ Returns nullptr, unless overwritten to return a specific material.
%feature("docstring") Particle::setFormFactor "void Particle::setFormFactor(const IFormFactor &form_factor)
";
-%feature("docstring") Particle::getChildren "std::vector< const INode * > Particle::getChildren() const overridefinal
+%feature("docstring") Particle::getChildren "std::vector< const INode * > Particle::getChildren() const override final
Returns a vector of children (const).
";
@@ -11496,17 +11518,17 @@ C++ includes: ParticleComposition.h
%feature("docstring") ParticleComposition::~ParticleComposition "ParticleComposition::~ParticleComposition()
";
-%feature("docstring") ParticleComposition::clone "ParticleComposition * ParticleComposition::clone() const overridefinal
+%feature("docstring") ParticleComposition::clone "ParticleComposition * ParticleComposition::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") ParticleComposition::accept "void ParticleComposition::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") ParticleComposition::accept "void ParticleComposition::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") ParticleComposition::createFormFactor "IFormFactor * ParticleComposition::createFormFactor() const overridefinal
+%feature("docstring") ParticleComposition::createFormFactor "IFormFactor * ParticleComposition::createFormFactor() const override final
Create a form factor for this particle.
";
@@ -11525,17 +11547,17 @@ Create a form factor for this particle.
Returns number of different particles.
";
-%feature("docstring") ParticleComposition::getChildren "std::vector< const INode * > ParticleComposition::getChildren() const overridefinal
+%feature("docstring") ParticleComposition::getChildren "std::vector< const INode * > ParticleComposition::getChildren() const override final
Returns a vector of children (const).
";
-%feature("docstring") ParticleComposition::decompose "SafePointerVector< IParticle > ParticleComposition::decompose() const overridefinal
+%feature("docstring") ParticleComposition::decompose "SafePointerVector< IParticle > ParticleComposition::decompose() const override final
Decompose in constituent IParticle objects.
";
-%feature("docstring") ParticleComposition::bottomTopZ "ParticleLimits ParticleComposition::bottomTopZ() const overridefinal
+%feature("docstring") ParticleComposition::bottomTopZ "ParticleLimits ParticleComposition::bottomTopZ() const override final
Top and bottom z-coordinate.
";
@@ -11552,7 +11574,7 @@ C++ includes: ParticleCompositionBuilder.h
%feature("docstring") ParticleCompositionBuilder::ParticleCompositionBuilder "ParticleCompositionBuilder::ParticleCompositionBuilder()
";
-%feature("docstring") ParticleCompositionBuilder::buildSample "MultiLayer * ParticleCompositionBuilder::buildSample() const
+%feature("docstring") ParticleCompositionBuilder::buildSample "MultiLayer * ParticleCompositionBuilder::buildSample() const
";
@@ -11570,28 +11592,28 @@ C++ includes: ParticleCoreShell.h
%feature("docstring") ParticleCoreShell::~ParticleCoreShell "ParticleCoreShell::~ParticleCoreShell()
";
-%feature("docstring") ParticleCoreShell::clone "ParticleCoreShell * ParticleCoreShell::clone() const overridefinal
+%feature("docstring") ParticleCoreShell::clone "ParticleCoreShell * ParticleCoreShell::clone() const override final
Returns a clone of this ISample object.
";
-%feature("docstring") ParticleCoreShell::accept "void ParticleCoreShell::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") ParticleCoreShell::accept "void ParticleCoreShell::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
-%feature("docstring") ParticleCoreShell::createSlicedParticle "SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const overridefinal
+%feature("docstring") ParticleCoreShell::createSlicedParticle "SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const override final
Create a sliced form factor for this particle.
";
-%feature("docstring") ParticleCoreShell::coreParticle "const Particle * ParticleCoreShell::coreParticle() const
+%feature("docstring") ParticleCoreShell::coreParticle "const Particle * ParticleCoreShell::coreParticle() const
";
-%feature("docstring") ParticleCoreShell::shellParticle "const Particle * ParticleCoreShell::shellParticle() const
+%feature("docstring") ParticleCoreShell::shellParticle "const Particle * ParticleCoreShell::shellParticle() const
";
-%feature("docstring") ParticleCoreShell::getChildren "std::vector< const INode * > ParticleCoreShell::getChildren() const overridefinal
+%feature("docstring") ParticleCoreShell::getChildren "std::vector< const INode * > ParticleCoreShell::getChildren() const override final
Returns a vector of children (const).
";
@@ -11608,17 +11630,17 @@ C++ includes: ParticleDistribution.h
%feature("docstring") ParticleDistribution::ParticleDistribution "ParticleDistribution::ParticleDistribution(const IParticle &prototype, const ParameterDistribution &par_distr)
";
-%feature("docstring") ParticleDistribution::clone "ParticleDistribution * ParticleDistribution::clone() const finaloverride
+%feature("docstring") ParticleDistribution::clone "ParticleDistribution * ParticleDistribution::clone() const final override
Returns a clone of this ISample object.
";
-%feature("docstring") ParticleDistribution::accept "void ParticleDistribution::accept(INodeVisitor *visitor) const finaloverride
+%feature("docstring") ParticleDistribution::accept "void ParticleDistribution::accept(INodeVisitor *visitor) const final override
Calls the INodeVisitor's visit method.
";
-%feature("docstring") ParticleDistribution::translate "void ParticleDistribution::translate(kvector_t translation) finaloverride
+%feature("docstring") ParticleDistribution::translate "void ParticleDistribution::translate(kvector_t translation) final override
Translates the particle with the given vector.
";
@@ -11640,7 +11662,7 @@ Returns the prototype particle, used for generating multiple ones.
Returns the distributed parameter data.
";
-%feature("docstring") ParticleDistribution::getChildren "std::vector< const INode * > ParticleDistribution::getChildren() const finaloverride
+%feature("docstring") ParticleDistribution::getChildren "std::vector< const INode * > ParticleDistribution::getChildren() const final override
Returns a vector of children (const).
";
@@ -11660,7 +11682,7 @@ C++ includes: ParticleInTheAirBuilder.h
%feature("docstring") ParticleInTheAirBuilder::~ParticleInTheAirBuilder "ParticleInTheAirBuilder::~ParticleInTheAirBuilder()
";
-%feature("docstring") ParticleInTheAirBuilder::buildSample "MultiLayer * ParticleInTheAirBuilder::buildSample() const
+%feature("docstring") ParticleInTheAirBuilder::buildSample "MultiLayer * ParticleInTheAirBuilder::buildSample() const
";
%feature("docstring") ParticleInTheAirBuilder::createSample "MultiLayer * ParticleInTheAirBuilder::createSample(size_t index=0)
@@ -11690,15 +11712,15 @@ C++ includes: ParticleLayout.h
%feature("docstring") ParticleLayout::~ParticleLayout "ParticleLayout::~ParticleLayout()
";
-%feature("docstring") ParticleLayout::clone "ParticleLayout * ParticleLayout::clone() const finaloverride
+%feature("docstring") ParticleLayout::clone "ParticleLayout * ParticleLayout::clone() const final override
Returns a clone of this ISample object.
";
-%feature("docstring") ParticleLayout::cloneWithOffset "ParticleLayout * ParticleLayout::cloneWithOffset(double offset) const finaloverride
+%feature("docstring") ParticleLayout::cloneWithOffset "ParticleLayout * ParticleLayout::cloneWithOffset(double offset) const final override
";
-%feature("docstring") ParticleLayout::accept "void ParticleLayout::accept(INodeVisitor *visitor) const finaloverride
+%feature("docstring") ParticleLayout::accept "void ParticleLayout::accept(INodeVisitor *visitor) const final override
Calls the INodeVisitor's visit method.
";
@@ -11759,12 +11781,12 @@ rotation:
Particle rotation
";
-%feature("docstring") ParticleLayout::particles "SafePointerVector< const IParticle > ParticleLayout::particles() const finaloverride
+%feature("docstring") ParticleLayout::particles "SafePointerVector< const IParticle > ParticleLayout::particles() const final override
Returns information on all particles (type and abundance) and generates new particles if an IAbstractParticle denotes a collection
";
-%feature("docstring") ParticleLayout::getTotalAbundance "double ParticleLayout::getTotalAbundance() const finaloverride
+%feature("docstring") ParticleLayout::getTotalAbundance "double ParticleLayout::getTotalAbundance() const final override
Get total abundance of all particles.
";
@@ -11774,17 +11796,17 @@ Get total abundance of all particles.
Adds interference functions.
";
-%feature("docstring") ParticleLayout::totalParticleSurfaceDensity "double ParticleLayout::totalParticleSurfaceDensity() const finaloverride
+%feature("docstring") ParticleLayout::totalParticleSurfaceDensity "double ParticleLayout::totalParticleSurfaceDensity() const final override
Returns surface density of all particles.
";
-%feature("docstring") ParticleLayout::setTotalParticleSurfaceDensity "void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) finaloverride
+%feature("docstring") ParticleLayout::setTotalParticleSurfaceDensity "void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) final override
Sets total particle surface density. particle_density: number of particles per square nanometer
";
-%feature("docstring") ParticleLayout::getChildren "std::vector< const INode * > ParticleLayout::getChildren() const finaloverride
+%feature("docstring") ParticleLayout::getChildren "std::vector< const INode * > ParticleLayout::getChildren() const final override
Returns a vector of children (const).
";
@@ -11825,7 +11847,7 @@ C++ includes: PoissonNoiseBackground.h
%feature("docstring") PoissonNoiseBackground::~PoissonNoiseBackground "PoissonNoiseBackground::~PoissonNoiseBackground()
";
-%feature("docstring") PoissonNoiseBackground::clone "PoissonNoiseBackground * PoissonNoiseBackground::clone() const overridefinal
+%feature("docstring") PoissonNoiseBackground::clone "PoissonNoiseBackground * PoissonNoiseBackground::clone() const override final
";
%feature("docstring") PoissonNoiseBackground::accept "void PoissonNoiseBackground::accept(INodeVisitor *visitor) const override
@@ -11833,7 +11855,7 @@ C++ includes: PoissonNoiseBackground.h
Calls the INodeVisitor's visit method.
";
-%feature("docstring") PoissonNoiseBackground::addBackGround "void PoissonNoiseBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const overridefinal
+%feature("docstring") PoissonNoiseBackground::addBackGround "void PoissonNoiseBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const override final
";
@@ -11866,7 +11888,7 @@ Vector of y-coordinates of polygon points.
%feature("docstring") Polygon::~Polygon "Polygon::~Polygon()
";
-%feature("docstring") Polygon::clone "virtual Polygon* Polygon::clone() const
+%feature("docstring") Polygon::clone "virtual Polygon* Polygon::clone() const
";
%feature("docstring") Polygon::contains "bool Polygon::contains(double x, double y) const
@@ -11879,10 +11901,10 @@ Returns true if point with given coordinates is inside or on border of the shape
Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition).
";
-%feature("docstring") Polygon::getArea "double Polygon::getArea() const
+%feature("docstring") Polygon::getArea "double Polygon::getArea() const
";
-%feature("docstring") Polygon::getPoints "void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const
+%feature("docstring") Polygon::getPoints "void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const
";
@@ -11919,16 +11941,16 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") PolyhedralEdge::PolyhedralEdge "PolyhedralEdge::PolyhedralEdge(const kvector_t _Vlow, const kvector_t _Vhig)
";
-%feature("docstring") PolyhedralEdge::E "kvector_t PolyhedralEdge::E() const
+%feature("docstring") PolyhedralEdge::E "kvector_t PolyhedralEdge::E() const
";
-%feature("docstring") PolyhedralEdge::R "kvector_t PolyhedralEdge::R() const
+%feature("docstring") PolyhedralEdge::R "kvector_t PolyhedralEdge::R() const
";
-%feature("docstring") PolyhedralEdge::qE "complex_t PolyhedralEdge::qE(cvector_t q) const
+%feature("docstring") PolyhedralEdge::qE "complex_t PolyhedralEdge::qE(cvector_t q) const
";
-%feature("docstring") PolyhedralEdge::qR "complex_t PolyhedralEdge::qR(cvector_t q) const
+%feature("docstring") PolyhedralEdge::qR "complex_t PolyhedralEdge::qR(cvector_t q) const
";
%feature("docstring") PolyhedralEdge::contrib "complex_t PolyhedralEdge::contrib(int m, cvector_t qpa, complex_t qrperp) const
@@ -11959,16 +11981,16 @@ _sym_S2:
true if face has a perpedicular two-fold symmetry axis
";
-%feature("docstring") PolyhedralFace::area "double PolyhedralFace::area() const
+%feature("docstring") PolyhedralFace::area "double PolyhedralFace::area() const
";
-%feature("docstring") PolyhedralFace::center "kvector_t PolyhedralFace::center() const
+%feature("docstring") PolyhedralFace::center "kvector_t PolyhedralFace::center() const
";
-%feature("docstring") PolyhedralFace::pyramidalVolume "double PolyhedralFace::pyramidalVolume() const
+%feature("docstring") PolyhedralFace::pyramidalVolume "double PolyhedralFace::pyramidalVolume() const
";
-%feature("docstring") PolyhedralFace::radius3d "double PolyhedralFace::radius3d() const
+%feature("docstring") PolyhedralFace::radius3d "double PolyhedralFace::radius3d() const
";
%feature("docstring") PolyhedralFace::normalProjectionConj "complex_t PolyhedralFace::normalProjectionConj(cvector_t q) const
@@ -12012,7 +12034,7 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") PostorderStrategy::PostorderStrategy "PostorderStrategy::PostorderStrategy()
";
-%feature("docstring") PostorderStrategy::clone "PostorderStrategy * PostorderStrategy::clone() const
+%feature("docstring") PostorderStrategy::clone "PostorderStrategy * PostorderStrategy::clone() const
";
%feature("docstring") PostorderStrategy::~PostorderStrategy "PostorderStrategy::~PostorderStrategy()
@@ -12021,10 +12043,10 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") PostorderStrategy::first "IteratorMemento PostorderStrategy::first(const INode *p_root)
";
-%feature("docstring") PostorderStrategy::next "void PostorderStrategy::next(IteratorMemento &iterator_stack) const
+%feature("docstring") PostorderStrategy::next "void PostorderStrategy::next(IteratorMemento &iterator_stack) const
";
-%feature("docstring") PostorderStrategy::isDone "bool PostorderStrategy::isDone(IteratorMemento &iterator_stack) const
+%feature("docstring") PostorderStrategy::isDone "bool PostorderStrategy::isDone(IteratorMemento &iterator_stack) const
";
@@ -12034,7 +12056,7 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") PreorderStrategy::PreorderStrategy "PreorderStrategy::PreorderStrategy()
";
-%feature("docstring") PreorderStrategy::clone "PreorderStrategy * PreorderStrategy::clone() const
+%feature("docstring") PreorderStrategy::clone "PreorderStrategy * PreorderStrategy::clone() const
";
%feature("docstring") PreorderStrategy::~PreorderStrategy "PreorderStrategy::~PreorderStrategy()
@@ -12043,10 +12065,10 @@ C++ includes: FormFactorPolyhedron.h
%feature("docstring") PreorderStrategy::first "IteratorMemento PreorderStrategy::first(const INode *p_root)
";
-%feature("docstring") PreorderStrategy::next "void PreorderStrategy::next(IteratorMemento &iterator_stack) const
+%feature("docstring") PreorderStrategy::next "void PreorderStrategy::next(IteratorMemento &iterator_stack) const
";
-%feature("docstring") PreorderStrategy::isDone "bool PreorderStrategy::isDone(IteratorMemento &iterator_stack) const
+%feature("docstring") PreorderStrategy::isDone "bool PreorderStrategy::isDone(IteratorMemento &iterator_stack) const
";
@@ -12113,7 +12135,7 @@ C++ includes: ParaCrystalBuilder.h
%feature("docstring") RadialParaCrystalBuilder::RadialParaCrystalBuilder "RadialParaCrystalBuilder::RadialParaCrystalBuilder()
";
-%feature("docstring") RadialParaCrystalBuilder::buildSample "MultiLayer * RadialParaCrystalBuilder::buildSample() const
+%feature("docstring") RadialParaCrystalBuilder::buildSample "MultiLayer * RadialParaCrystalBuilder::buildSample() const
";
@@ -12128,7 +12150,7 @@ C++ includes: RealParameter.h
%feature("docstring") RealParameter::RealParameter "RealParameter::RealParameter(const std::string &name, double *par, const std::string &parent_name=std::string(), const std::function< void()> &onChange=std::function< void()>(), const RealLimits &limits=RealLimits::limitless(), const Attributes &attr=Attributes::free())
";
-%feature("docstring") RealParameter::clone "RealParameter * RealParameter::clone(const std::string &new_name=\"\") const
+%feature("docstring") RealParameter::clone "RealParameter * RealParameter::clone(const std::string &new_name=\"\") const
";
%feature("docstring") RealParameter::setValue "void RealParameter::setValue(double value)
@@ -12144,7 +12166,7 @@ Returns value of wrapped parameter.
%feature("docstring") RealParameter::setLimits "RealParameter & RealParameter::setLimits(const RealLimits &limits)
";
-%feature("docstring") RealParameter::limits "RealLimits RealParameter::limits() const
+%feature("docstring") RealParameter::limits "RealLimits RealParameter::limits() const
";
%feature("docstring") RealParameter::setLimited "RealParameter & RealParameter::setLimited(double lower, double upper)
@@ -12159,7 +12181,7 @@ Returns value of wrapped parameter.
%feature("docstring") RealParameter::setUnit "RealParameter & RealParameter::setUnit(const std::string &name)
";
-%feature("docstring") RealParameter::unit "std::string RealParameter::unit() const
+%feature("docstring") RealParameter::unit "std::string RealParameter::unit() const
";
@@ -12202,7 +12224,7 @@ yup:
y-coordinate of upper right corner
";
-%feature("docstring") Rectangle::clone "Rectangle* Rectangle::clone() const
+%feature("docstring") Rectangle::clone "Rectangle* Rectangle::clone() const
";
%feature("docstring") Rectangle::contains "bool Rectangle::contains(double x, double y) const
@@ -12215,19 +12237,19 @@ Returns true if point with given coordinates is inside or on border of the shape
Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition).
";
-%feature("docstring") Rectangle::getArea "double Rectangle::getArea() const
+%feature("docstring") Rectangle::getArea "double Rectangle::getArea() const
";
-%feature("docstring") Rectangle::getXlow "double Rectangle::getXlow() const
+%feature("docstring") Rectangle::getXlow "double Rectangle::getXlow() const
";
-%feature("docstring") Rectangle::getYlow "double Rectangle::getYlow() const
+%feature("docstring") Rectangle::getYlow "double Rectangle::getYlow() const
";
-%feature("docstring") Rectangle::getXup "double Rectangle::getXup() const
+%feature("docstring") Rectangle::getXup "double Rectangle::getXup() const
";
-%feature("docstring") Rectangle::getYup "double Rectangle::getYup() const
+%feature("docstring") Rectangle::getYup "double Rectangle::getYup() const
";
@@ -12278,7 +12300,7 @@ Calls the INodeVisitor's visit method.
Inits detector with the beam settings.
";
-%feature("docstring") RectangularDetector::setPosition "void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0,-1.0, 0.0))
+%feature("docstring") RectangularDetector::setPosition "void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0, -1.0, 0.0))
";
%feature("docstring") RectangularDetector::setPerpendicularToSampleX "void RectangularDetector::setPerpendicularToSampleX(double distance, double u0, double v0)
@@ -12293,40 +12315,40 @@ Inits detector with the beam settings.
%feature("docstring") RectangularDetector::setDirectBeamPosition "void RectangularDetector::setDirectBeamPosition(double u0, double v0)
";
-%feature("docstring") RectangularDetector::getWidth "double RectangularDetector::getWidth() const
+%feature("docstring") RectangularDetector::getWidth "double RectangularDetector::getWidth() const
";
-%feature("docstring") RectangularDetector::getHeight "double RectangularDetector::getHeight() const
+%feature("docstring") RectangularDetector::getHeight "double RectangularDetector::getHeight() const
";
-%feature("docstring") RectangularDetector::getNbinsX "size_t RectangularDetector::getNbinsX() const
+%feature("docstring") RectangularDetector::getNbinsX "size_t RectangularDetector::getNbinsX() const
";
-%feature("docstring") RectangularDetector::getNbinsY "size_t RectangularDetector::getNbinsY() const
+%feature("docstring") RectangularDetector::getNbinsY "size_t RectangularDetector::getNbinsY() const
";
-%feature("docstring") RectangularDetector::getNormalVector "kvector_t RectangularDetector::getNormalVector() const
+%feature("docstring") RectangularDetector::getNormalVector "kvector_t RectangularDetector::getNormalVector() const
";
-%feature("docstring") RectangularDetector::getU0 "double RectangularDetector::getU0() const
+%feature("docstring") RectangularDetector::getU0 "double RectangularDetector::getU0() const
";
-%feature("docstring") RectangularDetector::getV0 "double RectangularDetector::getV0() const
+%feature("docstring") RectangularDetector::getV0 "double RectangularDetector::getV0() const
";
-%feature("docstring") RectangularDetector::getDirectionVector "kvector_t RectangularDetector::getDirectionVector() const
+%feature("docstring") RectangularDetector::getDirectionVector "kvector_t RectangularDetector::getDirectionVector() const
";
-%feature("docstring") RectangularDetector::getDistance "double RectangularDetector::getDistance() const
+%feature("docstring") RectangularDetector::getDistance "double RectangularDetector::getDistance() const
";
-%feature("docstring") RectangularDetector::getDirectBeamU0 "double RectangularDetector::getDirectBeamU0() const
+%feature("docstring") RectangularDetector::getDirectBeamU0 "double RectangularDetector::getDirectBeamU0() const
";
-%feature("docstring") RectangularDetector::getDirectBeamV0 "double RectangularDetector::getDirectBeamV0() const
+%feature("docstring") RectangularDetector::getDirectBeamV0 "double RectangularDetector::getDirectBeamV0() const
";
-%feature("docstring") RectangularDetector::getDetectorArrangment "RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const
+%feature("docstring") RectangularDetector::getDetectorArrangment "RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const
";
%feature("docstring") RectangularDetector::validAxesUnits "std::vector< AxesUnits > RectangularDetector::validAxesUnits() const override
@@ -12376,7 +12398,7 @@ C++ includes: ParaCrystalBuilder.h
%feature("docstring") RectParaCrystalBuilder::RectParaCrystalBuilder "RectParaCrystalBuilder::RectParaCrystalBuilder()
";
-%feature("docstring") RectParaCrystalBuilder::buildSample "MultiLayer * RectParaCrystalBuilder::buildSample() const
+%feature("docstring") RectParaCrystalBuilder::buildSample "MultiLayer * RectParaCrystalBuilder::buildSample() const
";
@@ -12441,22 +12463,22 @@ C++ includes: RegionOfInterest.h
%feature("docstring") RegionOfInterest::RegionOfInterest "RegionOfInterest::RegionOfInterest(const OutputData< double > &data, double xlow, double ylow, double xup, double yup)
";
-%feature("docstring") RegionOfInterest::clone "RegionOfInterest * RegionOfInterest::clone() const
+%feature("docstring") RegionOfInterest::clone "RegionOfInterest * RegionOfInterest::clone() const
";
%feature("docstring") RegionOfInterest::~RegionOfInterest "RegionOfInterest::~RegionOfInterest()
";
-%feature("docstring") RegionOfInterest::getXlow "double RegionOfInterest::getXlow() const
+%feature("docstring") RegionOfInterest::getXlow "double RegionOfInterest::getXlow() const
";
-%feature("docstring") RegionOfInterest::getYlow "double RegionOfInterest::getYlow() const
+%feature("docstring") RegionOfInterest::getYlow "double RegionOfInterest::getYlow() const
";
-%feature("docstring") RegionOfInterest::getXup "double RegionOfInterest::getXup() const
+%feature("docstring") RegionOfInterest::getXup "double RegionOfInterest::getXup() const
";
-%feature("docstring") RegionOfInterest::getYup "double RegionOfInterest::getYup() const
+%feature("docstring") RegionOfInterest::getYup "double RegionOfInterest::getYup() const
";
%feature("docstring") RegionOfInterest::detectorIndex "size_t RegionOfInterest::detectorIndex(size_t roiIndex) const
@@ -12479,10 +12501,10 @@ Number of detector bins in ROI area.
Number of detector bins.
";
-%feature("docstring") RegionOfInterest::isInROI "bool RegionOfInterest::isInROI(size_t detectorIndex) const
+%feature("docstring") RegionOfInterest::isInROI "bool RegionOfInterest::isInROI(size_t detectorIndex) const
";
-%feature("docstring") RegionOfInterest::clipAxisToRoi "std::unique_ptr< IAxis > RegionOfInterest::clipAxisToRoi(size_t axis_index, const IAxis &axis) const
+%feature("docstring") RegionOfInterest::clipAxisToRoi "std::unique_ptr< IAxis > RegionOfInterest::clipAxisToRoi(size_t axis_index, const IAxis &axis) const
";
@@ -12497,10 +12519,10 @@ C++ includes: ResolutionFunction2DGaussian.h
%feature("docstring") ResolutionFunction2DGaussian::ResolutionFunction2DGaussian "ResolutionFunction2DGaussian::ResolutionFunction2DGaussian(double sigma_x, double sigma_y)
";
-%feature("docstring") ResolutionFunction2DGaussian::evaluateCDF "double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const
+%feature("docstring") ResolutionFunction2DGaussian::evaluateCDF "double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const
";
-%feature("docstring") ResolutionFunction2DGaussian::clone "ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const
+%feature("docstring") ResolutionFunction2DGaussian::clone "ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const
";
%feature("docstring") ResolutionFunction2DGaussian::accept "void ResolutionFunction2DGaussian::accept(INodeVisitor *visitor) const final
@@ -12508,10 +12530,10 @@ C++ includes: ResolutionFunction2DGaussian.h
Calls the INodeVisitor's visit method.
";
-%feature("docstring") ResolutionFunction2DGaussian::getSigmaX "double ResolutionFunction2DGaussian::getSigmaX() const
+%feature("docstring") ResolutionFunction2DGaussian::getSigmaX "double ResolutionFunction2DGaussian::getSigmaX() const
";
-%feature("docstring") ResolutionFunction2DGaussian::getSigmaY "double ResolutionFunction2DGaussian::getSigmaY() const
+%feature("docstring") ResolutionFunction2DGaussian::getSigmaY "double ResolutionFunction2DGaussian::getSigmaY() const
";
@@ -12546,7 +12568,7 @@ C++ includes: CylindersBuilder.h
%feature("docstring") RotatedCylindersBuilder::RotatedCylindersBuilder "RotatedCylindersBuilder::RotatedCylindersBuilder()
";
-%feature("docstring") RotatedCylindersBuilder::buildSample "MultiLayer * RotatedCylindersBuilder::buildSample() const
+%feature("docstring") RotatedCylindersBuilder::buildSample "MultiLayer * RotatedCylindersBuilder::buildSample() const
";
@@ -12561,7 +12583,7 @@ C++ includes: RotatedPyramidsBuilder.h
%feature("docstring") RotatedPyramidsBuilder::RotatedPyramidsBuilder "RotatedPyramidsBuilder::RotatedPyramidsBuilder()
";
-%feature("docstring") RotatedPyramidsBuilder::buildSample "MultiLayer * RotatedPyramidsBuilder::buildSample() const
+%feature("docstring") RotatedPyramidsBuilder::buildSample "MultiLayer * RotatedPyramidsBuilder::buildSample() const
";
@@ -12576,7 +12598,7 @@ C++ includes: ParticleDistributionsBuilder.h
%feature("docstring") RotatedPyramidsDistributionBuilder::RotatedPyramidsDistributionBuilder "RotatedPyramidsDistributionBuilder::RotatedPyramidsDistributionBuilder()
";
-%feature("docstring") RotatedPyramidsDistributionBuilder::buildSample "MultiLayer * RotatedPyramidsDistributionBuilder::buildSample() const
+%feature("docstring") RotatedPyramidsDistributionBuilder::buildSample "MultiLayer * RotatedPyramidsDistributionBuilder::buildSample() const
";
@@ -12591,7 +12613,7 @@ C++ includes: TwoDimLatticeBuilder.h
%feature("docstring") RotatedSquareLatticeBuilder::RotatedSquareLatticeBuilder "RotatedSquareLatticeBuilder::RotatedSquareLatticeBuilder()
";
-%feature("docstring") RotatedSquareLatticeBuilder::buildSample "MultiLayer * RotatedSquareLatticeBuilder::buildSample() const
+%feature("docstring") RotatedSquareLatticeBuilder::buildSample "MultiLayer * RotatedSquareLatticeBuilder::buildSample() const
";
@@ -12630,13 +12652,13 @@ Returns a new IRotation object that is the current object's inverse.
Calls the INodeVisitor's visit method.
";
-%feature("docstring") RotationEuler::getAlpha "double RotationEuler::getAlpha() const
+%feature("docstring") RotationEuler::getAlpha "double RotationEuler::getAlpha() const
";
-%feature("docstring") RotationEuler::getBeta "double RotationEuler::getBeta() const
+%feature("docstring") RotationEuler::getBeta "double RotationEuler::getBeta() const
";
-%feature("docstring") RotationEuler::getGamma "double RotationEuler::getGamma() const
+%feature("docstring") RotationEuler::getGamma "double RotationEuler::getGamma() const
";
%feature("docstring") RotationEuler::getTransform3D "Transform3D RotationEuler::getTransform3D() const
@@ -12674,7 +12696,7 @@ Returns a new IRotation object that is the current object's inverse.
Calls the INodeVisitor's visit method.
";
-%feature("docstring") RotationX::getAngle "double RotationX::getAngle() const
+%feature("docstring") RotationX::getAngle "double RotationX::getAngle() const
";
%feature("docstring") RotationX::getTransform3D "Transform3D RotationX::getTransform3D() const
@@ -12712,7 +12734,7 @@ Returns a new IRotation object that is the current object's inverse.
Calls the INodeVisitor's visit method.
";
-%feature("docstring") RotationY::getAngle "double RotationY::getAngle() const
+%feature("docstring") RotationY::getAngle "double RotationY::getAngle() const
";
%feature("docstring") RotationY::getTransform3D "Transform3D RotationY::getTransform3D() const
@@ -12750,7 +12772,7 @@ Returns a new IRotation object that is the current object's inverse.
Calls the INodeVisitor's visit method.
";
-%feature("docstring") RotationZ::getAngle "double RotationZ::getAngle() const
+%feature("docstring") RotationZ::getAngle "double RotationZ::getAngle() const
";
%feature("docstring") RotationZ::getTransform3D "Transform3D RotationZ::getTransform3D() const
@@ -12805,10 +12827,10 @@ C++ includes: SafePointerVector.h
%feature("docstring") SafePointerVector::~SafePointerVector "SafePointerVector< T >::~SafePointerVector()
";
-%feature("docstring") SafePointerVector::size "size_t SafePointerVector< T >::size() const
+%feature("docstring") SafePointerVector::size "size_t SafePointerVector< T >::size() const
";
-%feature("docstring") SafePointerVector::empty "bool SafePointerVector< T >::empty() const
+%feature("docstring") SafePointerVector::empty "bool SafePointerVector< T >::empty() const
";
%feature("docstring") SafePointerVector::push_back "void SafePointerVector< T >::push_back(T *pointer)
@@ -12817,13 +12839,13 @@ C++ includes: SafePointerVector.h
%feature("docstring") SafePointerVector::begin "iterator SafePointerVector< T >::begin()
";
-%feature("docstring") SafePointerVector::begin "const_iterator SafePointerVector< T >::begin() const
+%feature("docstring") SafePointerVector::begin "const_iterator SafePointerVector< T >::begin() const
";
%feature("docstring") SafePointerVector::end "iterator SafePointerVector< T >::end()
";
-%feature("docstring") SafePointerVector::end "const_iterator SafePointerVector< T >::end() const
+%feature("docstring") SafePointerVector::end "const_iterator SafePointerVector< T >::end() const
";
%feature("docstring") SafePointerVector::deleteElement "bool SafePointerVector< T >::deleteElement(T *pointer)
@@ -12832,7 +12854,7 @@ C++ includes: SafePointerVector.h
%feature("docstring") SafePointerVector::back "T* SafePointerVector< T >::back()
";
-%feature("docstring") SafePointerVector::back "const T* SafePointerVector< T >::back() const
+%feature("docstring") SafePointerVector::back "const T* SafePointerVector< T >::back() const
";
%feature("docstring") SafePointerVector::clear "void SafePointerVector< T >::clear()
@@ -13092,16 +13114,21 @@ C++ includes: ScalarFresnelMap.h
%feature("docstring") ScalarFresnelMap::~ScalarFresnelMap "ScalarFresnelMap::~ScalarFresnelMap() final
";
-%feature("docstring") ScalarFresnelMap::getOutCoefficients "const ILayerRTCoefficients * ScalarFresnelMap::getOutCoefficients(const SimulationElement &sim_element, size_t layer_index) const finaloverride
+%feature("docstring") ScalarFresnelMap::getOutCoefficients "const ILayerRTCoefficients * ScalarFresnelMap::getOutCoefficients(const SimulationElement &sim_element, size_t layer_index) const final override
Retrieves the amplitude coefficients for a (time-reversed) outgoing wavevector.
";
-%feature("docstring") ScalarFresnelMap::getInCoefficients "const ILayerRTCoefficients * ScalarFresnelMap::getInCoefficients(const SimulationElement &sim_element, size_t layer_index) const finaloverride
+%feature("docstring") ScalarFresnelMap::getInCoefficients "const ILayerRTCoefficients * ScalarFresnelMap::getInCoefficients(const SimulationElement &sim_element, size_t layer_index) const final override
Retrieves the amplitude coefficients for an incoming wavevector.
";
+%feature("docstring") ScalarFresnelMap::fillSpecularData "void ScalarFresnelMap::fillSpecularData(SimulationElement &sim_element) const override
+
+Fills simulation element specular data.
+";
+
// File: classScalarRTCoefficients.xml
%feature("docstring") ScalarRTCoefficients "
@@ -13117,7 +13144,7 @@ C++ includes: ScalarRTCoefficients.h
%feature("docstring") ScalarRTCoefficients::~ScalarRTCoefficients "virtual ScalarRTCoefficients::~ScalarRTCoefficients()
";
-%feature("docstring") ScalarRTCoefficients::clone "ScalarRTCoefficients * ScalarRTCoefficients::clone() const
+%feature("docstring") ScalarRTCoefficients::clone "ScalarRTCoefficients * ScalarRTCoefficients::clone() const
";
%feature("docstring") ScalarRTCoefficients::T1plus "Eigen::Vector2cd ScalarRTCoefficients::T1plus() const
@@ -13125,25 +13152,25 @@ C++ includes: ScalarRTCoefficients.h
The following functions return the transmitted and reflected amplitudes for different incoming beam polarizations and eigenmodes
";
-%feature("docstring") ScalarRTCoefficients::R1plus "Eigen::Vector2cd ScalarRTCoefficients::R1plus() const
+%feature("docstring") ScalarRTCoefficients::R1plus "Eigen::Vector2cd ScalarRTCoefficients::R1plus() const
";
-%feature("docstring") ScalarRTCoefficients::T2plus "Eigen::Vector2cd ScalarRTCoefficients::T2plus() const
+%feature("docstring") ScalarRTCoefficients::T2plus "Eigen::Vector2cd ScalarRTCoefficients::T2plus() const
";
-%feature("docstring") ScalarRTCoefficients::R2plus "Eigen::Vector2cd ScalarRTCoefficients::R2plus() const
+%feature("docstring") ScalarRTCoefficients::R2plus "Eigen::Vector2cd ScalarRTCoefficients::R2plus() const
";
-%feature("docstring") ScalarRTCoefficients::T1min "Eigen::Vector2cd ScalarRTCoefficients::T1min() const
+%feature("docstring") ScalarRTCoefficients::T1min "Eigen::Vector2cd ScalarRTCoefficients::T1min() const
";
-%feature("docstring") ScalarRTCoefficients::R1min "Eigen::Vector2cd ScalarRTCoefficients::R1min() const
+%feature("docstring") ScalarRTCoefficients::R1min "Eigen::Vector2cd ScalarRTCoefficients::R1min() const
";
-%feature("docstring") ScalarRTCoefficients::T2min "Eigen::Vector2cd ScalarRTCoefficients::T2min() const
+%feature("docstring") ScalarRTCoefficients::T2min "Eigen::Vector2cd ScalarRTCoefficients::T2min() const
";
-%feature("docstring") ScalarRTCoefficients::R2min "Eigen::Vector2cd ScalarRTCoefficients::R2min() const
+%feature("docstring") ScalarRTCoefficients::R2min "Eigen::Vector2cd ScalarRTCoefficients::R2min() const
";
%feature("docstring") ScalarRTCoefficients::getKz "Eigen::Vector2cd ScalarRTCoefficients::getKz() const
@@ -13156,10 +13183,10 @@ Returns z-part of the two wavevector eigenmodes.
Scalar value getters; these throw errors by default as they should only be used when the derived object is really scalar
";
-%feature("docstring") ScalarRTCoefficients::getScalarR "complex_t ScalarRTCoefficients::getScalarR() const
+%feature("docstring") ScalarRTCoefficients::getScalarR "complex_t ScalarRTCoefficients::getScalarR() const
";
-%feature("docstring") ScalarRTCoefficients::getScalarKz "virtual complex_t ScalarRTCoefficients::getScalarKz() const
+%feature("docstring") ScalarRTCoefficients::getScalarKz "virtual complex_t ScalarRTCoefficients::getScalarKz() const
";
@@ -13184,10 +13211,10 @@ C++ includes: ISelectionRule.h
%feature("docstring") SimpleSelectionRule::~SimpleSelectionRule "virtual SimpleSelectionRule::~SimpleSelectionRule()
";
-%feature("docstring") SimpleSelectionRule::clone "SimpleSelectionRule * SimpleSelectionRule::clone() const
+%feature("docstring") SimpleSelectionRule::clone "SimpleSelectionRule * SimpleSelectionRule::clone() const
";
-%feature("docstring") SimpleSelectionRule::coordinateSelected "bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const
+%feature("docstring") SimpleSelectionRule::coordinateSelected "bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const
";
@@ -13229,7 +13256,7 @@ Run simulation with possible averaging over parameter distributions.
%feature("docstring") Simulation::setInstrument "void Simulation::setInstrument(const Instrument &instrument)
";
-%feature("docstring") Simulation::getInstrument "const Instrument& Simulation::getInstrument() const
+%feature("docstring") Simulation::getInstrument "const Instrument& Simulation::getInstrument() const
";
%feature("docstring") Simulation::getInstrument "Instrument& Simulation::getInstrument()
@@ -13238,7 +13265,7 @@ Run simulation with possible averaging over parameter distributions.
%feature("docstring") Simulation::setBeamIntensity "void Simulation::setBeamIntensity(double intensity)
";
-%feature("docstring") Simulation::getBeamIntensity "double Simulation::getBeamIntensity() const
+%feature("docstring") Simulation::getBeamIntensity "double Simulation::getBeamIntensity() const
";
%feature("docstring") Simulation::setBeamPolarization "void Simulation::setBeamPolarization(const kvector_t bloch_vector)
@@ -13262,7 +13289,7 @@ Sets the polarization analyzer characteristics of the detector.
The MultiLayer object will not be owned by the Simulation object.
";
-%feature("docstring") Simulation::sample "const MultiLayer * Simulation::sample() const
+%feature("docstring") Simulation::sample "const MultiLayer * Simulation::sample() const
";
%feature("docstring") Simulation::setSampleBuilder "void Simulation::setSampleBuilder(const std::shared_ptr< IMultiLayerBuilder > sample_builder)
@@ -13271,7 +13298,7 @@ The MultiLayer object will not be owned by the Simulation object.
%feature("docstring") Simulation::setBackground "void Simulation::setBackground(const IBackground &bg)
";
-%feature("docstring") Simulation::background "const IBackground* Simulation::background() const
+%feature("docstring") Simulation::background "const IBackground* Simulation::background() const
";
%feature("docstring") Simulation::numberOfSimulationElements "virtual size_t Simulation::numberOfSimulationElements() const =0
@@ -13288,13 +13315,13 @@ Clone simulated intensity map.
%feature("docstring") Simulation::addParameterDistribution "void Simulation::addParameterDistribution(const ParameterDistribution &par_distr)
";
-%feature("docstring") Simulation::getDistributionHandler "const DistributionHandler& Simulation::getDistributionHandler() const
+%feature("docstring") Simulation::getDistributionHandler "const DistributionHandler& Simulation::getDistributionHandler() const
";
%feature("docstring") Simulation::setOptions "void Simulation::setOptions(const SimulationOptions &options)
";
-%feature("docstring") Simulation::getOptions "const SimulationOptions& Simulation::getOptions() const
+%feature("docstring") Simulation::getOptions "const SimulationOptions& Simulation::getOptions() const
";
%feature("docstring") Simulation::getOptions "SimulationOptions& Simulation::getOptions()
@@ -13339,7 +13366,7 @@ C++ includes: SimulationArea.h
returns true if given iterator index correspond to masked detector channel
";
-%feature("docstring") SimulationArea::totalSize "size_t SimulationArea::totalSize() const
+%feature("docstring") SimulationArea::totalSize "size_t SimulationArea::totalSize() const
";
%feature("docstring") SimulationArea::roiIndex "size_t SimulationArea::roiIndex(size_t index) const
@@ -13364,16 +13391,16 @@ C++ includes: SimulationAreaIterator.h
%feature("docstring") SimulationAreaIterator::SimulationAreaIterator "SimulationAreaIterator::SimulationAreaIterator(const SimulationArea *area, size_t start_at_index)
";
-%feature("docstring") SimulationAreaIterator::index "size_t SimulationAreaIterator::index() const
+%feature("docstring") SimulationAreaIterator::index "size_t SimulationAreaIterator::index() const
";
-%feature("docstring") SimulationAreaIterator::elementIndex "size_t SimulationAreaIterator::elementIndex() const
+%feature("docstring") SimulationAreaIterator::elementIndex "size_t SimulationAreaIterator::elementIndex() const
";
-%feature("docstring") SimulationAreaIterator::roiIndex "size_t SimulationAreaIterator::roiIndex() const
+%feature("docstring") SimulationAreaIterator::roiIndex "size_t SimulationAreaIterator::roiIndex() const
";
-%feature("docstring") SimulationAreaIterator::detectorIndex "size_t SimulationAreaIterator::detectorIndex() const
+%feature("docstring") SimulationAreaIterator::detectorIndex "size_t SimulationAreaIterator::detectorIndex() const
";
@@ -13422,19 +13449,19 @@ Sets the polarization analyzer operator (in spin basis along z-axis)
Gets the polarization analyzer operator (in spin basis along z-axis)
";
-%feature("docstring") SimulationElement::getWavelength "double SimulationElement::getWavelength() const
+%feature("docstring") SimulationElement::getWavelength "double SimulationElement::getWavelength() const
";
-%feature("docstring") SimulationElement::getAlphaI "double SimulationElement::getAlphaI() const
+%feature("docstring") SimulationElement::getAlphaI "double SimulationElement::getAlphaI() const
";
-%feature("docstring") SimulationElement::getPhiI "double SimulationElement::getPhiI() const
+%feature("docstring") SimulationElement::getPhiI "double SimulationElement::getPhiI() const
";
-%feature("docstring") SimulationElement::getAlphaMean "double SimulationElement::getAlphaMean() const
+%feature("docstring") SimulationElement::getAlphaMean "double SimulationElement::getAlphaMean() const
";
-%feature("docstring") SimulationElement::getPhiMean "double SimulationElement::getPhiMean() const
+%feature("docstring") SimulationElement::getPhiMean "double SimulationElement::getPhiMean() const
";
%feature("docstring") SimulationElement::setIntensity "void SimulationElement::setIntensity(double intensity)
@@ -13443,16 +13470,16 @@ Gets the polarization analyzer operator (in spin basis along z-axis)
%feature("docstring") SimulationElement::addIntensity "void SimulationElement::addIntensity(double intensity)
";
-%feature("docstring") SimulationElement::getIntensity "double SimulationElement::getIntensity() const
+%feature("docstring") SimulationElement::getIntensity "double SimulationElement::getIntensity() const
";
-%feature("docstring") SimulationElement::getKi "kvector_t SimulationElement::getKi() const
+%feature("docstring") SimulationElement::getKi "kvector_t SimulationElement::getKi() const
";
-%feature("docstring") SimulationElement::getMeanKf "kvector_t SimulationElement::getMeanKf() const
+%feature("docstring") SimulationElement::getMeanKf "kvector_t SimulationElement::getMeanKf() const
";
-%feature("docstring") SimulationElement::getMeanQ "kvector_t SimulationElement::getMeanQ() const
+%feature("docstring") SimulationElement::getMeanQ "kvector_t SimulationElement::getMeanQ() const
";
%feature("docstring") SimulationElement::getQ "kvector_t SimulationElement::getQ(double x, double y) const
@@ -13460,26 +13487,29 @@ Gets the polarization analyzer operator (in spin basis along z-axis)
Returns scattering vector Q, with Kf determined from in-pixel coordinates x,y. In-pixel coordinates take values from 0 to 1.
";
-%feature("docstring") SimulationElement::getIntegrationFactor "double SimulationElement::getIntegrationFactor(double x, double y) const
+%feature("docstring") SimulationElement::getIntegrationFactor "double SimulationElement::getIntegrationFactor(double x, double y) const
";
-%feature("docstring") SimulationElement::getSolidAngle "double SimulationElement::getSolidAngle() const
+%feature("docstring") SimulationElement::getSolidAngle "double SimulationElement::getSolidAngle() const
";
-%feature("docstring") SimulationElement::getAlpha "double SimulationElement::getAlpha(double x, double y) const
+%feature("docstring") SimulationElement::getAlpha "double SimulationElement::getAlpha(double x, double y) const
";
-%feature("docstring") SimulationElement::getPhi "double SimulationElement::getPhi(double x, double y) const
+%feature("docstring") SimulationElement::getPhi "double SimulationElement::getPhi(double x, double y) const
";
-%feature("docstring") SimulationElement::containsSpecularWavevector "bool SimulationElement::containsSpecularWavevector() const
+%feature("docstring") SimulationElement::specularData "SpecularData* SimulationElement::specularData() const
-check if element contains given wavevector
+check if element corresponds to specular peak
";
-%feature("docstring") SimulationElement::setSpecular "void SimulationElement::setSpecular(bool contains_specular)
+%feature("docstring") SimulationElement::setSpecular "void SimulationElement::setSpecular()
+
+Turn on specular data.
+";
-indicate that this element contains the specular wavevector
+%feature("docstring") SimulationElement::setSpecular "void SimulationElement::setSpecular(std::unique_ptr< SpecularData > specular_data)
";
@@ -13508,10 +13538,10 @@ C++ includes: SimulationOptions.h
%feature("docstring") SimulationOptions::SimulationOptions "SimulationOptions::SimulationOptions()
";
-%feature("docstring") SimulationOptions::isIntegrate "bool SimulationOptions::isIntegrate() const
+%feature("docstring") SimulationOptions::isIntegrate "bool SimulationOptions::isIntegrate() const
";
-%feature("docstring") SimulationOptions::getMcPoints "size_t SimulationOptions::getMcPoints() const
+%feature("docstring") SimulationOptions::getMcPoints "size_t SimulationOptions::getMcPoints() const
";
%feature("docstring") SimulationOptions::setMonteCarloIntegration "void SimulationOptions::setMonteCarloIntegration(bool flag=true, size_t mc_points=50)
@@ -13533,7 +13563,7 @@ Number of points for MonteCarlo integrator
Sets number of threads to use during the simulation (0 - take the default value from the hardware)
";
-%feature("docstring") SimulationOptions::getNumberOfThreads "int SimulationOptions::getNumberOfThreads() const
+%feature("docstring") SimulationOptions::getNumberOfThreads "int SimulationOptions::getNumberOfThreads() const
";
%feature("docstring") SimulationOptions::setNumberOfBatches "void SimulationOptions::setNumberOfBatches(int nbatches)
@@ -13541,10 +13571,10 @@ Sets number of threads to use during the simulation (0 - take the default value
Sets number of batches to split.
";
-%feature("docstring") SimulationOptions::getNumberOfBatches "int SimulationOptions::getNumberOfBatches() const
+%feature("docstring") SimulationOptions::getNumberOfBatches "int SimulationOptions::getNumberOfBatches() const
";
-%feature("docstring") SimulationOptions::getCurrentBatch "int SimulationOptions::getCurrentBatch() const
+%feature("docstring") SimulationOptions::getCurrentBatch "int SimulationOptions::getCurrentBatch() const
";
%feature("docstring") SimulationOptions::setThreadInfo "void SimulationOptions::setThreadInfo(const ThreadInfo &thread_info)
@@ -13552,19 +13582,19 @@ Sets number of batches to split.
Sets the batch and thread information to be used.
";
-%feature("docstring") SimulationOptions::getHardwareConcurrency "int SimulationOptions::getHardwareConcurrency() const
+%feature("docstring") SimulationOptions::getHardwareConcurrency "int SimulationOptions::getHardwareConcurrency() const
";
%feature("docstring") SimulationOptions::setIncludeSpecular "void SimulationOptions::setIncludeSpecular(bool include_specular)
";
-%feature("docstring") SimulationOptions::includeSpecular "bool SimulationOptions::includeSpecular() const
+%feature("docstring") SimulationOptions::includeSpecular "bool SimulationOptions::includeSpecular() const
";
%feature("docstring") SimulationOptions::setUseAvgMaterials "void SimulationOptions::setUseAvgMaterials(bool use_avg_materials)
";
-%feature("docstring") SimulationOptions::useAvgMaterials "bool SimulationOptions::useAvgMaterials() const
+%feature("docstring") SimulationOptions::useAvgMaterials "bool SimulationOptions::useAvgMaterials() const
";
@@ -13596,7 +13626,7 @@ C++ includes: SizeDistributionModelsBuilder.h
%feature("docstring") SizeDistributionDAModelBuilder::SizeDistributionDAModelBuilder "SizeDistributionDAModelBuilder::SizeDistributionDAModelBuilder()
";
-%feature("docstring") SizeDistributionDAModelBuilder::buildSample "MultiLayer * SizeDistributionDAModelBuilder::buildSample() const
+%feature("docstring") SizeDistributionDAModelBuilder::buildSample "MultiLayer * SizeDistributionDAModelBuilder::buildSample() const
";
@@ -13611,7 +13641,7 @@ C++ includes: SizeDistributionModelsBuilder.h
%feature("docstring") SizeDistributionLMAModelBuilder::SizeDistributionLMAModelBuilder "SizeDistributionLMAModelBuilder::SizeDistributionLMAModelBuilder()
";
-%feature("docstring") SizeDistributionLMAModelBuilder::buildSample "MultiLayer * SizeDistributionLMAModelBuilder::buildSample() const
+%feature("docstring") SizeDistributionLMAModelBuilder::buildSample "MultiLayer * SizeDistributionLMAModelBuilder::buildSample() const
";
@@ -13626,7 +13656,7 @@ C++ includes: SizeDistributionModelsBuilder.h
%feature("docstring") SizeDistributionSSCAModelBuilder::SizeDistributionSSCAModelBuilder "SizeDistributionSSCAModelBuilder::SizeDistributionSSCAModelBuilder()
";
-%feature("docstring") SizeDistributionSSCAModelBuilder::buildSample "MultiLayer * SizeDistributionSSCAModelBuilder::buildSample() const
+%feature("docstring") SizeDistributionSSCAModelBuilder::buildSample "MultiLayer * SizeDistributionSSCAModelBuilder::buildSample() const
";
@@ -13641,7 +13671,7 @@ C++ includes: SlicedParticleBuilder.h
%feature("docstring") SlicedCompositionBuilder::SlicedCompositionBuilder "SlicedCompositionBuilder::SlicedCompositionBuilder()
";
-%feature("docstring") SlicedCompositionBuilder::buildSample "MultiLayer * SlicedCompositionBuilder::buildSample() const
+%feature("docstring") SlicedCompositionBuilder::buildSample "MultiLayer * SlicedCompositionBuilder::buildSample() const
";
@@ -13662,10 +13692,10 @@ C++ includes: SlicedFormFactorList.h
%feature("docstring") SlicedFormFactorList::~SlicedFormFactorList "SlicedFormFactorList::~SlicedFormFactorList()=default
";
-%feature("docstring") SlicedFormFactorList::size "size_t SlicedFormFactorList::size() const
+%feature("docstring") SlicedFormFactorList::size "size_t SlicedFormFactorList::size() const
";
-%feature("docstring") SlicedFormFactorList::regionMap "std::map< size_t, std::vector< HomogeneousRegion > > SlicedFormFactorList::regionMap() const
+%feature("docstring") SlicedFormFactorList::regionMap "std::map< size_t, std::vector< HomogeneousRegion > > SlicedFormFactorList::regionMap() const
";
@@ -13690,20 +13720,61 @@ C++ includes: IFormFactorBorn.h
// File: classSpecularComputation.xml
%feature("docstring") SpecularComputation "
-Computes the specular scattering. Used by DWBAComputation.
+Performs a single-threaded specular computation with given sample.
+
+Controlled by the multi-threading machinery in Simulation::runSingleSimulation().
C++ includes: SpecularComputation.h
";
-%feature("docstring") SpecularComputation::SpecularComputation "SpecularComputation::SpecularComputation(const MultiLayer *p_multi_layer, const IFresnelMap *p_fresnel_map)
+%feature("docstring") SpecularComputation::SpecularComputation "SpecularComputation::SpecularComputation(const MultiLayer &multilayer, const SimulationOptions &options, ProgressHandler &progress, const std::vector< SimulationElement >::iterator &begin_it, const std::vector< SimulationElement >::iterator &end_it)
";
-%feature("docstring") SpecularComputation::eval "void SpecularComputation::eval(ProgressHandler *progress, const std::vector< SimulationElement >::iterator &begin_it, const std::vector< SimulationElement >::iterator &end_it) const override
+%feature("docstring") SpecularComputation::~SpecularComputation "SpecularComputation::~SpecularComputation()
+";
+
+%feature("docstring") SpecularComputation::run "void SpecularComputation::run()
+";
+
+
+// File: classSpecularComputationTerm.xml
+%feature("docstring") SpecularComputationTerm "
+
+Computes the specular scattering. Used by SpecularComputation.
+
+C++ includes: SpecularComputationTerm.h
+";
+
+%feature("docstring") SpecularComputationTerm::SpecularComputationTerm "SpecularComputationTerm::SpecularComputationTerm(const MultiLayer *p_multi_layer, const IFresnelMap *p_fresnel_map)
+";
+
+%feature("docstring") SpecularComputationTerm::eval "void SpecularComputationTerm::eval(ProgressHandler *progress, const std::vector< SimulationElement >::iterator &begin_it, const std::vector< SimulationElement >::iterator &end_it) const override
Calculate scattering intensity for each SimulationElement returns false if nothing needed to be calculated
";
+// File: classSpecularData.xml
+%feature("docstring") SpecularData "
+
+Helper class for SimulationElement to carry specular information
+
+C++ includes: SimulationElement.h
+";
+
+%feature("docstring") SpecularData::SpecularData "SpecularData::SpecularData()
+";
+
+%feature("docstring") SpecularData::SpecularData "SpecularData::SpecularData(MatrixVector coefficients)
+";
+
+%feature("docstring") SpecularData::SpecularData "SpecularData::SpecularData(ScalarVector coefficients)
+";
+
+%feature("docstring") SpecularData::isInited "bool SpecularData::isInited() const
+";
+
+
// File: classSpecularDetector1D.xml
%feature("docstring") SpecularDetector1D "
@@ -13792,7 +13863,7 @@ C++ includes: SpecularSimulation.h
%feature("docstring") SpecularSimulation::SpecularSimulation "SpecularSimulation::SpecularSimulation(const std::shared_ptr< IMultiLayerBuilder > sample_builder)
";
-%feature("docstring") SpecularSimulation::~SpecularSimulation "virtual SpecularSimulation::~SpecularSimulation() override=default
+%feature("docstring") SpecularSimulation::~SpecularSimulation "SpecularSimulation::~SpecularSimulation()
";
%feature("docstring") SpecularSimulation::clone "SpecularSimulation * SpecularSimulation::clone() const override
@@ -13803,12 +13874,7 @@ C++ includes: SpecularSimulation.h
Put into a clean state for running a simulation.
";
-%feature("docstring") SpecularSimulation::runSimulation "void SpecularSimulation::runSimulation() override
-
-Run a simulation, possibly averaged over parameter distributions.
-";
-
-%feature("docstring") SpecularSimulation::accept "virtual void SpecularSimulation::accept(INodeVisitor *visitor) const overridefinal
+%feature("docstring") SpecularSimulation::accept "virtual void SpecularSimulation::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
";
@@ -13831,7 +13897,7 @@ Returns a pointer to incident angle axis.
%feature("docstring") SpecularSimulation::getDetectorIntensity "OutputData< double > * SpecularSimulation::getDetectorIntensity(AxesUnits units_type=AxesUnits::DEFAULT) const override
-Returns reflectivity values $Reflectivity = \\\\|R\\\\|^2$ from the upper layer in the form of OutputData<double>.
+Returns detector count values in the form of OutputData<double>. Detector counts are proportional to $Reflectivity = |R|^2$ from the upper layer.
";
%feature("docstring") SpecularSimulation::reflectivity "Histogram1D * SpecularSimulation::reflectivity() const
@@ -13871,7 +13937,7 @@ C++ includes: ParticleDistributionsBuilder.h
%feature("docstring") SpheresWithLimitsDistributionBuilder::SpheresWithLimitsDistributionBuilder "SpheresWithLimitsDistributionBuilder::SpheresWithLimitsDistributionBuilder()
";
-%feature("docstring") SpheresWithLimitsDistributionBuilder::buildSample "MultiLayer * SpheresWithLimitsDistributionBuilder::buildSample() const
+%feature("docstring") SpheresWithLimitsDistributionBuilder::buildSample "MultiLayer * SpheresWithLimitsDistributionBuilder::buildSample() const
";
@@ -14088,7 +14154,7 @@ C++ includes: ISquaredFunction.h
%feature("docstring") SquareLattice::SquareLattice "SquareLattice::SquareLattice(double length, double rotation_angle=0.0)
";
-%feature("docstring") SquareLattice::clone "SquareLattice * SquareLattice::clone() const
+%feature("docstring") SquareLattice::clone "SquareLattice * SquareLattice::clone() const
";
%feature("docstring") SquareLattice::accept "void SquareLattice::accept(INodeVisitor *visitor) const final
@@ -14096,16 +14162,16 @@ C++ includes: ISquaredFunction.h
Calls the INodeVisitor's visit method.
";
-%feature("docstring") SquareLattice::length1 "virtual double SquareLattice::length1() const
+%feature("docstring") SquareLattice::length1 "virtual double SquareLattice::length1() const
";
-%feature("docstring") SquareLattice::length2 "virtual double SquareLattice::length2() const
+%feature("docstring") SquareLattice::length2 "virtual double SquareLattice::length2() const
";
-%feature("docstring") SquareLattice::latticeAngle "double SquareLattice::latticeAngle() const
+%feature("docstring") SquareLattice::latticeAngle "double SquareLattice::latticeAngle() const
";
-%feature("docstring") SquareLattice::unitCellArea "double SquareLattice::unitCellArea() const
+%feature("docstring") SquareLattice::unitCellArea "double SquareLattice::unitCellArea() const
";
@@ -14120,7 +14186,7 @@ C++ includes: TwoDimLatticeBuilder.h
%feature("docstring") SquareLatticeBuilder::SquareLatticeBuilder "SquareLatticeBuilder::SquareLatticeBuilder()
";
-%feature("docstring") SquareLatticeBuilder::buildSample "MultiLayer * SquareLatticeBuilder::buildSample() const
+%feature("docstring") SquareLatticeBuilder::buildSample "MultiLayer * SquareLatticeBuilder::buildSample() const
";
@@ -14138,19 +14204,19 @@ C++ includes: SSCAHelper.h
%feature("docstring") SSCAHelper::init "void SSCAHelper::init(const SafePointerVector< FormFactorCoherentSum > &ff_wrappers)
";
-%feature("docstring") SSCAHelper::getCharacteristicSizeCoupling "complex_t SSCAHelper::getCharacteristicSizeCoupling(double qp, const SafePointerVector< FormFactorCoherentSum > &ff_wrappers) const
+%feature("docstring") SSCAHelper::getCharacteristicSizeCoupling "complex_t SSCAHelper::getCharacteristicSizeCoupling(double qp, const SafePointerVector< FormFactorCoherentSum > &ff_wrappers) const
";
-%feature("docstring") SSCAHelper::getCharacteristicDistribution "complex_t SSCAHelper::getCharacteristicDistribution(double qp, const IInterferenceFunction *p_iff) const
+%feature("docstring") SSCAHelper::getCharacteristicDistribution "complex_t SSCAHelper::getCharacteristicDistribution(double qp, const IInterferenceFunction *p_iff) const
";
-%feature("docstring") SSCAHelper::calculatePositionOffsetPhase "complex_t SSCAHelper::calculatePositionOffsetPhase(double qp, double radial_extension) const
+%feature("docstring") SSCAHelper::calculatePositionOffsetPhase "complex_t SSCAHelper::calculatePositionOffsetPhase(double qp, double radial_extension) const
";
-%feature("docstring") SSCAHelper::getMeanFormfactorNorm "complex_t SSCAHelper::getMeanFormfactorNorm(double qp, const std::vector< complex_t > &precomputed_ff, const SafePointerVector< FormFactorCoherentSum > &ff_wrappers) const
+%feature("docstring") SSCAHelper::getMeanFormfactorNorm "complex_t SSCAHelper::getMeanFormfactorNorm(double qp, const std::vector< complex_t > &precomputed_ff, const SafePointerVector< FormFactorCoherentSum > &ff_wrappers) const
";
-%feature("docstring") SSCAHelper::getMeanFormfactors "void SSCAHelper::getMeanFormfactors(double qp, Eigen::Matrix2cd &ff_orig, Eigen::Matrix2cd &ff_conj, const IInterferenceFunctionStrategy::matrixFFVector_t &precomputed_ff, const SafePointerVector< FormFactorCoherentSum > &ff_wrappers) const
+%feature("docstring") SSCAHelper::getMeanFormfactors "void SSCAHelper::getMeanFormfactors(double qp, Eigen::Matrix2cd &ff_orig, Eigen::Matrix2cd &ff_conj, const IInterferenceFunctionStrategy::matrixFFVector_t &precomputed_ff, const SafePointerVector< FormFactorCoherentSum > &ff_wrappers) const
";
@@ -14192,16 +14258,16 @@ C++ includes: TRange.h
%feature("docstring") TRange::~TRange "virtual TRange< T >::~TRange()
";
-%feature("docstring") TRange::getLowerBound "T TRange< T >::getLowerBound() const
+%feature("docstring") TRange::getLowerBound "T TRange< T >::getLowerBound() const
";
-%feature("docstring") TRange::getUpperBound "T TRange< T >::getUpperBound() const
+%feature("docstring") TRange::getUpperBound "T TRange< T >::getUpperBound() const
";
-%feature("docstring") TRange::getDifference "T TRange< T >::getDifference() const
+%feature("docstring") TRange::getDifference "T TRange< T >::getDifference() const
";
-%feature("docstring") TRange::inRange "bool TRange< T >::inRange(T value) const
+%feature("docstring") TRange::inRange "bool TRange< T >::inRange(T value) const
";
@@ -14288,16 +14354,16 @@ Retrieve the rotation type (general, around x, y or z-axis)
Determine if the transformation is trivial (identity)
";
-%feature("docstring") Transform3D::print "void Transform3D::print(std::ostream &ostr) const
+%feature("docstring") Transform3D::print "void Transform3D::print(std::ostream &ostr) const
";
-%feature("docstring") Transform3D::isXRotation "bool Transform3D::isXRotation() const
+%feature("docstring") Transform3D::isXRotation "bool Transform3D::isXRotation() const
";
-%feature("docstring") Transform3D::isYRotation "bool Transform3D::isYRotation() const
+%feature("docstring") Transform3D::isYRotation "bool Transform3D::isYRotation() const
";
-%feature("docstring") Transform3D::isZRotation "bool Transform3D::isZRotation() const
+%feature("docstring") Transform3D::isZRotation "bool Transform3D::isZRotation() const
";
@@ -14312,7 +14378,7 @@ C++ includes: TransformationsBuilder.h
%feature("docstring") TransformBoxBuilder::TransformBoxBuilder "TransformBoxBuilder::TransformBoxBuilder()
";
-%feature("docstring") TransformBoxBuilder::buildSample "MultiLayer * TransformBoxBuilder::buildSample() const
+%feature("docstring") TransformBoxBuilder::buildSample "MultiLayer * TransformBoxBuilder::buildSample() const
";
@@ -14337,7 +14403,7 @@ C++ includes: RipplesBuilder.h
%feature("docstring") TriangularRippleBuilder::TriangularRippleBuilder "TriangularRippleBuilder::TriangularRippleBuilder()
";
-%feature("docstring") TriangularRippleBuilder::buildSample "MultiLayer * TriangularRippleBuilder::buildSample() const
+%feature("docstring") TriangularRippleBuilder::buildSample "MultiLayer * TriangularRippleBuilder::buildSample() const
";
@@ -14372,7 +14438,7 @@ C++ includes: TRange.h
%feature("docstring") TSampledRange::TSampledRange "TSampledRange< T >::TSampledRange(size_t n_samples, T lowerBound, T upperBound)
";
-%feature("docstring") TSampledRange::getNSamples "size_t TSampledRange< T >::getNSamples() const
+%feature("docstring") TSampledRange::getNSamples "size_t TSampledRange< T >::getNSamples() const
";
@@ -14387,7 +14453,7 @@ C++ includes: TwoLayerRoughnessBuilder.h
%feature("docstring") TwoLayerRoughnessBuilder::TwoLayerRoughnessBuilder "TwoLayerRoughnessBuilder::TwoLayerRoughnessBuilder()
";
-%feature("docstring") TwoLayerRoughnessBuilder::buildSample "MultiLayer * TwoLayerRoughnessBuilder::buildSample() const
+%feature("docstring") TwoLayerRoughnessBuilder::buildSample "MultiLayer * TwoLayerRoughnessBuilder::buildSample() const
";
@@ -14402,7 +14468,7 @@ C++ includes: ParticleDistributionsBuilder.h
%feature("docstring") TwoTypesCylindersDistributionBuilder::TwoTypesCylindersDistributionBuilder "TwoTypesCylindersDistributionBuilder::TwoTypesCylindersDistributionBuilder()
";
-%feature("docstring") TwoTypesCylindersDistributionBuilder::buildSample "MultiLayer * TwoTypesCylindersDistributionBuilder::buildSample() const
+%feature("docstring") TwoTypesCylindersDistributionBuilder::buildSample "MultiLayer * TwoTypesCylindersDistributionBuilder::buildSample() const
";
@@ -14481,7 +14547,7 @@ Returns value of first point of axis.
Returns value of last point of axis.
";
-%feature("docstring") VariableBinAxis::getBinCenter "double VariableBinAxis::getBinCenter(size_t index) const
+%feature("docstring") VariableBinAxis::getBinCenter "double VariableBinAxis::getBinCenter(size_t index) const
";
%feature("docstring") VariableBinAxis::findClosestIndex "size_t VariableBinAxis::findClosestIndex(double value) const
@@ -14489,10 +14555,10 @@ Returns value of last point of axis.
find bin index which is best match for given value
";
-%feature("docstring") VariableBinAxis::getBinCenters "std::vector< double > VariableBinAxis::getBinCenters() const
+%feature("docstring") VariableBinAxis::getBinCenters "std::vector< double > VariableBinAxis::getBinCenters() const
";
-%feature("docstring") VariableBinAxis::getBinBoundaries "std::vector<double> VariableBinAxis::getBinBoundaries() const
+%feature("docstring") VariableBinAxis::getBinBoundaries "std::vector<double> VariableBinAxis::getBinBoundaries() const
";
%feature("docstring") VariableBinAxis::createClippedAxis "VariableBinAxis * VariableBinAxis::createClippedAxis(double left, double right) const
@@ -14518,7 +14584,7 @@ x:
The value at which it crosses x-axes
";
-%feature("docstring") VerticalLine::clone "VerticalLine* VerticalLine::clone() const
+%feature("docstring") VerticalLine::clone "VerticalLine* VerticalLine::clone() const
";
%feature("docstring") VerticalLine::contains "bool VerticalLine::contains(double x, double y) const
@@ -14531,7 +14597,7 @@ Returns true if point with given coordinates is inside or on border of the shape
Returns true if area defined by two bins is inside or on border of polygon (more precisely, if mid point of two bins satisfy this condition).
";
-%feature("docstring") VerticalLine::getXpos "double VerticalLine::getXpos() const
+%feature("docstring") VerticalLine::getXpos "double VerticalLine::getXpos() const
";
@@ -14549,19 +14615,19 @@ C++ includes: WavevectorInfo.h
%feature("docstring") WavevectorInfo::WavevectorInfo "WavevectorInfo::WavevectorInfo(kvector_t ki, kvector_t kf, double wavelength)
";
-%feature("docstring") WavevectorInfo::transformed "WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const
+%feature("docstring") WavevectorInfo::transformed "WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const
";
-%feature("docstring") WavevectorInfo::getKi "cvector_t WavevectorInfo::getKi() const
+%feature("docstring") WavevectorInfo::getKi "cvector_t WavevectorInfo::getKi() const
";
-%feature("docstring") WavevectorInfo::getKf "cvector_t WavevectorInfo::getKf() const
+%feature("docstring") WavevectorInfo::getKf "cvector_t WavevectorInfo::getKf() const
";
-%feature("docstring") WavevectorInfo::getQ "cvector_t WavevectorInfo::getQ() const
+%feature("docstring") WavevectorInfo::getQ "cvector_t WavevectorInfo::getQ() const
";
-%feature("docstring") WavevectorInfo::getWavelength "double WavevectorInfo::getWavelength() const
+%feature("docstring") WavevectorInfo::getWavelength "double WavevectorInfo::getWavelength() const
";
@@ -14585,92 +14651,92 @@ C++ includes: ZLimits.h
%feature("docstring") ZLimits::ZLimits "ZLimits::ZLimits(OneSidedLimit lower_limit, OneSidedLimit upper_limit)
";
-%feature("docstring") ZLimits::isFinite "bool ZLimits::isFinite() const
+%feature("docstring") ZLimits::isFinite "bool ZLimits::isFinite() const
";
-%feature("docstring") ZLimits::lowerLimit "OneSidedLimit ZLimits::lowerLimit() const
+%feature("docstring") ZLimits::lowerLimit "OneSidedLimit ZLimits::lowerLimit() const
";
-%feature("docstring") ZLimits::upperLimit "OneSidedLimit ZLimits::upperLimit() const
+%feature("docstring") ZLimits::upperLimit "OneSidedLimit ZLimits::upperLimit() const
";
-// File: namespace_0D157.xml
+// File: namespace_0D161.xml
-// File: namespace_0D198.xml
+// File: namespace_0D202.xml
-// File: namespace_0D216.xml
+// File: namespace_0D220.xml
// File: namespace_0D23.xml
-// File: namespace_0D259.xml
+// File: namespace_0D263.xml
-// File: namespace_0D267.xml
+// File: namespace_0D271.xml
-// File: namespace_0D288.xml
+// File: namespace_0D292.xml
-// File: namespace_0D292.xml
+// File: namespace_0D296.xml
-// File: namespace_0D294.xml
+// File: namespace_0D298.xml
-// File: namespace_0D296.xml
+// File: namespace_0D300.xml
-// File: namespace_0D304.xml
+// File: namespace_0D308.xml
-// File: namespace_0D319.xml
+// File: namespace_0D323.xml
-// File: namespace_0D327.xml
+// File: namespace_0D331.xml
-// File: namespace_0D333.xml
+// File: namespace_0D337.xml
-// File: namespace_0D336.xml
+// File: namespace_0D340.xml
-// File: namespace_0D338.xml
+// File: namespace_0D342.xml
-// File: namespace_0D359.xml
+// File: namespace_0D363.xml
-// File: namespace_0D368.xml
+// File: namespace_0D372.xml
-// File: namespace_0D401.xml
+// File: namespace_0D405.xml
-// File: namespace_0D408.xml
+// File: namespace_0D412.xml
-// File: namespace_0D446.xml
+// File: namespace_0D450.xml
-// File: namespace_0D516.xml
+// File: namespace_0D520.xml
-// File: namespace_0D538.xml
+// File: namespace_0D542.xml
-// File: namespace_0D71.xml
+// File: namespace_0D73.xml
-// File: namespace_0D84.xml
+// File: namespace_0D88.xml
-// File: namespace_0D87.xml
+// File: namespace_0D91.xml
// File: namespaceArrayUtils.xml
@@ -14934,7 +15000,7 @@ Function for calculating the reduced potential, used for obtaining the Fresnel c
Utility to compute magnetization correction for reduced potential and scattering length density.
";
-%feature("docstring") MaterialUtils::checkMaterialTypes "MATERIAL_TYPES MaterialUtils::checkMaterialTypes(const std::vector< const Material * > &materials)
+%feature("docstring") MaterialUtils::checkMaterialTypes "MATERIAL_TYPES MaterialUtils::checkMaterialTypes(const std::vector< const Material *> &materials)
Checks if all non-default materials in materials are of the same type and returns this type. If several types of materials are involved, InvalidMaterialType identifier is returned.
";
@@ -15628,6 +15694,12 @@ Add element vector to element vector with weight.
// File: IComputationTerm_8h.xml
+// File: NormalizingSpecularComputationTerm_8cpp.xml
+
+
+// File: NormalizingSpecularComputationTerm_8h.xml
+
+
// File: ParticleLayoutComputation_8cpp.xml
@@ -15658,6 +15730,12 @@ Add element vector to element vector with weight.
// File: SpecularComputation_8h.xml
+// File: SpecularComputationTerm_8cpp.xml
+
+
+// File: SpecularComputationTerm_8h.xml
+
+
// File: FormFactorDecoratorDebyeWaller_8cpp.xml
@@ -16324,38 +16402,25 @@ make Swappable
// File: MaterialFactoryFuncs_8cpp.xml
%feature("docstring") HomogeneousMaterial "Material HomogeneousMaterial(const std::string &name, complex_t refractive_index, kvector_t magnetization)
-Constructs a material with name and refractive_index.
-
-Parameters:
------------
-
-magnetization:
-magnetization (in A/m)
+Constructs a material with name, refractive_index and magnetization (in A/m). Alternatively, $\\\\delta$ and $\\\\beta$ for refractive index $n = 1 - \\\\delta + i \\\\beta$ can be passed directly. With no parameters given, constructs default (vacuum) material with $n = 1$ and zero magnetization.
";
%feature("docstring") HomogeneousMaterial "Material HomogeneousMaterial(const std::string &name, double delta, double beta, kvector_t magnetization)
-
-Constructs a material with name and refractive_index parameters $\\\\delta$ and $\\\\beta$ for refractive index $n = 1 - \\\\delta + i \\\\beta$.
-
-Parameters:
------------
-
-magnetization:
-magnetization (in A/m)
";
%feature("docstring") HomogeneousMaterial "Material HomogeneousMaterial()
-
-Constructs material with zero refractive coefficients and zero magnetization.
";
%feature("docstring") MaterialBySLD "Material MaterialBySLD(const std::string &name, double sld, double abs_term, kvector_t magnetization)
-Constructs a wavelength-independent material with given sld and absorptive term Absorptive term is wavelength-independent (normalized to a wavelength) and can be considered as inverse of imaginary part of complex scattering length density: $ SLD = (N b_{coh}, N \\\\sigma_{abs}(\\\\lambda_0) / \\\\lambda_0) $ Here $ N $ - material number density, $ b_{coh} $ - bound coherent scattering length $ \\\\sigma_{abs}(\\\\lambda_0) $ - absorption cross-section at $ \\\\lambda_0 $ wavelength
+Constructs a wavelength-independent material with given sld and absorptive term Absorptive term is wavelength-independent (normalized to a wavelength) and can be considered as inverse of imaginary part of complex scattering length density: $ SLD = (N b_{coh}, N \\\\sigma_{abs}(\\\\lambda_0) / \\\\lambda_0) $ Here $ N $ - material number density, $ b_{coh} $ - bound coherent scattering length $ \\\\sigma_{abs}(\\\\lambda_0) $ - absorption cross-section at $ \\\\lambda_0 $ wavelength. With no parameters given, constructs default (vacuum) material with zero sld and zero magnetization.
Parameters:
-----------
+name:
+material name
+
sld:
scattering length density, $ nm^{-2} $
@@ -16373,6 +16438,9 @@ Constructs a wavelength-independent material with given sld and absorptive term
Parameters:
-----------
+name:
+material name
+
sld:
scattering length density, $ nm^{-2} $
@@ -16384,8 +16452,6 @@ magnetization (in A/m)
";
%feature("docstring") MaterialBySLD "Material MaterialBySLD()
-
-Constructs wavelength-independent material with zero sld and zero magnetization.
";
%feature("docstring") createAveragedMaterial "Material createAveragedMaterial(const Material &layer_mat, const std::vector< HomogeneousRegion > ®ions)
@@ -16395,40 +16461,30 @@ Creates averaged material. Square refractive index of returned material is arith
// File: MaterialFactoryFuncs_8h.xml
-%feature("docstring") HomogeneousMaterial "BA_CORE_API_ Material HomogeneousMaterial(const std::string &name, complex_t refractive_index, kvector_t magnetization=kvector_t())
-
-Constructs a material with name and refractive_index.
-
-Parameters:
------------
-
-magnetization:
-magnetization (in A/m)
+%feature("docstring") HomogeneousMaterial "BA_CORE_API_ Material HomogeneousMaterial()
";
%feature("docstring") HomogeneousMaterial "BA_CORE_API_ Material HomogeneousMaterial(const std::string &name, double delta, double beta, kvector_t magnetization=kvector_t())
+";
-Constructs a material with name and refractive_index parameters $\\\\delta$ and $\\\\beta$ for refractive index $n = 1 - \\\\delta + i \\\\beta$.
-
-Parameters:
------------
+%feature("docstring") HomogeneousMaterial "BA_CORE_API_ Material HomogeneousMaterial(const std::string &name, complex_t refractive_index, kvector_t magnetization=kvector_t())
-magnetization:
-magnetization (in A/m)
+Constructs a material with name, refractive_index and magnetization (in A/m). Alternatively, $\\\\delta$ and $\\\\beta$ for refractive index $n = 1 - \\\\delta + i \\\\beta$ can be passed directly. With no parameters given, constructs default (vacuum) material with $n = 1$ and zero magnetization.
";
-%feature("docstring") HomogeneousMaterial "BA_CORE_API_ Material HomogeneousMaterial()
-
-Constructs material with zero refractive coefficients and zero magnetization.
+%feature("docstring") MaterialBySLD "BA_CORE_API_ Material MaterialBySLD()
";
%feature("docstring") MaterialBySLD "BA_CORE_API_ Material MaterialBySLD(const std::string &name, double sld, double abs_term, kvector_t magnetization=kvector_t())
-Constructs a wavelength-independent material with given sld and absorptive term Absorptive term is wavelength-independent (normalized to a wavelength) and can be considered as inverse of imaginary part of complex scattering length density: $ SLD = (N b_{coh}, N \\\\sigma_{abs}(\\\\lambda_0) / \\\\lambda_0) $ Here $ N $ - material number density, $ b_{coh} $ - bound coherent scattering length $ \\\\sigma_{abs}(\\\\lambda_0) $ - absorption cross-section at $ \\\\lambda_0 $ wavelength
+Constructs a wavelength-independent material with given sld and absorptive term Absorptive term is wavelength-independent (normalized to a wavelength) and can be considered as inverse of imaginary part of complex scattering length density: $ SLD = (N b_{coh}, N \\\\sigma_{abs}(\\\\lambda_0) / \\\\lambda_0) $ Here $ N $ - material number density, $ b_{coh} $ - bound coherent scattering length $ \\\\sigma_{abs}(\\\\lambda_0) $ - absorption cross-section at $ \\\\lambda_0 $ wavelength. With no parameters given, constructs default (vacuum) material with zero sld and zero magnetization.
Parameters:
-----------
+name:
+material name
+
sld:
scattering length density, $ nm^{-2} $
@@ -16446,6 +16502,9 @@ Constructs a wavelength-independent material with given sld and absorptive term
Parameters:
-----------
+name:
+material name
+
sld:
scattering length density, $ nm^{-2} $
@@ -16456,11 +16515,6 @@ magnetization:
magnetization (in A/m)
";
-%feature("docstring") MaterialBySLD "BA_CORE_API_ Material MaterialBySLD()
-
-Constructs wavelength-independent material with zero sld and zero magnetization.
-";
-
%feature("docstring") createAveragedMaterial "BA_CORE_API_ Material createAveragedMaterial(const Material &layer_mat, const std::vector< HomogeneousRegion > ®ions)
Creates averaged material. Square refractive index of returned material is arithmetic mean over regions and layer_mat. Magnetization (if present) is averaged linearly.
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 811fa19d2739af3425ee61428991e679a6f088e8..bc254f9731d100e8d601a4eafffa1f4fb35247f0 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -1834,7 +1834,7 @@ class INamed(_object):
"""
getName(INamed self) -> std::string
- std::string INamed::getName() const
+ std::string INamed::getName() const
"""
return _libBornAgainCore.INamed_getName(self)
@@ -3636,7 +3636,7 @@ class WavevectorInfo(_object):
"""
transformed(WavevectorInfo self, Transform3D const & transform) -> WavevectorInfo
- WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const
+ WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const
"""
return _libBornAgainCore.WavevectorInfo_transformed(self, transform)
@@ -3646,7 +3646,7 @@ class WavevectorInfo(_object):
"""
getKi(WavevectorInfo self) -> cvector_t
- cvector_t WavevectorInfo::getKi() const
+ cvector_t WavevectorInfo::getKi() const
"""
return _libBornAgainCore.WavevectorInfo_getKi(self)
@@ -3656,7 +3656,7 @@ class WavevectorInfo(_object):
"""
getKf(WavevectorInfo self) -> cvector_t
- cvector_t WavevectorInfo::getKf() const
+ cvector_t WavevectorInfo::getKf() const
"""
return _libBornAgainCore.WavevectorInfo_getKf(self)
@@ -3666,7 +3666,7 @@ class WavevectorInfo(_object):
"""
getQ(WavevectorInfo self) -> cvector_t
- cvector_t WavevectorInfo::getQ() const
+ cvector_t WavevectorInfo::getQ() const
"""
return _libBornAgainCore.WavevectorInfo_getQ(self)
@@ -3676,7 +3676,7 @@ class WavevectorInfo(_object):
"""
getWavelength(WavevectorInfo self) -> double
- double WavevectorInfo::getWavelength() const
+ double WavevectorInfo::getWavelength() const
"""
return _libBornAgainCore.WavevectorInfo_getWavelength(self)
@@ -3806,7 +3806,7 @@ class Beam(INode):
"""
getBlochVector(Beam self) -> kvector_t
- kvector_t Beam::getBlochVector() const
+ kvector_t Beam::getBlochVector() const
"""
return _libBornAgainCore.Beam_getBlochVector(self)
@@ -3816,7 +3816,7 @@ class Beam(INode):
"""
getWavelength(Beam self) -> double
- double Beam::getWavelength() const
+ double Beam::getWavelength() const
"""
return _libBornAgainCore.Beam_getWavelength(self)
@@ -3826,7 +3826,7 @@ class Beam(INode):
"""
getAlpha(Beam self) -> double
- double Beam::getAlpha() const
+ double Beam::getAlpha() const
"""
return _libBornAgainCore.Beam_getAlpha(self)
@@ -3836,7 +3836,7 @@ class Beam(INode):
"""
getPhi(Beam self) -> double
- double Beam::getPhi() const
+ double Beam::getPhi() const
"""
return _libBornAgainCore.Beam_getPhi(self)
@@ -3891,7 +3891,7 @@ class Bin1D(_object):
"""
getMidPoint(Bin1D self) -> double
- double Bin1D::getMidPoint() const
+ double Bin1D::getMidPoint() const
"""
return _libBornAgainCore.Bin1D_getMidPoint(self)
@@ -3901,7 +3901,7 @@ class Bin1D(_object):
"""
getBinSize(Bin1D self) -> double
- double Bin1D::getBinSize() const
+ double Bin1D::getBinSize() const
"""
return _libBornAgainCore.Bin1D_getBinSize(self)
@@ -3959,7 +3959,7 @@ class Bin1DKVector(_object):
"""
getMidPoint(Bin1DKVector self) -> kvector_t
- kvector_t Bin1DKVector::getMidPoint() const
+ kvector_t Bin1DKVector::getMidPoint() const
"""
return _libBornAgainCore.Bin1DKVector_getMidPoint(self)
@@ -3969,7 +3969,7 @@ class Bin1DKVector(_object):
"""
getDelta(Bin1DKVector self) -> kvector_t
- kvector_t Bin1DKVector::getDelta() const
+ kvector_t Bin1DKVector::getDelta() const
"""
return _libBornAgainCore.Bin1DKVector_getDelta(self)
@@ -4024,7 +4024,7 @@ class Bin1DCVector(_object):
"""
getMidPoint(Bin1DCVector self) -> cvector_t
- cvector_t Bin1DCVector::getMidPoint() const
+ cvector_t Bin1DCVector::getMidPoint() const
"""
return _libBornAgainCore.Bin1DCVector_getMidPoint(self)
@@ -4034,7 +4034,7 @@ class Bin1DCVector(_object):
"""
getDelta(Bin1DCVector self) -> cvector_t
- cvector_t Bin1DCVector::getDelta() const
+ cvector_t Bin1DCVector::getDelta() const
"""
return _libBornAgainCore.Bin1DCVector_getDelta(self)
@@ -4217,7 +4217,7 @@ class IAxis(_object):
"""
getBinCenters(IAxis self) -> vdouble1d_t
- std::vector< double > IAxis::getBinCenters() const
+ std::vector< double > IAxis::getBinCenters() const
"""
return _libBornAgainCore.IAxis_getBinCenters(self)
@@ -4227,7 +4227,7 @@ class IAxis(_object):
"""
getBinBoundaries(IAxis self) -> vdouble1d_t
- std::vector< double > IAxis::getBinBoundaries() const
+ std::vector< double > IAxis::getBinBoundaries() const
"""
return _libBornAgainCore.IAxis_getBinBoundaries(self)
@@ -4383,7 +4383,7 @@ class VariableBinAxis(IAxis):
"""
getBinCenter(VariableBinAxis self, size_t index) -> double
- double VariableBinAxis::getBinCenter(size_t index) const
+ double VariableBinAxis::getBinCenter(size_t index) const
"""
return _libBornAgainCore.VariableBinAxis_getBinCenter(self, index)
@@ -4405,7 +4405,7 @@ class VariableBinAxis(IAxis):
"""
getBinCenters(VariableBinAxis self) -> vdouble1d_t
- std::vector< double > VariableBinAxis::getBinCenters() const
+ std::vector< double > VariableBinAxis::getBinCenters() const
"""
return _libBornAgainCore.VariableBinAxis_getBinCenters(self)
@@ -4415,7 +4415,7 @@ class VariableBinAxis(IAxis):
"""
getBinBoundaries(VariableBinAxis self) -> vdouble1d_t
- std::vector<double> VariableBinAxis::getBinBoundaries() const
+ std::vector<double> VariableBinAxis::getBinBoundaries() const
"""
return _libBornAgainCore.VariableBinAxis_getBinBoundaries(self)
@@ -4598,7 +4598,7 @@ class CustomBinAxis(VariableBinAxis):
"""
getBinCenters(CustomBinAxis self) -> vdouble1d_t
- std::vector< double > CustomBinAxis::getBinCenters() const
+ std::vector< double > CustomBinAxis::getBinCenters() const
"""
return _libBornAgainCore.CustomBinAxis_getBinCenters(self)
@@ -5143,7 +5143,7 @@ class FitStrategyDefault(IFitStrategy):
"""
clone(FitStrategyDefault self) -> FitStrategyDefault
- FitStrategyDefault * FitStrategyDefault::clone() const
+ FitStrategyDefault * FitStrategyDefault::clone() const
"""
return _libBornAgainCore.FitStrategyDefault_clone(self)
@@ -5232,7 +5232,7 @@ class IntensityFunctionLog(IIntensityFunction):
"""
clone(IntensityFunctionLog self) -> IntensityFunctionLog
- virtual IntensityFunctionLog* IntensityFunctionLog::clone() const
+ virtual IntensityFunctionLog* IntensityFunctionLog::clone() const
"""
return _libBornAgainCore.IntensityFunctionLog_clone(self)
@@ -5242,7 +5242,7 @@ class IntensityFunctionLog(IIntensityFunction):
"""
evaluate(IntensityFunctionLog self, double value) -> double
- double IntensityFunctionLog::evaluate(double value) const
+ double IntensityFunctionLog::evaluate(double value) const
"""
return _libBornAgainCore.IntensityFunctionLog_evaluate(self, value)
@@ -5293,7 +5293,7 @@ class IntensityFunctionSqrt(IIntensityFunction):
"""
clone(IntensityFunctionSqrt self) -> IntensityFunctionSqrt
- virtual IntensityFunctionSqrt* IntensityFunctionSqrt::clone() const
+ virtual IntensityFunctionSqrt* IntensityFunctionSqrt::clone() const
"""
return _libBornAgainCore.IntensityFunctionSqrt_clone(self)
@@ -5303,7 +5303,7 @@ class IntensityFunctionSqrt(IIntensityFunction):
"""
evaluate(IntensityFunctionSqrt self, double value) -> double
- double IntensityFunctionSqrt::evaluate(double value) const
+ double IntensityFunctionSqrt::evaluate(double value) const
"""
return _libBornAgainCore.IntensityFunctionSqrt_evaluate(self, value)
@@ -5436,7 +5436,7 @@ class IntensityNormalizer(IIntensityNormalizer):
"""
clone(IntensityNormalizer self) -> IntensityNormalizer
- IntensityNormalizer * IntensityNormalizer::clone() const
+ IntensityNormalizer * IntensityNormalizer::clone() const
"""
return _libBornAgainCore.IntensityNormalizer_clone(self)
@@ -5458,7 +5458,7 @@ class IntensityNormalizer(IIntensityNormalizer):
"""
createNormalizedData(IntensityNormalizer self, IntensityData data) -> IntensityData
- OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const
+ OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const
"""
return _libBornAgainCore.IntensityNormalizer_createNormalizedData(self, data)
@@ -6133,7 +6133,7 @@ class FitObject(INode):
"""
getDefaultAxisUnits(FitObject self) -> std::string
- std::string FitObject::getDefaultAxisUnits() const
+ std::string FitObject::getDefaultAxisUnits() const
"""
return _libBornAgainCore.FitObject_getDefaultAxisUnits(self)
@@ -6227,7 +6227,7 @@ class FitParameter(libBornAgainFit.IFitParameter):
"""
clone(FitParameter self) -> FitParameter
- FitParameter * FitParameter::clone() const
+ FitParameter * FitParameter::clone() const
"""
return _libBornAgainCore.FitParameter_clone(self)
@@ -6285,7 +6285,7 @@ class FitParameter(libBornAgainFit.IFitParameter):
"""
patterns(FitParameter self) -> vector_string_t
- std::vector< std::string > FitParameter::patterns() const
+ std::vector< std::string > FitParameter::patterns() const
"""
return _libBornAgainCore.FitParameter_patterns(self)
@@ -6697,7 +6697,7 @@ class FitSuite(IObservable):
getRealOutputData(FitSuite self, size_t i_item=0) -> IntensityData
getRealOutputData(FitSuite self) -> IntensityData
- const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const
+ const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const
"""
return _libBornAgainCore.FitSuite_getRealOutputData(self, i_item)
@@ -6708,7 +6708,7 @@ class FitSuite(IObservable):
getSimulationOutputData(FitSuite self, size_t i_item=0) -> IntensityData
getSimulationOutputData(FitSuite self) -> IntensityData
- const OutputData< double > * FitSuite::getSimulationOutputData(size_t i_item=0) const
+ const OutputData< double > * FitSuite::getSimulationOutputData(size_t i_item=0) const
"""
return _libBornAgainCore.FitSuite_getSimulationOutputData(self, i_item)
@@ -6719,7 +6719,7 @@ class FitSuite(IObservable):
getChiSquaredOutputData(FitSuite self, size_t i_item=0) -> IntensityData
getChiSquaredOutputData(FitSuite self) -> IntensityData
- const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const
+ const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const
"""
return _libBornAgainCore.FitSuite_getChiSquaredOutputData(self, i_item)
@@ -6976,7 +6976,7 @@ class FitSuiteObjects(INode):
"""
size(FitSuiteObjects self) -> size_t
- size_t FitSuiteObjects::size() const
+ size_t FitSuiteObjects::size() const
"""
return _libBornAgainCore.FitSuiteObjects_size(self)
@@ -7019,7 +7019,7 @@ class FitSuiteObjects(INode):
getDefaultAxesUnits(FitSuiteObjects self, size_t i_item=0) -> std::string
getDefaultAxesUnits(FitSuiteObjects self) -> std::string
- std::string FitSuiteObjects::getDefaultAxesUnits(size_t i_item=0) const
+ std::string FitSuiteObjects::getDefaultAxesUnits(size_t i_item=0) const
"""
return _libBornAgainCore.FitSuiteObjects_getDefaultAxesUnits(self, i_item)
@@ -7249,7 +7249,7 @@ class AdjustMinimizerStrategy(IFitStrategy):
"""
clone(AdjustMinimizerStrategy self) -> AdjustMinimizerStrategy
- AdjustMinimizerStrategy * AdjustMinimizerStrategy::clone() const
+ AdjustMinimizerStrategy * AdjustMinimizerStrategy::clone() const
"""
return _libBornAgainCore.AdjustMinimizerStrategy_clone(self)
@@ -7701,7 +7701,7 @@ class Crystal(IClusteredParticles):
"""
clone(Crystal self) -> Crystal
- Crystal * Crystal::clone() const overridefinal
+ Crystal * Crystal::clone() const override final
Returns a clone of this ISample object.
@@ -7713,7 +7713,7 @@ class Crystal(IClusteredParticles):
"""
accept(Crystal self, INodeVisitor visitor)
- void Crystal::accept(INodeVisitor *visitor) const overridefinal
+ void Crystal::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -7725,7 +7725,7 @@ class Crystal(IClusteredParticles):
"""
createTotalFormFactor(Crystal self, IFormFactor meso_crystal_form_factor, IRotation p_rotation, kvector_t translation) -> IFormFactor
- IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const overridefinal
+ IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const override final
Creates a total form factor for the mesocrystal with a specific shape and content The bulk content of the mesocrystal is encapsulated by the IClusteredParticles object itself
@@ -7737,7 +7737,7 @@ class Crystal(IClusteredParticles):
"""
homogeneousRegions(Crystal self) -> std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > >
- std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const overridefinal
+ std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const override final
Creates region information with volumetric densities instead of absolute volume These densities need to be multiplied by the total mesocrystal volume
@@ -7750,7 +7750,7 @@ class Crystal(IClusteredParticles):
transformedLattice(Crystal self, IRotation p_rotation=None) -> Lattice
transformedLattice(Crystal self) -> Lattice
- Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const
+ Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const
"""
return _libBornAgainCore.Crystal_transformedLattice(self, p_rotation)
@@ -7770,7 +7770,7 @@ class Crystal(IClusteredParticles):
"""
getChildren(Crystal self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > Crystal::getChildren() const overridefinal
+ std::vector< const INode * > Crystal::getChildren() const override final
Returns a vector of children (const).
@@ -7990,7 +7990,7 @@ class DistributionGate(IDistribution1D):
"""
getMin(DistributionGate self) -> double
- double DistributionGate::getMin() const
+ double DistributionGate::getMin() const
"""
return _libBornAgainCore.DistributionGate_getMin(self)
@@ -8000,7 +8000,7 @@ class DistributionGate(IDistribution1D):
"""
getMax(DistributionGate self) -> double
- double DistributionGate::getMax() const
+ double DistributionGate::getMax() const
"""
return _libBornAgainCore.DistributionGate_getMax(self)
@@ -8119,7 +8119,7 @@ class DistributionLorentz(IDistribution1D):
"""
getHWHM(DistributionLorentz self) -> double
- double DistributionLorentz::getHWHM() const
+ double DistributionLorentz::getHWHM() const
"""
return _libBornAgainCore.DistributionLorentz_getHWHM(self)
@@ -8238,7 +8238,7 @@ class DistributionGaussian(IDistribution1D):
"""
getStdDev(DistributionGaussian self) -> double
- double DistributionGaussian::getStdDev() const
+ double DistributionGaussian::getStdDev() const
"""
return _libBornAgainCore.DistributionGaussian_getStdDev(self)
@@ -8357,7 +8357,7 @@ class DistributionLogNormal(IDistribution1D):
"""
getMedian(DistributionLogNormal self) -> double
- double DistributionLogNormal::getMedian() const
+ double DistributionLogNormal::getMedian() const
"""
return _libBornAgainCore.DistributionLogNormal_getMedian(self)
@@ -8367,7 +8367,7 @@ class DistributionLogNormal(IDistribution1D):
"""
getScalePar(DistributionLogNormal self) -> double
- double DistributionLogNormal::getScalePar() const
+ double DistributionLogNormal::getScalePar() const
"""
return _libBornAgainCore.DistributionLogNormal_getScalePar(self)
@@ -8498,7 +8498,7 @@ class DistributionCosine(IDistribution1D):
"""
getSigma(DistributionCosine self) -> double
- double DistributionCosine::getSigma() const
+ double DistributionCosine::getSigma() const
"""
return _libBornAgainCore.DistributionCosine_getSigma(self)
@@ -8617,7 +8617,7 @@ class DistributionTrapezoid(IDistribution1D):
"""
getLeftWidth(DistributionTrapezoid self) -> double
- double DistributionTrapezoid::getLeftWidth() const
+ double DistributionTrapezoid::getLeftWidth() const
"""
return _libBornAgainCore.DistributionTrapezoid_getLeftWidth(self)
@@ -8627,7 +8627,7 @@ class DistributionTrapezoid(IDistribution1D):
"""
getMiddleWidth(DistributionTrapezoid self) -> double
- double DistributionTrapezoid::getMiddleWidth() const
+ double DistributionTrapezoid::getMiddleWidth() const
"""
return _libBornAgainCore.DistributionTrapezoid_getMiddleWidth(self)
@@ -8637,7 +8637,7 @@ class DistributionTrapezoid(IDistribution1D):
"""
getRightWidth(DistributionTrapezoid self) -> double
- double DistributionTrapezoid::getRightWidth() const
+ double DistributionTrapezoid::getRightWidth() const
"""
return _libBornAgainCore.DistributionTrapezoid_getRightWidth(self)
@@ -8748,7 +8748,7 @@ class DetectorMask(_object):
"""
isMasked(DetectorMask self, size_t index) -> bool
- bool DetectorMask::isMasked(size_t index) const
+ bool DetectorMask::isMasked(size_t index) const
"""
return _libBornAgainCore.DetectorMask_isMasked(self, index)
@@ -8758,7 +8758,7 @@ class DetectorMask(_object):
"""
getMaskData(DetectorMask self) -> OutputData< bool > const *
- const OutputData<bool>* DetectorMask::getMaskData() const
+ const OutputData<bool>* DetectorMask::getMaskData() const
"""
return _libBornAgainCore.DetectorMask_getMaskData(self)
@@ -8768,7 +8768,7 @@ class DetectorMask(_object):
"""
createHistogram(DetectorMask self) -> Histogram2D
- Histogram2D * DetectorMask::createHistogram() const
+ Histogram2D * DetectorMask::createHistogram() const
"""
return _libBornAgainCore.DetectorMask_createHistogram(self)
@@ -8802,7 +8802,7 @@ class DetectorMask(_object):
"""
numberOfMaskedChannels(DetectorMask self) -> int
- int DetectorMask::numberOfMaskedChannels() const
+ int DetectorMask::numberOfMaskedChannels() const
"""
return _libBornAgainCore.DetectorMask_numberOfMaskedChannels(self)
@@ -8812,7 +8812,7 @@ class DetectorMask(_object):
"""
numberOfMasks(DetectorMask self) -> size_t
- size_t DetectorMask::numberOfMasks() const
+ size_t DetectorMask::numberOfMasks() const
"""
return _libBornAgainCore.DetectorMask_numberOfMasks(self)
@@ -8822,7 +8822,7 @@ class DetectorMask(_object):
"""
getMaskShape(DetectorMask self, size_t mask_index, bool & mask_value) -> IShape2D
- const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const
+ const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const
"""
return _libBornAgainCore.DetectorMask_getMaskShape(self, mask_index, mask_value)
@@ -8888,7 +8888,7 @@ class Ellipse(IShape2D):
"""
clone(Ellipse self) -> Ellipse
- Ellipse* Ellipse::clone() const
+ Ellipse* Ellipse::clone() const
"""
return _libBornAgainCore.Ellipse_clone(self)
@@ -8911,7 +8911,7 @@ class Ellipse(IShape2D):
"""
getCenterX(Ellipse self) -> double
- double Ellipse::getCenterX() const
+ double Ellipse::getCenterX() const
"""
return _libBornAgainCore.Ellipse_getCenterX(self)
@@ -8921,7 +8921,7 @@ class Ellipse(IShape2D):
"""
getCenterY(Ellipse self) -> double
- double Ellipse::getCenterY() const
+ double Ellipse::getCenterY() const
"""
return _libBornAgainCore.Ellipse_getCenterY(self)
@@ -8931,7 +8931,7 @@ class Ellipse(IShape2D):
"""
getRadiusX(Ellipse self) -> double
- double Ellipse::getRadiusX() const
+ double Ellipse::getRadiusX() const
"""
return _libBornAgainCore.Ellipse_getRadiusX(self)
@@ -8941,7 +8941,7 @@ class Ellipse(IShape2D):
"""
getRadiusY(Ellipse self) -> double
- double Ellipse::getRadiusY() const
+ double Ellipse::getRadiusY() const
"""
return _libBornAgainCore.Ellipse_getRadiusY(self)
@@ -8951,7 +8951,7 @@ class Ellipse(IShape2D):
"""
getTheta(Ellipse self) -> double
- double Ellipse::getTheta() const
+ double Ellipse::getTheta() const
"""
return _libBornAgainCore.Ellipse_getTheta(self)
@@ -9008,7 +9008,7 @@ class IFTDecayFunction1D(ICloneable, INode):
"""
decayLength(IFTDecayFunction1D self) -> double
- double IFTDecayFunction1D::decayLength() const
+ double IFTDecayFunction1D::decayLength() const
"""
return _libBornAgainCore.IFTDecayFunction1D_decayLength(self)
@@ -9055,7 +9055,7 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DCauchy self) -> FTDecayFunction1DCauchy
- FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const
+ FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DCauchy_clone(self)
@@ -9124,7 +9124,7 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DGauss self) -> FTDecayFunction1DGauss
- FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const
+ FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DGauss_clone(self)
@@ -9193,7 +9193,7 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DTriangle self) -> FTDecayFunction1DTriangle
- FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const
+ FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DTriangle_clone(self)
@@ -9273,7 +9273,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DVoigt self) -> FTDecayFunction1DVoigt
- FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const
+ FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DVoigt_clone(self)
@@ -9305,7 +9305,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
"""
eEta(FTDecayFunction1DVoigt self) -> double
- double FTDecayFunction1DVoigt::eEta() const
+ double FTDecayFunction1DVoigt::eEta() const
"""
return _libBornAgainCore.FTDecayFunction1DVoigt_eEta(self)
@@ -9474,7 +9474,7 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
"""
clone(FTDecayFunction2DCauchy self) -> FTDecayFunction2DCauchy
- FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const
+ FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const
"""
return _libBornAgainCore.FTDecayFunction2DCauchy_clone(self)
@@ -9546,7 +9546,7 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
"""
clone(FTDecayFunction2DGauss self) -> FTDecayFunction2DGauss
- FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const
+ FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const
"""
return _libBornAgainCore.FTDecayFunction2DGauss_clone(self)
@@ -9635,7 +9635,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
"""
clone(FTDecayFunction2DVoigt self) -> FTDecayFunction2DVoigt
- FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const
+ FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const
"""
return _libBornAgainCore.FTDecayFunction2DVoigt_clone(self)
@@ -9669,7 +9669,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
"""
eta(FTDecayFunction2DVoigt self) -> double
- double FTDecayFunction2DVoigt::eta() const
+ double FTDecayFunction2DVoigt::eta() const
"""
return _libBornAgainCore.FTDecayFunction2DVoigt_eta(self)
@@ -9738,7 +9738,7 @@ class IFTDistribution1D(ICloneable, INode):
"""
omega(IFTDistribution1D self) -> double
- double IFTDistribution1D::omega() const
+ double IFTDistribution1D::omega() const
"""
return _libBornAgainCore.IFTDistribution1D_omega(self)
@@ -10185,7 +10185,7 @@ class FTDistribution1DVoigt(IFTDistribution1D):
"""
eta(FTDistribution1DVoigt self) -> double
- double FTDistribution1DVoigt::eta() const
+ double FTDistribution1DVoigt::eta() const
"""
return _libBornAgainCore.FTDistribution1DVoigt_eta(self)
@@ -10242,7 +10242,7 @@ class IFTDistribution2D(ICloneable, INode):
"""
gamma(IFTDistribution2D self) -> double
- double IFTDistribution2D::gamma() const
+ double IFTDistribution2D::gamma() const
"""
return _libBornAgainCore.IFTDistribution2D_gamma(self)
@@ -10252,7 +10252,7 @@ class IFTDistribution2D(ICloneable, INode):
"""
delta(IFTDistribution2D self) -> double
- double IFTDistribution2D::delta() const
+ double IFTDistribution2D::delta() const
"""
return _libBornAgainCore.IFTDistribution2D_delta(self)
@@ -10262,7 +10262,7 @@ class IFTDistribution2D(ICloneable, INode):
"""
omegaX(IFTDistribution2D self) -> double
- double IFTDistribution2D::omegaX() const
+ double IFTDistribution2D::omegaX() const
"""
return _libBornAgainCore.IFTDistribution2D_omegaX(self)
@@ -10272,7 +10272,7 @@ class IFTDistribution2D(ICloneable, INode):
"""
omegaY(IFTDistribution2D self) -> double
- double IFTDistribution2D::omegaY() const
+ double IFTDistribution2D::omegaY() const
"""
return _libBornAgainCore.IFTDistribution2D_omegaY(self)
@@ -10671,7 +10671,7 @@ class FTDistribution2DVoigt(IFTDistribution2D):
"""
eta(FTDistribution2DVoigt self) -> double
- double FTDistribution2DVoigt::eta() const
+ double FTDistribution2DVoigt::eta() const
"""
return _libBornAgainCore.FTDistribution2DVoigt_eta(self)
@@ -10797,7 +10797,7 @@ class FixedBinAxis(IAxis):
"""
getBinCenter(FixedBinAxis self, size_t index) -> double
- double FixedBinAxis::getBinCenter(size_t index) const
+ double FixedBinAxis::getBinCenter(size_t index) const
"""
return _libBornAgainCore.FixedBinAxis_getBinCenter(self, index)
@@ -10819,7 +10819,7 @@ class FixedBinAxis(IAxis):
"""
getBinCenters(FixedBinAxis self) -> vdouble1d_t
- std::vector< double > FixedBinAxis::getBinCenters() const
+ std::vector< double > FixedBinAxis::getBinCenters() const
"""
return _libBornAgainCore.FixedBinAxis_getBinCenters(self)
@@ -10829,7 +10829,7 @@ class FixedBinAxis(IAxis):
"""
getBinBoundaries(FixedBinAxis self) -> vdouble1d_t
- std::vector< double > FixedBinAxis::getBinBoundaries() const
+ std::vector< double > FixedBinAxis::getBinBoundaries() const
"""
return _libBornAgainCore.FixedBinAxis_getBinBoundaries(self)
@@ -11656,7 +11656,7 @@ class PolyhedralEdge(_object):
"""
E(PolyhedralEdge self) -> kvector_t
- kvector_t PolyhedralEdge::E() const
+ kvector_t PolyhedralEdge::E() const
"""
return _libBornAgainCore.PolyhedralEdge_E(self)
@@ -11666,7 +11666,7 @@ class PolyhedralEdge(_object):
"""
R(PolyhedralEdge self) -> kvector_t
- kvector_t PolyhedralEdge::R() const
+ kvector_t PolyhedralEdge::R() const
"""
return _libBornAgainCore.PolyhedralEdge_R(self)
@@ -11676,7 +11676,7 @@ class PolyhedralEdge(_object):
"""
qE(PolyhedralEdge self, cvector_t q) -> complex_t
- complex_t PolyhedralEdge::qE(cvector_t q) const
+ complex_t PolyhedralEdge::qE(cvector_t q) const
"""
return _libBornAgainCore.PolyhedralEdge_qE(self, q)
@@ -11686,7 +11686,7 @@ class PolyhedralEdge(_object):
"""
qR(PolyhedralEdge self, cvector_t q) -> complex_t
- complex_t PolyhedralEdge::qR(cvector_t q) const
+ complex_t PolyhedralEdge::qR(cvector_t q) const
"""
return _libBornAgainCore.PolyhedralEdge_qR(self, q)
@@ -11762,7 +11762,7 @@ class PolyhedralFace(_object):
"""
area(PolyhedralFace self) -> double
- double PolyhedralFace::area() const
+ double PolyhedralFace::area() const
"""
return _libBornAgainCore.PolyhedralFace_area(self)
@@ -11772,7 +11772,7 @@ class PolyhedralFace(_object):
"""
center(PolyhedralFace self) -> kvector_t
- kvector_t PolyhedralFace::center() const
+ kvector_t PolyhedralFace::center() const
"""
return _libBornAgainCore.PolyhedralFace_center(self)
@@ -11782,7 +11782,7 @@ class PolyhedralFace(_object):
"""
pyramidalVolume(PolyhedralFace self) -> double
- double PolyhedralFace::pyramidalVolume() const
+ double PolyhedralFace::pyramidalVolume() const
"""
return _libBornAgainCore.PolyhedralFace_pyramidalVolume(self)
@@ -11792,7 +11792,7 @@ class PolyhedralFace(_object):
"""
radius3d(PolyhedralFace self) -> double
- double PolyhedralFace::radius3d() const
+ double PolyhedralFace::radius3d() const
"""
return _libBornAgainCore.PolyhedralFace_radius3d(self)
@@ -11893,7 +11893,7 @@ class FormFactorPolyhedron(IFormFactorBorn):
"""
evaluate_for_q(FormFactorPolyhedron self, cvector_t q) -> complex_t
- complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const override final
Returns the form factor F(q) of this polyhedron, respecting the offset z_origin.
@@ -11917,7 +11917,7 @@ class FormFactorPolyhedron(IFormFactorBorn):
"""
volume(FormFactorPolyhedron self) -> double
- double FormFactorPolyhedron::volume() const overridefinal
+ double FormFactorPolyhedron::volume() const override final
Returns the total volume of the particle of this form factor's shape.
@@ -11929,7 +11929,7 @@ class FormFactorPolyhedron(IFormFactorBorn):
"""
radialExtension(FormFactorPolyhedron self) -> double
- double FormFactorPolyhedron::radialExtension() const overridefinal
+ double FormFactorPolyhedron::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -11980,7 +11980,7 @@ class FormFactorPolygonalPrism(IFormFactorBorn):
"""
evaluate_for_q(FormFactorPolygonalPrism self, cvector_t q) -> complex_t
- complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const override final
Returns the form factor F(q) of this polyhedron, respecting the offset height/2.
@@ -11992,7 +11992,7 @@ class FormFactorPolygonalPrism(IFormFactorBorn):
"""
volume(FormFactorPolygonalPrism self) -> double
- double FormFactorPolygonalPrism::volume() const overridefinal
+ double FormFactorPolygonalPrism::volume() const override final
Returns the volume of this prism.
@@ -12004,7 +12004,7 @@ class FormFactorPolygonalPrism(IFormFactorBorn):
"""
getHeight(FormFactorPolygonalPrism self) -> double
- double FormFactorPolygonalPrism::getHeight() const
+ double FormFactorPolygonalPrism::getHeight() const
"""
return _libBornAgainCore.FormFactorPolygonalPrism_getHeight(self)
@@ -12014,7 +12014,7 @@ class FormFactorPolygonalPrism(IFormFactorBorn):
"""
radialExtension(FormFactorPolygonalPrism self) -> double
- double FormFactorPolygonalPrism::radialExtension() const overridefinal
+ double FormFactorPolygonalPrism::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -12053,7 +12053,7 @@ class FormFactorPolygonalSurface(IFormFactorBorn):
"""
evaluate_for_q(FormFactorPolygonalSurface self, cvector_t q) -> complex_t
- complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -12077,7 +12077,7 @@ class FormFactorPolygonalSurface(IFormFactorBorn):
"""
radialExtension(FormFactorPolygonalSurface self) -> double
- double FormFactorPolygonalSurface::radialExtension() const overridefinal
+ double FormFactorPolygonalSurface::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -12143,7 +12143,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
"""
clone(FormFactorAnisoPyramid self) -> FormFactorAnisoPyramid
- FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const overridefinal
+ FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const override final
Returns a clone of this ISample object.
@@ -12155,7 +12155,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
"""
accept(FormFactorAnisoPyramid self, INodeVisitor visitor)
- void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -12167,7 +12167,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
"""
getLength(FormFactorAnisoPyramid self) -> double
- double FormFactorAnisoPyramid::getLength() const
+ double FormFactorAnisoPyramid::getLength() const
"""
return _libBornAgainCore.FormFactorAnisoPyramid_getLength(self)
@@ -12177,7 +12177,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
"""
getWidth(FormFactorAnisoPyramid self) -> double
- double FormFactorAnisoPyramid::getWidth() const
+ double FormFactorAnisoPyramid::getWidth() const
"""
return _libBornAgainCore.FormFactorAnisoPyramid_getWidth(self)
@@ -12187,7 +12187,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
"""
getHeight(FormFactorAnisoPyramid self) -> double
- double FormFactorAnisoPyramid::getHeight() const
+ double FormFactorAnisoPyramid::getHeight() const
"""
return _libBornAgainCore.FormFactorAnisoPyramid_getHeight(self)
@@ -12197,7 +12197,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
"""
getAlpha(FormFactorAnisoPyramid self) -> double
- double FormFactorAnisoPyramid::getAlpha() const
+ double FormFactorAnisoPyramid::getAlpha() const
"""
return _libBornAgainCore.FormFactorAnisoPyramid_getAlpha(self)
@@ -12258,7 +12258,7 @@ class FormFactorBox(IFormFactorBorn):
"""
clone(FormFactorBox self) -> FormFactorBox
- FormFactorBox* FormFactorBox::clone() const overridefinal
+ FormFactorBox* FormFactorBox::clone() const override final
Returns a clone of this ISample object.
@@ -12270,7 +12270,7 @@ class FormFactorBox(IFormFactorBorn):
"""
accept(FormFactorBox self, INodeVisitor visitor)
- void FormFactorBox::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorBox::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -12282,7 +12282,7 @@ class FormFactorBox(IFormFactorBorn):
"""
getLength(FormFactorBox self) -> double
- double FormFactorBox::getLength() const
+ double FormFactorBox::getLength() const
"""
return _libBornAgainCore.FormFactorBox_getLength(self)
@@ -12292,7 +12292,7 @@ class FormFactorBox(IFormFactorBorn):
"""
getHeight(FormFactorBox self) -> double
- double FormFactorBox::getHeight() const
+ double FormFactorBox::getHeight() const
"""
return _libBornAgainCore.FormFactorBox_getHeight(self)
@@ -12302,7 +12302,7 @@ class FormFactorBox(IFormFactorBorn):
"""
getWidth(FormFactorBox self) -> double
- double FormFactorBox::getWidth() const
+ double FormFactorBox::getWidth() const
"""
return _libBornAgainCore.FormFactorBox_getWidth(self)
@@ -12312,7 +12312,7 @@ class FormFactorBox(IFormFactorBorn):
"""
radialExtension(FormFactorBox self) -> double
- double FormFactorBox::radialExtension() const overridefinal
+ double FormFactorBox::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -12324,7 +12324,7 @@ class FormFactorBox(IFormFactorBorn):
"""
evaluate_for_q(FormFactorBox self, cvector_t q) -> complex_t
- complex_t FormFactorBox::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorBox::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -12387,7 +12387,7 @@ class FormFactorCone(IFormFactorBorn):
"""
clone(FormFactorCone self) -> FormFactorCone
- FormFactorCone* FormFactorCone::clone() const overridefinal
+ FormFactorCone* FormFactorCone::clone() const override final
Returns a clone of this ISample object.
@@ -12399,7 +12399,7 @@ class FormFactorCone(IFormFactorBorn):
"""
accept(FormFactorCone self, INodeVisitor visitor)
- void FormFactorCone::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorCone::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -12411,7 +12411,7 @@ class FormFactorCone(IFormFactorBorn):
"""
getHeight(FormFactorCone self) -> double
- double FormFactorCone::getHeight() const
+ double FormFactorCone::getHeight() const
"""
return _libBornAgainCore.FormFactorCone_getHeight(self)
@@ -12421,7 +12421,7 @@ class FormFactorCone(IFormFactorBorn):
"""
getAlpha(FormFactorCone self) -> double
- double FormFactorCone::getAlpha() const
+ double FormFactorCone::getAlpha() const
"""
return _libBornAgainCore.FormFactorCone_getAlpha(self)
@@ -12431,7 +12431,7 @@ class FormFactorCone(IFormFactorBorn):
"""
getRadius(FormFactorCone self) -> double
- double FormFactorCone::getRadius() const
+ double FormFactorCone::getRadius() const
"""
return _libBornAgainCore.FormFactorCone_getRadius(self)
@@ -12441,7 +12441,7 @@ class FormFactorCone(IFormFactorBorn):
"""
radialExtension(FormFactorCone self) -> double
- double FormFactorCone::radialExtension() const overridefinal
+ double FormFactorCone::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -12453,7 +12453,7 @@ class FormFactorCone(IFormFactorBorn):
"""
evaluate_for_q(FormFactorCone self, cvector_t q) -> complex_t
- complex_t FormFactorCone::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorCone::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -12516,7 +12516,7 @@ class FormFactorCone6(FormFactorPolyhedron):
"""
clone(FormFactorCone6 self) -> FormFactorCone6
- FormFactorCone6* FormFactorCone6::clone() const overridefinal
+ FormFactorCone6* FormFactorCone6::clone() const override final
Returns a clone of this ISample object.
@@ -12528,7 +12528,7 @@ class FormFactorCone6(FormFactorPolyhedron):
"""
accept(FormFactorCone6 self, INodeVisitor visitor)
- void FormFactorCone6::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorCone6::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -12540,7 +12540,7 @@ class FormFactorCone6(FormFactorPolyhedron):
"""
getBaseEdge(FormFactorCone6 self) -> double
- double FormFactorCone6::getBaseEdge() const
+ double FormFactorCone6::getBaseEdge() const
"""
return _libBornAgainCore.FormFactorCone6_getBaseEdge(self)
@@ -12550,7 +12550,7 @@ class FormFactorCone6(FormFactorPolyhedron):
"""
getHeight(FormFactorCone6 self) -> double
- double FormFactorCone6::getHeight() const
+ double FormFactorCone6::getHeight() const
"""
return _libBornAgainCore.FormFactorCone6_getHeight(self)
@@ -12560,7 +12560,7 @@ class FormFactorCone6(FormFactorPolyhedron):
"""
getAlpha(FormFactorCone6 self) -> double
- double FormFactorCone6::getAlpha() const
+ double FormFactorCone6::getAlpha() const
"""
return _libBornAgainCore.FormFactorCone6_getAlpha(self)
@@ -12609,7 +12609,7 @@ class FormFactorCrystal(IFormFactor):
"""
clone(FormFactorCrystal self) -> FormFactorCrystal
- FormFactorCrystal* FormFactorCrystal::clone() const overridefinal
+ FormFactorCrystal* FormFactorCrystal::clone() const override final
Returns a clone of this ISample object.
@@ -12621,7 +12621,7 @@ class FormFactorCrystal(IFormFactor):
"""
accept(FormFactorCrystal self, INodeVisitor visitor)
- void FormFactorCrystal::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorCrystal::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -12645,7 +12645,7 @@ class FormFactorCrystal(IFormFactor):
"""
volume(FormFactorCrystal self) -> double
- double FormFactorCrystal::volume() const overridefinal
+ double FormFactorCrystal::volume() const override final
Returns the total volume of the particle of this form factor's shape.
@@ -12657,7 +12657,7 @@ class FormFactorCrystal(IFormFactor):
"""
radialExtension(FormFactorCrystal self) -> double
- double FormFactorCrystal::radialExtension() const overridefinal
+ double FormFactorCrystal::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -12681,7 +12681,7 @@ class FormFactorCrystal(IFormFactor):
"""
topZ(FormFactorCrystal self, IRotation rotation) -> double
- double FormFactorCrystal::topZ(const IRotation &rotation) const overridefinal
+ double FormFactorCrystal::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
@@ -12693,7 +12693,7 @@ class FormFactorCrystal(IFormFactor):
"""
evaluate(FormFactorCrystal self, WavevectorInfo wavevectors) -> complex_t
- complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+ complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
@@ -12757,7 +12757,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
"""
clone(FormFactorCuboctahedron self) -> FormFactorCuboctahedron
- FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const overridefinal
+ FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const override final
Returns a clone of this ISample object.
@@ -12769,7 +12769,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
"""
accept(FormFactorCuboctahedron self, INodeVisitor visitor)
- void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -12781,7 +12781,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
"""
getLength(FormFactorCuboctahedron self) -> double
- double FormFactorCuboctahedron::getLength() const
+ double FormFactorCuboctahedron::getLength() const
"""
return _libBornAgainCore.FormFactorCuboctahedron_getLength(self)
@@ -12791,7 +12791,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
"""
getHeight(FormFactorCuboctahedron self) -> double
- double FormFactorCuboctahedron::getHeight() const
+ double FormFactorCuboctahedron::getHeight() const
"""
return _libBornAgainCore.FormFactorCuboctahedron_getHeight(self)
@@ -12801,7 +12801,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
"""
getHeightRatio(FormFactorCuboctahedron self) -> double
- double FormFactorCuboctahedron::getHeightRatio() const
+ double FormFactorCuboctahedron::getHeightRatio() const
"""
return _libBornAgainCore.FormFactorCuboctahedron_getHeightRatio(self)
@@ -12811,7 +12811,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
"""
getAlpha(FormFactorCuboctahedron self) -> double
- double FormFactorCuboctahedron::getAlpha() const
+ double FormFactorCuboctahedron::getAlpha() const
"""
return _libBornAgainCore.FormFactorCuboctahedron_getAlpha(self)
@@ -12869,7 +12869,7 @@ class FormFactorCylinder(IFormFactorBorn):
"""
clone(FormFactorCylinder self) -> FormFactorCylinder
- FormFactorCylinder* FormFactorCylinder::clone() const overridefinal
+ FormFactorCylinder* FormFactorCylinder::clone() const override final
Returns a clone of this ISample object.
@@ -12881,7 +12881,7 @@ class FormFactorCylinder(IFormFactorBorn):
"""
accept(FormFactorCylinder self, INodeVisitor visitor)
- void FormFactorCylinder::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorCylinder::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -12893,7 +12893,7 @@ class FormFactorCylinder(IFormFactorBorn):
"""
getHeight(FormFactorCylinder self) -> double
- double FormFactorCylinder::getHeight() const
+ double FormFactorCylinder::getHeight() const
"""
return _libBornAgainCore.FormFactorCylinder_getHeight(self)
@@ -12903,7 +12903,7 @@ class FormFactorCylinder(IFormFactorBorn):
"""
getRadius(FormFactorCylinder self) -> double
- double FormFactorCylinder::getRadius() const
+ double FormFactorCylinder::getRadius() const
"""
return _libBornAgainCore.FormFactorCylinder_getRadius(self)
@@ -12913,7 +12913,7 @@ class FormFactorCylinder(IFormFactorBorn):
"""
radialExtension(FormFactorCylinder self) -> double
- double FormFactorCylinder::radialExtension() const overridefinal
+ double FormFactorCylinder::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -12925,7 +12925,7 @@ class FormFactorCylinder(IFormFactorBorn):
"""
evaluate_for_q(FormFactorCylinder self, cvector_t q) -> complex_t
- complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -12977,7 +12977,7 @@ class FormFactorDecoratorDebyeWaller(IFormFactorDecorator):
"""
clone(FormFactorDecoratorDebyeWaller self) -> FormFactorDecoratorDebyeWaller
- FormFactorDecoratorDebyeWaller* FormFactorDecoratorDebyeWaller::clone() const overridefinal
+ FormFactorDecoratorDebyeWaller* FormFactorDecoratorDebyeWaller::clone() const override final
Returns a clone of this ISample object.
@@ -12989,7 +12989,7 @@ class FormFactorDecoratorDebyeWaller(IFormFactorDecorator):
"""
accept(FormFactorDecoratorDebyeWaller self, INodeVisitor visitor)
- void FormFactorDecoratorDebyeWaller::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorDecoratorDebyeWaller::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13001,7 +13001,7 @@ class FormFactorDecoratorDebyeWaller(IFormFactorDecorator):
"""
evaluate(FormFactorDecoratorDebyeWaller self, WavevectorInfo wavevectors) -> complex_t
- complex_t FormFactorDecoratorDebyeWaller::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+ complex_t FormFactorDecoratorDebyeWaller::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
@@ -13066,7 +13066,7 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
"""
clone(FormFactorDodecahedron self) -> FormFactorDodecahedron
- FormFactorDodecahedron* FormFactorDodecahedron::clone() const overridefinal
+ FormFactorDodecahedron* FormFactorDodecahedron::clone() const override final
Returns a clone of this ISample object.
@@ -13078,7 +13078,7 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
"""
accept(FormFactorDodecahedron self, INodeVisitor visitor)
- void FormFactorDodecahedron::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorDodecahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13090,7 +13090,7 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
"""
getEdge(FormFactorDodecahedron self) -> double
- double FormFactorDodecahedron::getEdge() const
+ double FormFactorDodecahedron::getEdge() const
"""
return _libBornAgainCore.FormFactorDodecahedron_getEdge(self)
@@ -13137,7 +13137,7 @@ class FormFactorDot(IFormFactorBorn):
"""
clone(FormFactorDot self) -> FormFactorDot
- FormFactorDot* FormFactorDot::clone() const overridefinal
+ FormFactorDot* FormFactorDot::clone() const override final
Returns a clone of this ISample object.
@@ -13149,7 +13149,7 @@ class FormFactorDot(IFormFactorBorn):
"""
accept(FormFactorDot self, INodeVisitor visitor)
- void FormFactorDot::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorDot::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13161,7 +13161,7 @@ class FormFactorDot(IFormFactorBorn):
"""
radialExtension(FormFactorDot self) -> double
- double FormFactorDot::radialExtension() const overridefinal
+ double FormFactorDot::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -13173,7 +13173,7 @@ class FormFactorDot(IFormFactorBorn):
"""
evaluate_for_q(FormFactorDot self, cvector_t arg2) -> complex_t
- complex_t FormFactorDot::evaluate_for_q(cvector_t) const overridefinal
+ complex_t FormFactorDot::evaluate_for_q(cvector_t) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -13236,7 +13236,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
"""
clone(FormFactorEllipsoidalCylinder self) -> FormFactorEllipsoidalCylinder
- FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const overridefinal
+ FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const override final
Returns a clone of this ISample object.
@@ -13248,7 +13248,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
"""
accept(FormFactorEllipsoidalCylinder self, INodeVisitor visitor)
- void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13260,7 +13260,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
"""
getRadiusX(FormFactorEllipsoidalCylinder self) -> double
- double FormFactorEllipsoidalCylinder::getRadiusX() const
+ double FormFactorEllipsoidalCylinder::getRadiusX() const
"""
return _libBornAgainCore.FormFactorEllipsoidalCylinder_getRadiusX(self)
@@ -13270,7 +13270,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
"""
getRadiusY(FormFactorEllipsoidalCylinder self) -> double
- double FormFactorEllipsoidalCylinder::getRadiusY() const
+ double FormFactorEllipsoidalCylinder::getRadiusY() const
"""
return _libBornAgainCore.FormFactorEllipsoidalCylinder_getRadiusY(self)
@@ -13280,7 +13280,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
"""
getHeight(FormFactorEllipsoidalCylinder self) -> double
- double FormFactorEllipsoidalCylinder::getHeight() const
+ double FormFactorEllipsoidalCylinder::getHeight() const
"""
return _libBornAgainCore.FormFactorEllipsoidalCylinder_getHeight(self)
@@ -13290,7 +13290,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
"""
radialExtension(FormFactorEllipsoidalCylinder self) -> double
- double FormFactorEllipsoidalCylinder::radialExtension() const overridefinal
+ double FormFactorEllipsoidalCylinder::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -13302,7 +13302,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
"""
evaluate_for_q(FormFactorEllipsoidalCylinder self, cvector_t q) -> complex_t
- complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -13359,7 +13359,7 @@ class FormFactorFullSphere(IFormFactorBorn):
"""
clone(FormFactorFullSphere self) -> FormFactorFullSphere
- FormFactorFullSphere* FormFactorFullSphere::clone() const overridefinal
+ FormFactorFullSphere* FormFactorFullSphere::clone() const override final
Returns a clone of this ISample object.
@@ -13371,7 +13371,7 @@ class FormFactorFullSphere(IFormFactorBorn):
"""
accept(FormFactorFullSphere self, INodeVisitor visitor)
- void FormFactorFullSphere::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorFullSphere::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13383,7 +13383,7 @@ class FormFactorFullSphere(IFormFactorBorn):
"""
getRadius(FormFactorFullSphere self) -> double
- double FormFactorFullSphere::getRadius() const
+ double FormFactorFullSphere::getRadius() const
"""
return _libBornAgainCore.FormFactorFullSphere_getRadius(self)
@@ -13393,7 +13393,7 @@ class FormFactorFullSphere(IFormFactorBorn):
"""
radialExtension(FormFactorFullSphere self) -> double
- double FormFactorFullSphere::radialExtension() const overridefinal
+ double FormFactorFullSphere::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -13405,7 +13405,7 @@ class FormFactorFullSphere(IFormFactorBorn):
"""
bottomZ(FormFactorFullSphere self, IRotation rotation) -> double
- double FormFactorFullSphere::bottomZ(const IRotation &rotation) const overridefinal
+ double FormFactorFullSphere::bottomZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
@@ -13417,7 +13417,7 @@ class FormFactorFullSphere(IFormFactorBorn):
"""
topZ(FormFactorFullSphere self, IRotation rotation) -> double
- double FormFactorFullSphere::topZ(const IRotation &rotation) const overridefinal
+ double FormFactorFullSphere::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
@@ -13429,7 +13429,7 @@ class FormFactorFullSphere(IFormFactorBorn):
"""
evaluate_for_q(FormFactorFullSphere self, cvector_t q) -> complex_t
- complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -13489,7 +13489,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
"""
clone(FormFactorFullSpheroid self) -> FormFactorFullSpheroid
- FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const overridefinal
+ FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const override final
Returns a clone of this ISample object.
@@ -13501,7 +13501,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
"""
accept(FormFactorFullSpheroid self, INodeVisitor visitor)
- void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13513,7 +13513,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
"""
getHeight(FormFactorFullSpheroid self) -> double
- double FormFactorFullSpheroid::getHeight() const
+ double FormFactorFullSpheroid::getHeight() const
"""
return _libBornAgainCore.FormFactorFullSpheroid_getHeight(self)
@@ -13523,7 +13523,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
"""
getRadius(FormFactorFullSpheroid self) -> double
- double FormFactorFullSpheroid::getRadius() const
+ double FormFactorFullSpheroid::getRadius() const
"""
return _libBornAgainCore.FormFactorFullSpheroid_getRadius(self)
@@ -13533,7 +13533,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
"""
radialExtension(FormFactorFullSpheroid self) -> double
- double FormFactorFullSpheroid::radialExtension() const overridefinal
+ double FormFactorFullSpheroid::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -13545,7 +13545,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
"""
evaluate_for_q(FormFactorFullSpheroid self, cvector_t q) -> complex_t
- complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -13595,7 +13595,7 @@ class FormFactorGauss(IFormFactorBorn):
"""
clone(FormFactorGauss self) -> FormFactorGauss
- FormFactorGauss* FormFactorGauss::clone() const overridefinal
+ FormFactorGauss* FormFactorGauss::clone() const override final
Returns a clone of this ISample object.
@@ -13607,7 +13607,7 @@ class FormFactorGauss(IFormFactorBorn):
"""
accept(FormFactorGauss self, INodeVisitor visitor)
- void FormFactorGauss::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorGauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13619,7 +13619,7 @@ class FormFactorGauss(IFormFactorBorn):
"""
getWidth(FormFactorGauss self) -> double
- double FormFactorGauss::getWidth() const
+ double FormFactorGauss::getWidth() const
"""
return _libBornAgainCore.FormFactorGauss_getWidth(self)
@@ -13629,7 +13629,7 @@ class FormFactorGauss(IFormFactorBorn):
"""
getHeight(FormFactorGauss self) -> double
- double FormFactorGauss::getHeight() const
+ double FormFactorGauss::getHeight() const
"""
return _libBornAgainCore.FormFactorGauss_getHeight(self)
@@ -13639,7 +13639,7 @@ class FormFactorGauss(IFormFactorBorn):
"""
radialExtension(FormFactorGauss self) -> double
- double FormFactorGauss::radialExtension() const overridefinal
+ double FormFactorGauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -13651,7 +13651,7 @@ class FormFactorGauss(IFormFactorBorn):
"""
evaluate_for_q(FormFactorGauss self, cvector_t q) -> complex_t
- complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -13716,7 +13716,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
"""
clone(FormFactorHemiEllipsoid self) -> FormFactorHemiEllipsoid
- FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const overridefinal
+ FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const override final
Returns a clone of this ISample object.
@@ -13728,7 +13728,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
"""
accept(FormFactorHemiEllipsoid self, INodeVisitor visitor)
- void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13740,7 +13740,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
"""
getHeight(FormFactorHemiEllipsoid self) -> double
- double FormFactorHemiEllipsoid::getHeight() const
+ double FormFactorHemiEllipsoid::getHeight() const
"""
return _libBornAgainCore.FormFactorHemiEllipsoid_getHeight(self)
@@ -13750,7 +13750,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
"""
getRadiusX(FormFactorHemiEllipsoid self) -> double
- double FormFactorHemiEllipsoid::getRadiusX() const
+ double FormFactorHemiEllipsoid::getRadiusX() const
"""
return _libBornAgainCore.FormFactorHemiEllipsoid_getRadiusX(self)
@@ -13760,7 +13760,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
"""
getRadiusY(FormFactorHemiEllipsoid self) -> double
- double FormFactorHemiEllipsoid::getRadiusY() const
+ double FormFactorHemiEllipsoid::getRadiusY() const
"""
return _libBornAgainCore.FormFactorHemiEllipsoid_getRadiusY(self)
@@ -13770,7 +13770,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
"""
radialExtension(FormFactorHemiEllipsoid self) -> double
- double FormFactorHemiEllipsoid::radialExtension() const overridefinal
+ double FormFactorHemiEllipsoid::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -13782,7 +13782,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
"""
evaluate_for_q(FormFactorHemiEllipsoid self, cvector_t q) -> complex_t
- complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -13837,7 +13837,7 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
"""
clone(FormFactorIcosahedron self) -> FormFactorIcosahedron
- FormFactorIcosahedron* FormFactorIcosahedron::clone() const overridefinal
+ FormFactorIcosahedron* FormFactorIcosahedron::clone() const override final
Returns a clone of this ISample object.
@@ -13849,7 +13849,7 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
"""
accept(FormFactorIcosahedron self, INodeVisitor visitor)
- void FormFactorIcosahedron::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorIcosahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13861,7 +13861,7 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
"""
getEdge(FormFactorIcosahedron self) -> double
- double FormFactorIcosahedron::getEdge() const
+ double FormFactorIcosahedron::getEdge() const
"""
return _libBornAgainCore.FormFactorIcosahedron_getEdge(self)
@@ -13922,7 +13922,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
"""
clone(FormFactorLongBoxGauss self) -> FormFactorLongBoxGauss
- FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const overridefinal
+ FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const override final
Returns a clone of this ISample object.
@@ -13934,7 +13934,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
"""
accept(FormFactorLongBoxGauss self, INodeVisitor visitor)
- void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -13946,7 +13946,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
"""
getLength(FormFactorLongBoxGauss self) -> double
- double FormFactorLongBoxGauss::getLength() const
+ double FormFactorLongBoxGauss::getLength() const
"""
return _libBornAgainCore.FormFactorLongBoxGauss_getLength(self)
@@ -13956,7 +13956,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
"""
getHeight(FormFactorLongBoxGauss self) -> double
- double FormFactorLongBoxGauss::getHeight() const
+ double FormFactorLongBoxGauss::getHeight() const
"""
return _libBornAgainCore.FormFactorLongBoxGauss_getHeight(self)
@@ -13966,7 +13966,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
"""
getWidth(FormFactorLongBoxGauss self) -> double
- double FormFactorLongBoxGauss::getWidth() const
+ double FormFactorLongBoxGauss::getWidth() const
"""
return _libBornAgainCore.FormFactorLongBoxGauss_getWidth(self)
@@ -13976,7 +13976,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
"""
radialExtension(FormFactorLongBoxGauss self) -> double
- double FormFactorLongBoxGauss::radialExtension() const overridefinal
+ double FormFactorLongBoxGauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -13988,7 +13988,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
"""
evaluate_for_q(FormFactorLongBoxGauss self, cvector_t q) -> complex_t
- complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -14051,7 +14051,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
"""
clone(FormFactorLongBoxLorentz self) -> FormFactorLongBoxLorentz
- FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const overridefinal
+ FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const override final
Returns a clone of this ISample object.
@@ -14063,7 +14063,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
"""
accept(FormFactorLongBoxLorentz self, INodeVisitor visitor)
- void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14075,7 +14075,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
"""
getLength(FormFactorLongBoxLorentz self) -> double
- double FormFactorLongBoxLorentz::getLength() const
+ double FormFactorLongBoxLorentz::getLength() const
"""
return _libBornAgainCore.FormFactorLongBoxLorentz_getLength(self)
@@ -14085,7 +14085,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
"""
getHeight(FormFactorLongBoxLorentz self) -> double
- double FormFactorLongBoxLorentz::getHeight() const
+ double FormFactorLongBoxLorentz::getHeight() const
"""
return _libBornAgainCore.FormFactorLongBoxLorentz_getHeight(self)
@@ -14095,7 +14095,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
"""
getWidth(FormFactorLongBoxLorentz self) -> double
- double FormFactorLongBoxLorentz::getWidth() const
+ double FormFactorLongBoxLorentz::getWidth() const
"""
return _libBornAgainCore.FormFactorLongBoxLorentz_getWidth(self)
@@ -14105,7 +14105,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
"""
radialExtension(FormFactorLongBoxLorentz self) -> double
- double FormFactorLongBoxLorentz::radialExtension() const overridefinal
+ double FormFactorLongBoxLorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -14117,7 +14117,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
"""
evaluate_for_q(FormFactorLongBoxLorentz self, cvector_t q) -> complex_t
- complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -14180,7 +14180,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
"""
clone(FormFactorLongRipple1Gauss self) -> FormFactorLongRipple1Gauss
- FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const overridefinal
+ FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const override final
Returns a clone of this ISample object.
@@ -14192,7 +14192,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
"""
accept(FormFactorLongRipple1Gauss self, INodeVisitor visitor)
- void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14204,7 +14204,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
"""
getHeight(FormFactorLongRipple1Gauss self) -> double
- double FormFactorLongRipple1Gauss::getHeight() const
+ double FormFactorLongRipple1Gauss::getHeight() const
"""
return _libBornAgainCore.FormFactorLongRipple1Gauss_getHeight(self)
@@ -14214,7 +14214,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
"""
getWidth(FormFactorLongRipple1Gauss self) -> double
- double FormFactorLongRipple1Gauss::getWidth() const
+ double FormFactorLongRipple1Gauss::getWidth() const
"""
return _libBornAgainCore.FormFactorLongRipple1Gauss_getWidth(self)
@@ -14224,7 +14224,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
"""
getLength(FormFactorLongRipple1Gauss self) -> double
- double FormFactorLongRipple1Gauss::getLength() const
+ double FormFactorLongRipple1Gauss::getLength() const
"""
return _libBornAgainCore.FormFactorLongRipple1Gauss_getLength(self)
@@ -14234,7 +14234,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
"""
radialExtension(FormFactorLongRipple1Gauss self) -> double
- double FormFactorLongRipple1Gauss::radialExtension() const overridefinal
+ double FormFactorLongRipple1Gauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -14246,7 +14246,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn):
"""
evaluate_for_q(FormFactorLongRipple1Gauss self, cvector_t q) -> complex_t
- complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
@@ -14309,7 +14309,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
"""
clone(FormFactorLongRipple1Lorentz self) -> FormFactorLongRipple1Lorentz
- FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const overridefinal
+ FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const override final
Returns a clone of this ISample object.
@@ -14321,7 +14321,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
"""
accept(FormFactorLongRipple1Lorentz self, INodeVisitor visitor)
- void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14333,7 +14333,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
"""
radialExtension(FormFactorLongRipple1Lorentz self) -> double
- double FormFactorLongRipple1Lorentz::radialExtension() const overridefinal
+ double FormFactorLongRipple1Lorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -14345,7 +14345,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
"""
getHeight(FormFactorLongRipple1Lorentz self) -> double
- double FormFactorLongRipple1Lorentz::getHeight() const
+ double FormFactorLongRipple1Lorentz::getHeight() const
"""
return _libBornAgainCore.FormFactorLongRipple1Lorentz_getHeight(self)
@@ -14355,7 +14355,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
"""
getWidth(FormFactorLongRipple1Lorentz self) -> double
- double FormFactorLongRipple1Lorentz::getWidth() const
+ double FormFactorLongRipple1Lorentz::getWidth() const
"""
return _libBornAgainCore.FormFactorLongRipple1Lorentz_getWidth(self)
@@ -14365,7 +14365,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
"""
getLength(FormFactorLongRipple1Lorentz self) -> double
- double FormFactorLongRipple1Lorentz::getLength() const
+ double FormFactorLongRipple1Lorentz::getLength() const
"""
return _libBornAgainCore.FormFactorLongRipple1Lorentz_getLength(self)
@@ -14375,7 +14375,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn):
"""
evaluate_for_q(FormFactorLongRipple1Lorentz self, cvector_t q) -> complex_t
- complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
@@ -14441,7 +14441,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
clone(FormFactorLongRipple2Gauss self) -> FormFactorLongRipple2Gauss
- FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const overridefinal
+ FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const override final
Returns a clone of this ISample object.
@@ -14453,7 +14453,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
accept(FormFactorLongRipple2Gauss self, INodeVisitor visitor)
- void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14465,7 +14465,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
getHeight(FormFactorLongRipple2Gauss self) -> double
- double FormFactorLongRipple2Gauss::getHeight() const
+ double FormFactorLongRipple2Gauss::getHeight() const
"""
return _libBornAgainCore.FormFactorLongRipple2Gauss_getHeight(self)
@@ -14475,7 +14475,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
getWidth(FormFactorLongRipple2Gauss self) -> double
- double FormFactorLongRipple2Gauss::getWidth() const
+ double FormFactorLongRipple2Gauss::getWidth() const
"""
return _libBornAgainCore.FormFactorLongRipple2Gauss_getWidth(self)
@@ -14485,7 +14485,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
getLength(FormFactorLongRipple2Gauss self) -> double
- double FormFactorLongRipple2Gauss::getLength() const
+ double FormFactorLongRipple2Gauss::getLength() const
"""
return _libBornAgainCore.FormFactorLongRipple2Gauss_getLength(self)
@@ -14495,7 +14495,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
getAsymmetry(FormFactorLongRipple2Gauss self) -> double
- double FormFactorLongRipple2Gauss::getAsymmetry() const
+ double FormFactorLongRipple2Gauss::getAsymmetry() const
"""
return _libBornAgainCore.FormFactorLongRipple2Gauss_getAsymmetry(self)
@@ -14505,7 +14505,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
radialExtension(FormFactorLongRipple2Gauss self) -> double
- double FormFactorLongRipple2Gauss::radialExtension() const overridefinal
+ double FormFactorLongRipple2Gauss::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -14517,7 +14517,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn):
"""
evaluate_for_q(FormFactorLongRipple2Gauss self, cvector_t q) -> complex_t
- complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
@@ -14581,7 +14581,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
clone(FormFactorLongRipple2Lorentz self) -> FormFactorLongRipple2Lorentz
- FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const overridefinal
+ FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const override final
Returns a clone of this ISample object.
@@ -14593,7 +14593,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
accept(FormFactorLongRipple2Lorentz self, INodeVisitor visitor)
- void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14605,7 +14605,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
getHeight(FormFactorLongRipple2Lorentz self) -> double
- double FormFactorLongRipple2Lorentz::getHeight() const
+ double FormFactorLongRipple2Lorentz::getHeight() const
"""
return _libBornAgainCore.FormFactorLongRipple2Lorentz_getHeight(self)
@@ -14615,7 +14615,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
getWidth(FormFactorLongRipple2Lorentz self) -> double
- double FormFactorLongRipple2Lorentz::getWidth() const
+ double FormFactorLongRipple2Lorentz::getWidth() const
"""
return _libBornAgainCore.FormFactorLongRipple2Lorentz_getWidth(self)
@@ -14625,7 +14625,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
getLength(FormFactorLongRipple2Lorentz self) -> double
- double FormFactorLongRipple2Lorentz::getLength() const
+ double FormFactorLongRipple2Lorentz::getLength() const
"""
return _libBornAgainCore.FormFactorLongRipple2Lorentz_getLength(self)
@@ -14635,7 +14635,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
getAsymmetry(FormFactorLongRipple2Lorentz self) -> double
- double FormFactorLongRipple2Lorentz::getAsymmetry() const
+ double FormFactorLongRipple2Lorentz::getAsymmetry() const
"""
return _libBornAgainCore.FormFactorLongRipple2Lorentz_getAsymmetry(self)
@@ -14645,7 +14645,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
radialExtension(FormFactorLongRipple2Lorentz self) -> double
- double FormFactorLongRipple2Lorentz::radialExtension() const overridefinal
+ double FormFactorLongRipple2Lorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -14657,7 +14657,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn):
"""
evaluate_for_q(FormFactorLongRipple2Lorentz self, cvector_t q) -> complex_t
- complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
@@ -14707,7 +14707,7 @@ class FormFactorLorentz(IFormFactorBorn):
"""
clone(FormFactorLorentz self) -> FormFactorLorentz
- FormFactorLorentz* FormFactorLorentz::clone() const overridefinal
+ FormFactorLorentz* FormFactorLorentz::clone() const override final
Returns a clone of this ISample object.
@@ -14719,7 +14719,7 @@ class FormFactorLorentz(IFormFactorBorn):
"""
accept(FormFactorLorentz self, INodeVisitor visitor)
- void FormFactorLorentz::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorLorentz::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14731,7 +14731,7 @@ class FormFactorLorentz(IFormFactorBorn):
"""
getWidth(FormFactorLorentz self) -> double
- double FormFactorLorentz::getWidth() const
+ double FormFactorLorentz::getWidth() const
"""
return _libBornAgainCore.FormFactorLorentz_getWidth(self)
@@ -14741,7 +14741,7 @@ class FormFactorLorentz(IFormFactorBorn):
"""
getHeight(FormFactorLorentz self) -> double
- double FormFactorLorentz::getHeight() const
+ double FormFactorLorentz::getHeight() const
"""
return _libBornAgainCore.FormFactorLorentz_getHeight(self)
@@ -14751,7 +14751,7 @@ class FormFactorLorentz(IFormFactorBorn):
"""
radialExtension(FormFactorLorentz self) -> double
- double FormFactorLorentz::radialExtension() const overridefinal
+ double FormFactorLorentz::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -14763,7 +14763,7 @@ class FormFactorLorentz(IFormFactorBorn):
"""
evaluate_for_q(FormFactorLorentz self, cvector_t q) -> complex_t
- complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -14823,7 +14823,7 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
"""
clone(FormFactorPrism3 self) -> FormFactorPrism3
- FormFactorPrism3* FormFactorPrism3::clone() const overridefinal
+ FormFactorPrism3* FormFactorPrism3::clone() const override final
Returns a clone of this ISample object.
@@ -14835,7 +14835,7 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
"""
accept(FormFactorPrism3 self, INodeVisitor visitor)
- void FormFactorPrism3::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorPrism3::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14847,7 +14847,7 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
"""
getBaseEdge(FormFactorPrism3 self) -> double
- double FormFactorPrism3::getBaseEdge() const
+ double FormFactorPrism3::getBaseEdge() const
"""
return _libBornAgainCore.FormFactorPrism3_getBaseEdge(self)
@@ -14905,7 +14905,7 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
"""
clone(FormFactorPrism6 self) -> FormFactorPrism6
- FormFactorPrism6* FormFactorPrism6::clone() const overridefinal
+ FormFactorPrism6* FormFactorPrism6::clone() const override final
Returns a clone of this ISample object.
@@ -14917,7 +14917,7 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
"""
accept(FormFactorPrism6 self, INodeVisitor visitor)
- void FormFactorPrism6::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorPrism6::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -14929,7 +14929,7 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
"""
getBaseEdge(FormFactorPrism6 self) -> double
- double FormFactorPrism6::getBaseEdge() const
+ double FormFactorPrism6::getBaseEdge() const
"""
return _libBornAgainCore.FormFactorPrism6_getBaseEdge(self)
@@ -14990,7 +14990,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
"""
clone(FormFactorPyramid self) -> FormFactorPyramid
- FormFactorPyramid* FormFactorPyramid::clone() const overridefinal
+ FormFactorPyramid* FormFactorPyramid::clone() const override final
Returns a clone of this ISample object.
@@ -15002,7 +15002,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
"""
accept(FormFactorPyramid self, INodeVisitor visitor)
- void FormFactorPyramid::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorPyramid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15014,7 +15014,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
"""
getHeight(FormFactorPyramid self) -> double
- double FormFactorPyramid::getHeight() const
+ double FormFactorPyramid::getHeight() const
"""
return _libBornAgainCore.FormFactorPyramid_getHeight(self)
@@ -15024,7 +15024,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
"""
getBaseEdge(FormFactorPyramid self) -> double
- double FormFactorPyramid::getBaseEdge() const
+ double FormFactorPyramid::getBaseEdge() const
"""
return _libBornAgainCore.FormFactorPyramid_getBaseEdge(self)
@@ -15034,7 +15034,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
"""
getAlpha(FormFactorPyramid self) -> double
- double FormFactorPyramid::getAlpha() const
+ double FormFactorPyramid::getAlpha() const
"""
return _libBornAgainCore.FormFactorPyramid_getAlpha(self)
@@ -15095,7 +15095,7 @@ class FormFactorRipple1(IFormFactorBorn):
"""
clone(FormFactorRipple1 self) -> FormFactorRipple1
- FormFactorRipple1* FormFactorRipple1::clone() const overridefinal
+ FormFactorRipple1* FormFactorRipple1::clone() const override final
Returns a clone of this ISample object.
@@ -15107,7 +15107,7 @@ class FormFactorRipple1(IFormFactorBorn):
"""
accept(FormFactorRipple1 self, INodeVisitor visitor)
- void FormFactorRipple1::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorRipple1::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15119,7 +15119,7 @@ class FormFactorRipple1(IFormFactorBorn):
"""
getLength(FormFactorRipple1 self) -> double
- double FormFactorRipple1::getLength() const
+ double FormFactorRipple1::getLength() const
"""
return _libBornAgainCore.FormFactorRipple1_getLength(self)
@@ -15129,7 +15129,7 @@ class FormFactorRipple1(IFormFactorBorn):
"""
getHeight(FormFactorRipple1 self) -> double
- double FormFactorRipple1::getHeight() const
+ double FormFactorRipple1::getHeight() const
"""
return _libBornAgainCore.FormFactorRipple1_getHeight(self)
@@ -15139,7 +15139,7 @@ class FormFactorRipple1(IFormFactorBorn):
"""
getWidth(FormFactorRipple1 self) -> double
- double FormFactorRipple1::getWidth() const
+ double FormFactorRipple1::getWidth() const
"""
return _libBornAgainCore.FormFactorRipple1_getWidth(self)
@@ -15149,7 +15149,7 @@ class FormFactorRipple1(IFormFactorBorn):
"""
radialExtension(FormFactorRipple1 self) -> double
- double FormFactorRipple1::radialExtension() const overridefinal
+ double FormFactorRipple1::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -15161,7 +15161,7 @@ class FormFactorRipple1(IFormFactorBorn):
"""
evaluate_for_q(FormFactorRipple1 self, cvector_t q) -> complex_t
- complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
@@ -15227,7 +15227,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
clone(FormFactorRipple2 self) -> FormFactorRipple2
- FormFactorRipple2* FormFactorRipple2::clone() const overridefinal
+ FormFactorRipple2* FormFactorRipple2::clone() const override final
Returns a clone of this ISample object.
@@ -15239,7 +15239,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
accept(FormFactorRipple2 self, INodeVisitor visitor)
- void FormFactorRipple2::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorRipple2::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15251,7 +15251,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
getHeight(FormFactorRipple2 self) -> double
- double FormFactorRipple2::getHeight() const
+ double FormFactorRipple2::getHeight() const
"""
return _libBornAgainCore.FormFactorRipple2_getHeight(self)
@@ -15261,7 +15261,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
getWidth(FormFactorRipple2 self) -> double
- double FormFactorRipple2::getWidth() const
+ double FormFactorRipple2::getWidth() const
"""
return _libBornAgainCore.FormFactorRipple2_getWidth(self)
@@ -15271,7 +15271,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
getLength(FormFactorRipple2 self) -> double
- double FormFactorRipple2::getLength() const
+ double FormFactorRipple2::getLength() const
"""
return _libBornAgainCore.FormFactorRipple2_getLength(self)
@@ -15281,7 +15281,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
getAsymmetry(FormFactorRipple2 self) -> double
- double FormFactorRipple2::getAsymmetry() const
+ double FormFactorRipple2::getAsymmetry() const
"""
return _libBornAgainCore.FormFactorRipple2_getAsymmetry(self)
@@ -15291,7 +15291,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
radialExtension(FormFactorRipple2 self) -> double
- double FormFactorRipple2::radialExtension() const overridefinal
+ double FormFactorRipple2::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -15303,7 +15303,7 @@ class FormFactorRipple2(IFormFactorBorn):
"""
evaluate_for_q(FormFactorRipple2 self, cvector_t q) -> complex_t
- complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
@@ -15352,7 +15352,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
"""
clone(FormFactorSphereGaussianRadius self) -> FormFactorSphereGaussianRadius
- FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const overridefinal
+ FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const override final
Returns a clone of this ISample object.
@@ -15364,7 +15364,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
"""
accept(FormFactorSphereGaussianRadius self, INodeVisitor visitor)
- void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15376,7 +15376,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
"""
radialExtension(FormFactorSphereGaussianRadius self) -> double
- double FormFactorSphereGaussianRadius::radialExtension() const overridefinal
+ double FormFactorSphereGaussianRadius::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -15388,7 +15388,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
"""
evaluate_for_q(FormFactorSphereGaussianRadius self, cvector_t q) -> complex_t
- complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -15437,7 +15437,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
"""
clone(FormFactorSphereLogNormalRadius self) -> FormFactorSphereLogNormalRadius
- FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const overridefinal
+ FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const override final
Returns a clone of this ISample object.
@@ -15449,7 +15449,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
"""
accept(FormFactorSphereLogNormalRadius self, INodeVisitor visitor)
- void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15461,7 +15461,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
"""
radialExtension(FormFactorSphereLogNormalRadius self) -> double
- double FormFactorSphereLogNormalRadius::radialExtension() const overridefinal
+ double FormFactorSphereLogNormalRadius::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -15473,7 +15473,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
"""
evaluate_for_q(FormFactorSphereLogNormalRadius self, cvector_t q) -> complex_t
- complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -15522,7 +15522,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
"""
clone(FormFactorSphereUniformRadius self) -> FormFactorSphereUniformRadius
- FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const overridefinal
+ FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const override final
Returns a clone of this ISample object.
@@ -15534,7 +15534,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
"""
accept(FormFactorSphereUniformRadius self, INodeVisitor visitor)
- void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15546,7 +15546,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
"""
radialExtension(FormFactorSphereUniformRadius self) -> double
- double FormFactorSphereUniformRadius::radialExtension() const overridefinal
+ double FormFactorSphereUniformRadius::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -15558,7 +15558,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn):
"""
evaluate_for_q(FormFactorSphereUniformRadius self, cvector_t q) -> complex_t
- complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -15621,7 +15621,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
"""
clone(FormFactorTetrahedron self) -> FormFactorTetrahedron
- FormFactorTetrahedron* FormFactorTetrahedron::clone() const overridefinal
+ FormFactorTetrahedron* FormFactorTetrahedron::clone() const override final
Returns a clone of this ISample object.
@@ -15633,7 +15633,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
"""
accept(FormFactorTetrahedron self, INodeVisitor visitor)
- void FormFactorTetrahedron::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorTetrahedron::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15645,7 +15645,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
"""
getBaseEdge(FormFactorTetrahedron self) -> double
- double FormFactorTetrahedron::getBaseEdge() const
+ double FormFactorTetrahedron::getBaseEdge() const
"""
return _libBornAgainCore.FormFactorTetrahedron_getBaseEdge(self)
@@ -15655,7 +15655,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
"""
getHeight(FormFactorTetrahedron self) -> double
- double FormFactorTetrahedron::getHeight() const
+ double FormFactorTetrahedron::getHeight() const
"""
return _libBornAgainCore.FormFactorTetrahedron_getHeight(self)
@@ -15665,7 +15665,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
"""
getAlpha(FormFactorTetrahedron self) -> double
- double FormFactorTetrahedron::getAlpha() const
+ double FormFactorTetrahedron::getAlpha() const
"""
return _libBornAgainCore.FormFactorTetrahedron_getAlpha(self)
@@ -15723,7 +15723,7 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
"""
clone(FormFactorTruncatedCube self) -> FormFactorTruncatedCube
- FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const overridefinal
+ FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const override final
Returns a clone of this ISample object.
@@ -15735,7 +15735,7 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
"""
accept(FormFactorTruncatedCube self, INodeVisitor visitor)
- void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15747,7 +15747,7 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
"""
getLength(FormFactorTruncatedCube self) -> double
- double FormFactorTruncatedCube::getLength() const
+ double FormFactorTruncatedCube::getLength() const
"""
return _libBornAgainCore.FormFactorTruncatedCube_getLength(self)
@@ -15757,7 +15757,7 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
"""
getRemovedLength(FormFactorTruncatedCube self) -> double
- double FormFactorTruncatedCube::getRemovedLength() const
+ double FormFactorTruncatedCube::getRemovedLength() const
"""
return _libBornAgainCore.FormFactorTruncatedCube_getRemovedLength(self)
@@ -15819,7 +15819,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
"""
clone(FormFactorTruncatedSphere self) -> FormFactorTruncatedSphere
- FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const overridefinal
+ FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const override final
Returns a clone of this ISample object.
@@ -15831,7 +15831,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
"""
accept(FormFactorTruncatedSphere self, INodeVisitor visitor)
- void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15843,7 +15843,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
"""
getHeight(FormFactorTruncatedSphere self) -> double
- double FormFactorTruncatedSphere::getHeight() const
+ double FormFactorTruncatedSphere::getHeight() const
"""
return _libBornAgainCore.FormFactorTruncatedSphere_getHeight(self)
@@ -15853,7 +15853,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
"""
getRadius(FormFactorTruncatedSphere self) -> double
- double FormFactorTruncatedSphere::getRadius() const
+ double FormFactorTruncatedSphere::getRadius() const
"""
return _libBornAgainCore.FormFactorTruncatedSphere_getRadius(self)
@@ -15863,7 +15863,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
"""
getRemovedTop(FormFactorTruncatedSphere self) -> double
- double FormFactorTruncatedSphere::getRemovedTop() const
+ double FormFactorTruncatedSphere::getRemovedTop() const
"""
return _libBornAgainCore.FormFactorTruncatedSphere_getRemovedTop(self)
@@ -15873,7 +15873,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
"""
radialExtension(FormFactorTruncatedSphere self) -> double
- double FormFactorTruncatedSphere::radialExtension() const overridefinal
+ double FormFactorTruncatedSphere::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -15885,7 +15885,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
"""
evaluate_for_q(FormFactorTruncatedSphere self, cvector_t q) -> complex_t
- complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const override final
Complex formfactor.
@@ -15952,7 +15952,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
clone(FormFactorTruncatedSpheroid self) -> FormFactorTruncatedSpheroid
- FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const overridefinal
+ FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const override final
Returns a clone of this ISample object.
@@ -15964,7 +15964,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
accept(FormFactorTruncatedSpheroid self, INodeVisitor visitor)
- void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -15976,7 +15976,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
getRadius(FormFactorTruncatedSpheroid self) -> double
- double FormFactorTruncatedSpheroid::getRadius() const
+ double FormFactorTruncatedSpheroid::getRadius() const
"""
return _libBornAgainCore.FormFactorTruncatedSpheroid_getRadius(self)
@@ -15986,7 +15986,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
getHeight(FormFactorTruncatedSpheroid self) -> double
- double FormFactorTruncatedSpheroid::getHeight() const
+ double FormFactorTruncatedSpheroid::getHeight() const
"""
return _libBornAgainCore.FormFactorTruncatedSpheroid_getHeight(self)
@@ -15996,7 +15996,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
getHeightFlattening(FormFactorTruncatedSpheroid self) -> double
- double FormFactorTruncatedSpheroid::getHeightFlattening() const
+ double FormFactorTruncatedSpheroid::getHeightFlattening() const
"""
return _libBornAgainCore.FormFactorTruncatedSpheroid_getHeightFlattening(self)
@@ -16006,7 +16006,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
getRemovedTop(FormFactorTruncatedSpheroid self) -> double
- double FormFactorTruncatedSpheroid::getRemovedTop() const
+ double FormFactorTruncatedSpheroid::getRemovedTop() const
"""
return _libBornAgainCore.FormFactorTruncatedSpheroid_getRemovedTop(self)
@@ -16016,7 +16016,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
radialExtension(FormFactorTruncatedSpheroid self) -> double
- double FormFactorTruncatedSpheroid::radialExtension() const overridefinal
+ double FormFactorTruncatedSpheroid::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -16028,7 +16028,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
"""
evaluate_for_q(FormFactorTruncatedSpheroid self, cvector_t q) -> complex_t
- complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const overridefinal
+ complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const override final
Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python.
@@ -16081,7 +16081,7 @@ class FormFactorWeighted(IFormFactor):
"""
clone(FormFactorWeighted self) -> FormFactorWeighted
- FormFactorWeighted * FormFactorWeighted::clone() const overridefinal
+ FormFactorWeighted * FormFactorWeighted::clone() const override final
Returns a clone of this ISample object.
@@ -16093,7 +16093,7 @@ class FormFactorWeighted(IFormFactor):
"""
accept(FormFactorWeighted self, INodeVisitor visitor)
- void FormFactorWeighted::accept(INodeVisitor *visitor) const overridefinal
+ void FormFactorWeighted::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -16105,7 +16105,7 @@ class FormFactorWeighted(IFormFactor):
"""
radialExtension(FormFactorWeighted self) -> double
- double FormFactorWeighted::radialExtension() const overridefinal
+ double FormFactorWeighted::radialExtension() const override final
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
@@ -16117,7 +16117,7 @@ class FormFactorWeighted(IFormFactor):
"""
bottomZ(FormFactorWeighted self, IRotation rotation) -> double
- double FormFactorWeighted::bottomZ(const IRotation &rotation) const overridefinal
+ double FormFactorWeighted::bottomZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
@@ -16129,7 +16129,7 @@ class FormFactorWeighted(IFormFactor):
"""
topZ(FormFactorWeighted self, IRotation rotation) -> double
- double FormFactorWeighted::topZ(const IRotation &rotation) const overridefinal
+ double FormFactorWeighted::topZ(const IRotation &rotation) const override final
Returns the z-coordinate of the lowest point in this shape after a given rotation.
@@ -16152,7 +16152,7 @@ class FormFactorWeighted(IFormFactor):
"""
setAmbientMaterial(FormFactorWeighted self, Material material)
- void FormFactorWeighted::setAmbientMaterial(Material material) overridefinal
+ void FormFactorWeighted::setAmbientMaterial(Material material) override final
Passes the material in which this particle is embedded.
@@ -16164,7 +16164,7 @@ class FormFactorWeighted(IFormFactor):
"""
evaluate(FormFactorWeighted self, WavevectorInfo wavevectors) -> complex_t
- complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const overridefinal
+ complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const override final
Returns scattering amplitude for complex wavevectors ki, kf.
@@ -16270,7 +16270,7 @@ class Simulation(ICloneable, INode):
"""
getBeamIntensity(Simulation self) -> double
- double Simulation::getBeamIntensity() const
+ double Simulation::getBeamIntensity() const
"""
return _libBornAgainCore.Simulation_getBeamIntensity(self)
@@ -16336,7 +16336,7 @@ class Simulation(ICloneable, INode):
"""
sample(Simulation self) -> MultiLayer
- const MultiLayer * Simulation::sample() const
+ const MultiLayer * Simulation::sample() const
"""
return _libBornAgainCore.Simulation_sample(self)
@@ -16366,7 +16366,7 @@ class Simulation(ICloneable, INode):
"""
background(Simulation self) -> IBackground
- const IBackground* Simulation::background() const
+ const IBackground* Simulation::background() const
"""
return _libBornAgainCore.Simulation_background(self)
@@ -16412,7 +16412,7 @@ class Simulation(ICloneable, INode):
"""
getDistributionHandler(Simulation self) -> DistributionHandler const &
- const DistributionHandler& Simulation::getDistributionHandler() const
+ const DistributionHandler& Simulation::getDistributionHandler() const
"""
return _libBornAgainCore.Simulation_getDistributionHandler(self)
@@ -16515,7 +16515,7 @@ class SimulationOptions(_object):
"""
isIntegrate(SimulationOptions self) -> bool
- bool SimulationOptions::isIntegrate() const
+ bool SimulationOptions::isIntegrate() const
"""
return _libBornAgainCore.SimulationOptions_isIntegrate(self)
@@ -16525,7 +16525,7 @@ class SimulationOptions(_object):
"""
getMcPoints(SimulationOptions self) -> size_t
- size_t SimulationOptions::getMcPoints() const
+ size_t SimulationOptions::getMcPoints() const
"""
return _libBornAgainCore.SimulationOptions_getMcPoints(self)
@@ -16570,7 +16570,7 @@ class SimulationOptions(_object):
"""
getNumberOfThreads(SimulationOptions self) -> int
- int SimulationOptions::getNumberOfThreads() const
+ int SimulationOptions::getNumberOfThreads() const
"""
return _libBornAgainCore.SimulationOptions_getNumberOfThreads(self)
@@ -16592,7 +16592,7 @@ class SimulationOptions(_object):
"""
getNumberOfBatches(SimulationOptions self) -> int
- int SimulationOptions::getNumberOfBatches() const
+ int SimulationOptions::getNumberOfBatches() const
"""
return _libBornAgainCore.SimulationOptions_getNumberOfBatches(self)
@@ -16602,7 +16602,7 @@ class SimulationOptions(_object):
"""
getCurrentBatch(SimulationOptions self) -> int
- int SimulationOptions::getCurrentBatch() const
+ int SimulationOptions::getCurrentBatch() const
"""
return _libBornAgainCore.SimulationOptions_getCurrentBatch(self)
@@ -16624,7 +16624,7 @@ class SimulationOptions(_object):
"""
getHardwareConcurrency(SimulationOptions self) -> int
- int SimulationOptions::getHardwareConcurrency() const
+ int SimulationOptions::getHardwareConcurrency() const
"""
return _libBornAgainCore.SimulationOptions_getHardwareConcurrency(self)
@@ -16644,7 +16644,7 @@ class SimulationOptions(_object):
"""
includeSpecular(SimulationOptions self) -> bool
- bool SimulationOptions::includeSpecular() const
+ bool SimulationOptions::includeSpecular() const
"""
return _libBornAgainCore.SimulationOptions_includeSpecular(self)
@@ -16664,7 +16664,7 @@ class SimulationOptions(_object):
"""
useAvgMaterials(SimulationOptions self) -> bool
- bool SimulationOptions::useAvgMaterials() const
+ bool SimulationOptions::useAvgMaterials() const
"""
return _libBornAgainCore.SimulationOptions_useAvgMaterials(self)
@@ -16715,7 +16715,7 @@ class GISASSimulation(Simulation):
"""
clone(GISASSimulation self) -> GISASSimulation
- GISASSimulation* GISASSimulation::clone() const
+ GISASSimulation* GISASSimulation::clone() const
"""
return _libBornAgainCore.GISASSimulation_clone(self)
@@ -17471,7 +17471,7 @@ class IHistogram(_object):
"""
axesUnits(IHistogram self) -> std::string
- std::string IHistogram::axesUnits() const
+ std::string IHistogram::axesUnits() const
"""
return _libBornAgainCore.IHistogram_axesUnits(self)
@@ -17904,7 +17904,7 @@ class ConstantBackground(IBackground):
"""
clone(ConstantBackground self) -> ConstantBackground
- ConstantBackground * ConstantBackground::clone() const overridefinal
+ ConstantBackground * ConstantBackground::clone() const override final
"""
return _libBornAgainCore.ConstantBackground_clone(self)
@@ -17914,7 +17914,7 @@ class ConstantBackground(IBackground):
"""
backgroundValue(ConstantBackground self) -> double
- double ConstantBackground::backgroundValue() const
+ double ConstantBackground::backgroundValue() const
"""
return _libBornAgainCore.ConstantBackground_backgroundValue(self)
@@ -17936,7 +17936,7 @@ class ConstantBackground(IBackground):
"""
addBackGround(ConstantBackground self, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator start, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator end)
- void ConstantBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const overridefinal
+ void ConstantBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const override final
"""
return _libBornAgainCore.ConstantBackground_addBackGround(self, start, end)
@@ -18044,7 +18044,7 @@ class IDetector(ICloneable, INode):
"""
getAxis(IDetector self, size_t index) -> IAxis
- const IAxis & IDetector::getAxis(size_t index) const
+ const IAxis & IDetector::getAxis(size_t index) const
"""
return _libBornAgainCore.IDetector_getAxis(self, index)
@@ -18782,7 +18782,7 @@ class IAbstractParticle(ISample):
"""
abundance(IAbstractParticle self) -> double
- double IAbstractParticle::abundance() const
+ double IAbstractParticle::abundance() const
"""
return _libBornAgainCore.IAbstractParticle_abundance(self)
@@ -18870,7 +18870,7 @@ class IParameterReal(INamed):
"""
getData(IParameterReal self) -> double &
- T& IParameter< T >::getData() const
+ T& IParameter< T >::getData() const
"""
return _libBornAgainCore.IParameterReal_getData(self)
@@ -19045,7 +19045,7 @@ class IParticle(IAbstractParticle):
"""
translate(IParticle self, kvector_t translation)
- void IParticle::translate(kvector_t translation) overridefinal
+ void IParticle::translate(kvector_t translation) override final
Translates the particle.
@@ -19403,7 +19403,7 @@ class RotationX(IRotation):
"""
getAngle(RotationX self) -> double
- double RotationX::getAngle() const
+ double RotationX::getAngle() const
"""
return _libBornAgainCore.RotationX_getAngle(self)
@@ -19499,7 +19499,7 @@ class RotationY(IRotation):
"""
getAngle(RotationY self) -> double
- double RotationY::getAngle() const
+ double RotationY::getAngle() const
"""
return _libBornAgainCore.RotationY_getAngle(self)
@@ -19596,7 +19596,7 @@ class RotationZ(IRotation):
"""
getAngle(RotationZ self) -> double
- double RotationZ::getAngle() const
+ double RotationZ::getAngle() const
"""
return _libBornAgainCore.RotationZ_getAngle(self)
@@ -19698,7 +19698,7 @@ class RotationEuler(IRotation):
"""
getAlpha(RotationEuler self) -> double
- double RotationEuler::getAlpha() const
+ double RotationEuler::getAlpha() const
"""
return _libBornAgainCore.RotationEuler_getAlpha(self)
@@ -19708,7 +19708,7 @@ class RotationEuler(IRotation):
"""
getBeta(RotationEuler self) -> double
- double RotationEuler::getBeta() const
+ double RotationEuler::getBeta() const
"""
return _libBornAgainCore.RotationEuler_getBeta(self)
@@ -19718,7 +19718,7 @@ class RotationEuler(IRotation):
"""
getGamma(RotationEuler self) -> double
- double RotationEuler::getGamma() const
+ double RotationEuler::getGamma() const
"""
return _libBornAgainCore.RotationEuler_getGamma(self)
@@ -19822,7 +19822,7 @@ class SimpleSelectionRule(ISelectionRule):
"""
clone(SimpleSelectionRule self) -> SimpleSelectionRule
- SimpleSelectionRule * SimpleSelectionRule::clone() const
+ SimpleSelectionRule * SimpleSelectionRule::clone() const
"""
return _libBornAgainCore.SimpleSelectionRule_clone(self)
@@ -19832,7 +19832,7 @@ class SimpleSelectionRule(ISelectionRule):
"""
coordinateSelected(SimpleSelectionRule self, ivector_t const & coordinate) -> bool
- bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const
+ bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const
"""
return _libBornAgainCore.SimpleSelectionRule_coordinateSelected(self, coordinate)
@@ -19893,7 +19893,7 @@ class Instrument(INode):
getBeam(Instrument self) -> Beam
getBeam(Instrument self) -> Beam
- const Beam& Instrument::getBeam() const
+ const Beam& Instrument::getBeam() const
"""
return _libBornAgainCore.Instrument_getBeam(self, *args)
@@ -19984,7 +19984,7 @@ class Instrument(INode):
"""
getDetectorMask(Instrument self) -> DetectorMask
- const DetectorMask * Instrument::getDetectorMask() const
+ const DetectorMask * Instrument::getDetectorMask() const
"""
return _libBornAgainCore.Instrument_getDetectorMask(self)
@@ -20381,7 +20381,7 @@ class InterferenceFunction1DLattice(IInterferenceFunction):
"""
getLatticeParameters(InterferenceFunction1DLattice self) -> Lattice1DParameters
- Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const
+ Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const
"""
return _libBornAgainCore.InterferenceFunction1DLattice_getLatticeParameters(self)
@@ -20534,7 +20534,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
"""
domainSize(InterferenceFunctionRadialParaCrystal self) -> double
- double InterferenceFunctionRadialParaCrystal::domainSize() const
+ double InterferenceFunctionRadialParaCrystal::domainSize() const
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_domainSize(self)
@@ -20556,7 +20556,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
"""
FTPDF(InterferenceFunctionRadialParaCrystal self, double qpar) -> complex_t
- complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const
+ complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_FTPDF(self, qpar)
@@ -20584,7 +20584,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
"""
peakDistance(InterferenceFunctionRadialParaCrystal self) -> double
- double InterferenceFunctionRadialParaCrystal::peakDistance() const
+ double InterferenceFunctionRadialParaCrystal::peakDistance() const
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_peakDistance(self)
@@ -20594,7 +20594,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
"""
dampingLength(InterferenceFunctionRadialParaCrystal self) -> double
- double InterferenceFunctionRadialParaCrystal::dampingLength() const
+ double InterferenceFunctionRadialParaCrystal::dampingLength() const
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_dampingLength(self)
@@ -20760,7 +20760,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
"""
integrationOverXi(InterferenceFunction2DLattice self) -> bool
- bool InterferenceFunction2DLattice::integrationOverXi() const
+ bool InterferenceFunction2DLattice::integrationOverXi() const
"""
return _libBornAgainCore.InterferenceFunction2DLattice_integrationOverXi(self)
@@ -20770,7 +20770,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
"""
lattice(InterferenceFunction2DLattice self) -> Lattice2D
- const Lattice2D & InterferenceFunction2DLattice::lattice() const
+ const Lattice2D & InterferenceFunction2DLattice::lattice() const
"""
return _libBornAgainCore.InterferenceFunction2DLattice_lattice(self)
@@ -20804,7 +20804,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction):
"""
onChange(InterferenceFunction2DLattice self)
- void InterferenceFunction2DLattice::onChange() overridefinal
+ void InterferenceFunction2DLattice::onChange() override final
Action to be taken in inherited class when a parameter has changed.
@@ -21015,7 +21015,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
domainSizes(InterferenceFunction2DParaCrystal self) -> vdouble1d_t
- std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const
+ std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_domainSizes(self)
@@ -21043,7 +21043,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
integrationOverXi(InterferenceFunction2DParaCrystal self) -> bool
- bool InterferenceFunction2DParaCrystal::integrationOverXi() const
+ bool InterferenceFunction2DParaCrystal::integrationOverXi() const
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_integrationOverXi(self)
@@ -21053,7 +21053,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
dampingLength(InterferenceFunction2DParaCrystal self) -> double
- double InterferenceFunction2DParaCrystal::dampingLength() const
+ double InterferenceFunction2DParaCrystal::dampingLength() const
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_dampingLength(self)
@@ -21063,7 +21063,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction):
"""
lattice(InterferenceFunction2DParaCrystal self) -> Lattice2D
- const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const
+ const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const
"""
return _libBornAgainCore.InterferenceFunction2DParaCrystal_lattice(self)
@@ -21824,7 +21824,7 @@ class Lattice2D(ICloneable, INode):
"""
rotationAngle(Lattice2D self) -> double
- double Lattice2D::rotationAngle() const
+ double Lattice2D::rotationAngle() const
"""
return _libBornAgainCore.Lattice2D_rotationAngle(self)
@@ -21834,7 +21834,7 @@ class Lattice2D(ICloneable, INode):
"""
reciprocalBases(Lattice2D self) -> Lattice2D::ReciprocalBases
- Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const
+ Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const
"""
return _libBornAgainCore.Lattice2D_reciprocalBases(self)
@@ -21885,7 +21885,7 @@ class BasicLattice(Lattice2D):
"""
clone(BasicLattice self) -> BasicLattice
- BasicLattice * BasicLattice::clone() const
+ BasicLattice * BasicLattice::clone() const
"""
return _libBornAgainCore.BasicLattice_clone(self)
@@ -21907,7 +21907,7 @@ class BasicLattice(Lattice2D):
"""
length1(BasicLattice self) -> double
- virtual double BasicLattice::length1() const
+ virtual double BasicLattice::length1() const
"""
return _libBornAgainCore.BasicLattice_length1(self)
@@ -21917,7 +21917,7 @@ class BasicLattice(Lattice2D):
"""
length2(BasicLattice self) -> double
- virtual double BasicLattice::length2() const
+ virtual double BasicLattice::length2() const
"""
return _libBornAgainCore.BasicLattice_length2(self)
@@ -21927,7 +21927,7 @@ class BasicLattice(Lattice2D):
"""
latticeAngle(BasicLattice self) -> double
- virtual double BasicLattice::latticeAngle() const
+ virtual double BasicLattice::latticeAngle() const
"""
return _libBornAgainCore.BasicLattice_latticeAngle(self)
@@ -21937,7 +21937,7 @@ class BasicLattice(Lattice2D):
"""
unitCellArea(BasicLattice self) -> double
- double BasicLattice::unitCellArea() const
+ double BasicLattice::unitCellArea() const
"""
return _libBornAgainCore.BasicLattice_unitCellArea(self)
@@ -21978,7 +21978,7 @@ class SquareLattice(Lattice2D):
"""
clone(SquareLattice self) -> SquareLattice
- SquareLattice * SquareLattice::clone() const
+ SquareLattice * SquareLattice::clone() const
"""
return _libBornAgainCore.SquareLattice_clone(self)
@@ -22000,7 +22000,7 @@ class SquareLattice(Lattice2D):
"""
length1(SquareLattice self) -> double
- virtual double SquareLattice::length1() const
+ virtual double SquareLattice::length1() const
"""
return _libBornAgainCore.SquareLattice_length1(self)
@@ -22010,7 +22010,7 @@ class SquareLattice(Lattice2D):
"""
length2(SquareLattice self) -> double
- virtual double SquareLattice::length2() const
+ virtual double SquareLattice::length2() const
"""
return _libBornAgainCore.SquareLattice_length2(self)
@@ -22020,7 +22020,7 @@ class SquareLattice(Lattice2D):
"""
latticeAngle(SquareLattice self) -> double
- double SquareLattice::latticeAngle() const
+ double SquareLattice::latticeAngle() const
"""
return _libBornAgainCore.SquareLattice_latticeAngle(self)
@@ -22030,7 +22030,7 @@ class SquareLattice(Lattice2D):
"""
unitCellArea(SquareLattice self) -> double
- double SquareLattice::unitCellArea() const
+ double SquareLattice::unitCellArea() const
"""
return _libBornAgainCore.SquareLattice_unitCellArea(self)
@@ -22071,7 +22071,7 @@ class HexagonalLattice(Lattice2D):
"""
clone(HexagonalLattice self) -> HexagonalLattice
- HexagonalLattice * HexagonalLattice::clone() const
+ HexagonalLattice * HexagonalLattice::clone() const
"""
return _libBornAgainCore.HexagonalLattice_clone(self)
@@ -22093,7 +22093,7 @@ class HexagonalLattice(Lattice2D):
"""
length1(HexagonalLattice self) -> double
- virtual double HexagonalLattice::length1() const
+ virtual double HexagonalLattice::length1() const
"""
return _libBornAgainCore.HexagonalLattice_length1(self)
@@ -22103,7 +22103,7 @@ class HexagonalLattice(Lattice2D):
"""
length2(HexagonalLattice self) -> double
- virtual double HexagonalLattice::length2() const
+ virtual double HexagonalLattice::length2() const
"""
return _libBornAgainCore.HexagonalLattice_length2(self)
@@ -22113,7 +22113,7 @@ class HexagonalLattice(Lattice2D):
"""
latticeAngle(HexagonalLattice self) -> double
- double HexagonalLattice::latticeAngle() const
+ double HexagonalLattice::latticeAngle() const
"""
return _libBornAgainCore.HexagonalLattice_latticeAngle(self)
@@ -22123,7 +22123,7 @@ class HexagonalLattice(Lattice2D):
"""
unitCellArea(HexagonalLattice self) -> double
- double HexagonalLattice::unitCellArea() const
+ double HexagonalLattice::unitCellArea() const
"""
return _libBornAgainCore.HexagonalLattice_unitCellArea(self)
@@ -22188,7 +22188,7 @@ class Layer(ISample):
"""
clone(Layer self) -> Layer
- Layer * Layer::clone() const overridefinal
+ Layer * Layer::clone() const override final
Returns a clone of this ISample object.
@@ -22200,7 +22200,7 @@ class Layer(ISample):
"""
cloneInvertB(Layer self) -> Layer
- Layer * Layer::cloneInvertB() const
+ Layer * Layer::cloneInvertB() const
"""
return _libBornAgainCore.Layer_cloneInvertB(self)
@@ -22210,7 +22210,7 @@ class Layer(ISample):
"""
accept(Layer self, INodeVisitor visitor)
- void Layer::accept(INodeVisitor *visitor) const overridefinal
+ void Layer::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -22234,7 +22234,7 @@ class Layer(ISample):
"""
thickness(Layer self) -> double
- double Layer::thickness() const
+ double Layer::thickness() const
"""
return _libBornAgainCore.Layer_thickness(self)
@@ -22244,7 +22244,7 @@ class Layer(ISample):
"""
material(Layer self) -> Material
- const Material* Layer::material() const overridefinal
+ const Material* Layer::material() const override final
Returns nullptr, unless overwritten to return a specific material.
@@ -22276,7 +22276,7 @@ class Layer(ISample):
"""
numberOfLayouts(Layer self) -> size_t
- size_t Layer::numberOfLayouts() const
+ size_t Layer::numberOfLayouts() const
"""
return _libBornAgainCore.Layer_numberOfLayouts(self)
@@ -22286,7 +22286,7 @@ class Layer(ISample):
"""
layouts(Layer self) -> std::vector< ILayout const *,std::allocator< ILayout const * > >
- std::vector< const ILayout * > Layer::layouts() const
+ std::vector< const ILayout * > Layer::layouts() const
"""
return _libBornAgainCore.Layer_layouts(self)
@@ -22296,7 +22296,7 @@ class Layer(ISample):
"""
getChildren(Layer self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > Layer::getChildren() const overridefinal
+ std::vector< const INode * > Layer::getChildren() const override final
Returns a vector of children (const).
@@ -22329,7 +22329,7 @@ class Layer(ISample):
"""
numberOfSlices(Layer self) -> unsigned int
- unsigned int Layer::numberOfSlices() const
+ unsigned int Layer::numberOfSlices() const
"""
return _libBornAgainCore.Layer_numberOfSlices(self)
@@ -22339,7 +22339,7 @@ class Layer(ISample):
"""
slice(Layer self, ZLimits limits, Layer::ELayerType layer_type) -> SafePointerVector< Layer >
- SafePointerVector< Layer > Layer::slice(ZLimits limits, ELayerType layer_type) const
+ SafePointerVector< Layer > Layer::slice(ZLimits limits, ELayerType layer_type) const
"""
return _libBornAgainCore.Layer_slice(self, limits, layer_type)
@@ -22587,7 +22587,7 @@ class Line(IShape2D):
"""
clone(Line self) -> Line
- Line* Line::clone() const
+ Line* Line::clone() const
"""
return _libBornAgainCore.Line_clone(self)
@@ -22653,7 +22653,7 @@ class VerticalLine(IShape2D):
"""
clone(VerticalLine self) -> VerticalLine
- VerticalLine* VerticalLine::clone() const
+ VerticalLine* VerticalLine::clone() const
"""
return _libBornAgainCore.VerticalLine_clone(self)
@@ -22676,7 +22676,7 @@ class VerticalLine(IShape2D):
"""
getXpos(VerticalLine self) -> double
- double VerticalLine::getXpos() const
+ double VerticalLine::getXpos() const
"""
return _libBornAgainCore.VerticalLine_getXpos(self)
@@ -22729,7 +22729,7 @@ class HorizontalLine(IShape2D):
"""
clone(HorizontalLine self) -> HorizontalLine
- HorizontalLine* HorizontalLine::clone() const
+ HorizontalLine* HorizontalLine::clone() const
"""
return _libBornAgainCore.HorizontalLine_clone(self)
@@ -22752,7 +22752,7 @@ class HorizontalLine(IShape2D):
"""
getYpos(HorizontalLine self) -> double
- double HorizontalLine::getYpos() const
+ double HorizontalLine::getYpos() const
"""
return _libBornAgainCore.HorizontalLine_getYpos(self)
@@ -22846,7 +22846,7 @@ class Material(_object):
"""
isMagneticMaterial(Material self) -> bool
- bool Material::isMagneticMaterial() const
+ bool Material::isMagneticMaterial() const
"""
return _libBornAgainCore.Material_isMagneticMaterial(self)
@@ -22928,7 +22928,7 @@ class Material(_object):
"""
transformedMaterial(Material self, Transform3D const & transform) -> Material
- Material Material::transformedMaterial(const Transform3D &transform) const
+ Material Material::transformedMaterial(const Transform3D &transform) const
"""
return _libBornAgainCore.Material_transformedMaterial(self, transform)
@@ -22941,19 +22941,47 @@ Material_swigregister(Material)
def HomogeneousMaterial(*args):
"""
- HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization) -> Material
- HomogeneousMaterial(std::string const & name, complex_t refractive_index) -> Material
+ HomogeneousMaterial() -> Material
HomogeneousMaterial(std::string const & name, double delta, double beta, kvector_t magnetization) -> Material
HomogeneousMaterial(std::string const & name, double delta, double beta) -> Material
- HomogeneousMaterial() -> Material
+ HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization) -> Material
+ HomogeneousMaterial(std::string const & name, complex_t refractive_index) -> Material
- BA_CORE_API_ Material HomogeneousMaterial()
+ BA_CORE_API_ Material HomogeneousMaterial(const std::string &name, complex_t refractive_index, kvector_t magnetization=kvector_t())
- Constructs material with zero refractive coefficients and zero magnetization.
+ Constructs a material with name, refractive_index and magnetization (in A/m). Alternatively, $\\delta$ and $\\beta$ for refractive index $n = 1 - \\delta + i \\beta$ can be passed directly. With no parameters given, constructs default (vacuum) material with $n = 1$ and zero magnetization.
"""
return _libBornAgainCore.HomogeneousMaterial(*args)
+def MaterialBySLD(*args):
+ """
+ MaterialBySLD() -> Material
+ MaterialBySLD(std::string const & name, double sld, double abs_term, kvector_t magnetization) -> Material
+ MaterialBySLD(std::string const & name, double sld, double abs_term) -> Material
+
+ BA_CORE_API_ Material MaterialBySLD(const std::string &name, double sld, double abs_term, kvector_t magnetization=kvector_t())
+
+ Constructs a wavelength-independent material with given sld and absorptive term Absorptive term is wavelength-independent (normalized to a wavelength) and can be considered as inverse of imaginary part of complex scattering length density: $ SLD = (N b_{coh}, N \\sigma_{abs}(\\lambda_0) / \\lambda_0) $ Here $ N $ - material number density, $ b_{coh} $ - bound coherent scattering length $ \\sigma_{abs}(\\lambda_0) $ - absorption cross-section at $ \\lambda_0 $ wavelength. With no parameters given, constructs default (vacuum) material with zero sld and zero magnetization.
+
+ Parameters:
+ -----------
+
+ name:
+ material name
+
+ sld:
+ scattering length density, $ nm^{-2} $
+
+ abs_term:
+ wavelength-independent absorptive term, $ nm^{-2} $
+
+ magnetization:
+ magnetization (in A/m)
+
+ """
+ return _libBornAgainCore.MaterialBySLD(*args)
+
def MaterialByAbsCX(*args):
"""
MaterialByAbsCX(std::string const & name, double sld, double abs_cx, kvector_t magnetization) -> Material
@@ -22966,6 +22994,9 @@ def MaterialByAbsCX(*args):
Parameters:
-----------
+ name:
+ material name
+
sld:
scattering length density, $ nm^{-2} $
@@ -22978,19 +23009,6 @@ def MaterialByAbsCX(*args):
"""
return _libBornAgainCore.MaterialByAbsCX(*args)
-def MaterialBySLD(*args):
- """
- MaterialBySLD(std::string const & name, double sld, double abs_term, kvector_t magnetization) -> Material
- MaterialBySLD(std::string const & name, double sld, double abs_term) -> Material
- MaterialBySLD() -> Material
-
- BA_CORE_API_ Material MaterialBySLD()
-
- Constructs wavelength-independent material with zero sld and zero magnetization.
-
- """
- return _libBornAgainCore.MaterialBySLD(*args)
-
def createAveragedMaterial(layer_mat, regions):
"""
createAveragedMaterial(Material layer_mat, std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > > const & regions) -> Material
@@ -23040,7 +23058,7 @@ class MesoCrystal(IParticle):
"""
clone(MesoCrystal self) -> MesoCrystal
- MesoCrystal * MesoCrystal::clone() const overridefinal
+ MesoCrystal * MesoCrystal::clone() const override final
Returns a clone of this ISample object.
@@ -23052,7 +23070,7 @@ class MesoCrystal(IParticle):
"""
accept(MesoCrystal self, INodeVisitor visitor)
- void MesoCrystal::accept(INodeVisitor *visitor) const overridefinal
+ void MesoCrystal::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -23064,7 +23082,7 @@ class MesoCrystal(IParticle):
"""
createSlicedParticle(MesoCrystal self, ZLimits limits) -> SlicedParticle
- SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const overridefinal
+ SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const override final
Create a sliced form factor for this particle.
@@ -23076,7 +23094,7 @@ class MesoCrystal(IParticle):
"""
getChildren(MesoCrystal self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > MesoCrystal::getChildren() const overridefinal
+ std::vector< const INode * > MesoCrystal::getChildren() const override final
Returns a vector of children (const).
@@ -23127,7 +23145,7 @@ class MultiLayer(ISample):
"""
accept(MultiLayer self, INodeVisitor visitor)
- virtual void MultiLayer::accept(INodeVisitor *visitor) const finaloverride
+ virtual void MultiLayer::accept(INodeVisitor *visitor) const final override
Calls the INodeVisitor's visit method.
@@ -23139,7 +23157,7 @@ class MultiLayer(ISample):
"""
numberOfLayers(MultiLayer self) -> size_t
- size_t MultiLayer::numberOfLayers() const
+ size_t MultiLayer::numberOfLayers() const
"""
return _libBornAgainCore.MultiLayer_numberOfLayers(self)
@@ -23149,7 +23167,7 @@ class MultiLayer(ISample):
"""
numberOfInterfaces(MultiLayer self) -> size_t
- size_t MultiLayer::numberOfInterfaces() const
+ size_t MultiLayer::numberOfInterfaces() const
"""
return _libBornAgainCore.MultiLayer_numberOfInterfaces(self)
@@ -23297,7 +23315,7 @@ class MultiLayer(ISample):
"""
clone(MultiLayer self) -> MultiLayer
- MultiLayer * MultiLayer::clone() const finaloverride
+ MultiLayer * MultiLayer::clone() const final override
Returns a clone of multilayer with clones of all layers and recreated interfaces between layers
@@ -23317,18 +23335,6 @@ class MultiLayer(ISample):
return _libBornAgainCore.MultiLayer_cloneInvertB(self)
- def cloneSliced(self, use_average_layers):
- """
- cloneSliced(MultiLayer self, bool use_average_layers) -> MultiLayer
-
- MultiLayer * MultiLayer::cloneSliced(bool use_average_layers) const
-
- Returns a clone of multilayer where the original layers may be sliced into several sublayers for usage with the graded layer approximation
-
- """
- return _libBornAgainCore.MultiLayer_cloneSliced(self, use_average_layers)
-
-
def setCrossCorrLength(self, crossCorrLength):
"""
setCrossCorrLength(MultiLayer self, double crossCorrLength)
@@ -23443,7 +23449,7 @@ class MultiLayer(ISample):
"""
containsMagneticMaterial(MultiLayer self) -> bool
- bool MultiLayer::containsMagneticMaterial() const
+ bool MultiLayer::containsMagneticMaterial() const
"""
return _libBornAgainCore.MultiLayer_containsMagneticMaterial(self)
@@ -23477,7 +23483,7 @@ class MultiLayer(ISample):
"""
hasRoughness(MultiLayer self) -> bool
- bool MultiLayer::hasRoughness() const
+ bool MultiLayer::hasRoughness() const
"""
return _libBornAgainCore.MultiLayer_hasRoughness(self)
@@ -23487,7 +23493,7 @@ class MultiLayer(ISample):
"""
totalNofLayouts(MultiLayer self) -> size_t
- size_t MultiLayer::totalNofLayouts() const
+ size_t MultiLayer::totalNofLayouts() const
"""
return _libBornAgainCore.MultiLayer_totalNofLayouts(self)
@@ -23497,7 +23503,7 @@ class MultiLayer(ISample):
"""
getChildren(MultiLayer self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > MultiLayer::getChildren() const finaloverride
+ std::vector< const INode * > MultiLayer::getChildren() const final override
Returns a vector of children (const).
@@ -23548,7 +23554,7 @@ class OffSpecSimulation(Simulation):
"""
clone(OffSpecSimulation self) -> OffSpecSimulation
- OffSpecSimulation* OffSpecSimulation::clone() const
+ OffSpecSimulation* OffSpecSimulation::clone() const
"""
return _libBornAgainCore.OffSpecSimulation_clone(self)
@@ -23676,7 +23682,7 @@ class IntensityData(_object):
"""
clone(IntensityData self) -> IntensityData
- OutputData< T > * OutputData< T >::clone() const
+ OutputData< T > * OutputData< T >::clone() const
"""
return _libBornAgainCore.IntensityData_clone(self)
@@ -23696,7 +23702,7 @@ class IntensityData(_object):
"""
meanValues(IntensityData self) -> IntensityData
- OutputData< double > * OutputData< T >::meanValues() const
+ OutputData< double > * OutputData< T >::meanValues() const
"""
return _libBornAgainCore.IntensityData_meanValues(self)
@@ -24240,7 +24246,7 @@ class ParameterDistribution(IParameterized):
"""
getLimits(ParameterDistribution self) -> RealLimits
- RealLimits ParameterDistribution::getLimits() const
+ RealLimits ParameterDistribution::getLimits() const
"""
return _libBornAgainCore.ParameterDistribution_getLimits(self)
@@ -24250,7 +24256,7 @@ class ParameterDistribution(IParameterized):
"""
getMinValue(ParameterDistribution self) -> double
- double ParameterDistribution::getMinValue() const
+ double ParameterDistribution::getMinValue() const
"""
return _libBornAgainCore.ParameterDistribution_getMinValue(self)
@@ -24260,7 +24266,7 @@ class ParameterDistribution(IParameterized):
"""
getMaxValue(ParameterDistribution self) -> double
- double ParameterDistribution::getMaxValue() const
+ double ParameterDistribution::getMaxValue() const
"""
return _libBornAgainCore.ParameterDistribution_getMaxValue(self)
@@ -24456,7 +24462,7 @@ class ParameterPool(ICloneable):
"""
parameterNames(ParameterPool self) -> vector_string_t
- std::vector< std::string > ParameterPool::parameterNames() const
+ std::vector< std::string > ParameterPool::parameterNames() const
"""
return _libBornAgainCore.ParameterPool_parameterNames(self)
@@ -24780,7 +24786,7 @@ class Particle(IParticle):
"""
clone(Particle self) -> Particle
- Particle * Particle::clone() const overridefinal
+ Particle * Particle::clone() const override final
Returns a clone of this ISample object.
@@ -24792,7 +24798,7 @@ class Particle(IParticle):
"""
accept(Particle self, INodeVisitor visitor)
- void Particle::accept(INodeVisitor *visitor) const overridefinal
+ void Particle::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -24804,7 +24810,7 @@ class Particle(IParticle):
"""
createSlicedParticle(Particle self, ZLimits limits) -> SlicedParticle
- SlicedParticle Particle::createSlicedParticle(ZLimits limits) const overridefinal
+ SlicedParticle Particle::createSlicedParticle(ZLimits limits) const override final
Create a sliced form factor for this particle.
@@ -24826,7 +24832,7 @@ class Particle(IParticle):
"""
material(Particle self) -> Material
- const Material* Particle::material() const overridefinal
+ const Material* Particle::material() const override final
Returns nullptr, unless overwritten to return a specific material.
@@ -24848,7 +24854,7 @@ class Particle(IParticle):
"""
getChildren(Particle self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > Particle::getChildren() const overridefinal
+ std::vector< const INode * > Particle::getChildren() const override final
Returns a vector of children (const).
@@ -24900,7 +24906,7 @@ class ParticleComposition(IParticle):
"""
clone(ParticleComposition self) -> ParticleComposition
- ParticleComposition * ParticleComposition::clone() const overridefinal
+ ParticleComposition * ParticleComposition::clone() const override final
Returns a clone of this ISample object.
@@ -24912,7 +24918,7 @@ class ParticleComposition(IParticle):
"""
accept(ParticleComposition self, INodeVisitor visitor)
- void ParticleComposition::accept(INodeVisitor *visitor) const overridefinal
+ void ParticleComposition::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -24924,7 +24930,7 @@ class ParticleComposition(IParticle):
"""
createFormFactor(ParticleComposition self) -> IFormFactor
- IFormFactor * ParticleComposition::createFormFactor() const overridefinal
+ IFormFactor * ParticleComposition::createFormFactor() const override final
Create a form factor for this particle.
@@ -24969,7 +24975,7 @@ class ParticleComposition(IParticle):
"""
getChildren(ParticleComposition self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > ParticleComposition::getChildren() const overridefinal
+ std::vector< const INode * > ParticleComposition::getChildren() const override final
Returns a vector of children (const).
@@ -24981,7 +24987,7 @@ class ParticleComposition(IParticle):
"""
decompose(ParticleComposition self) -> SafePointerVector< IParticle >
- SafePointerVector< IParticle > ParticleComposition::decompose() const overridefinal
+ SafePointerVector< IParticle > ParticleComposition::decompose() const override final
Decompose in constituent IParticle objects.
@@ -24993,7 +24999,7 @@ class ParticleComposition(IParticle):
"""
bottomTopZ(ParticleComposition self) -> ParticleLimits
- ParticleLimits ParticleComposition::bottomTopZ() const overridefinal
+ ParticleLimits ParticleComposition::bottomTopZ() const override final
Top and bottom z-coordinate.
@@ -25043,7 +25049,7 @@ class ParticleCoreShell(IParticle):
"""
clone(ParticleCoreShell self) -> ParticleCoreShell
- ParticleCoreShell * ParticleCoreShell::clone() const overridefinal
+ ParticleCoreShell * ParticleCoreShell::clone() const override final
Returns a clone of this ISample object.
@@ -25055,7 +25061,7 @@ class ParticleCoreShell(IParticle):
"""
accept(ParticleCoreShell self, INodeVisitor visitor)
- void ParticleCoreShell::accept(INodeVisitor *visitor) const overridefinal
+ void ParticleCoreShell::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -25067,7 +25073,7 @@ class ParticleCoreShell(IParticle):
"""
createSlicedParticle(ParticleCoreShell self, ZLimits limits) -> SlicedParticle
- SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const overridefinal
+ SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const override final
Create a sliced form factor for this particle.
@@ -25079,7 +25085,7 @@ class ParticleCoreShell(IParticle):
"""
coreParticle(ParticleCoreShell self) -> Particle
- const Particle * ParticleCoreShell::coreParticle() const
+ const Particle * ParticleCoreShell::coreParticle() const
"""
return _libBornAgainCore.ParticleCoreShell_coreParticle(self)
@@ -25089,7 +25095,7 @@ class ParticleCoreShell(IParticle):
"""
shellParticle(ParticleCoreShell self) -> Particle
- const Particle * ParticleCoreShell::shellParticle() const
+ const Particle * ParticleCoreShell::shellParticle() const
"""
return _libBornAgainCore.ParticleCoreShell_shellParticle(self)
@@ -25099,7 +25105,7 @@ class ParticleCoreShell(IParticle):
"""
getChildren(ParticleCoreShell self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > ParticleCoreShell::getChildren() const overridefinal
+ std::vector< const INode * > ParticleCoreShell::getChildren() const override final
Returns a vector of children (const).
@@ -25146,7 +25152,7 @@ class ParticleDistribution(IAbstractParticle):
"""
clone(ParticleDistribution self) -> ParticleDistribution
- ParticleDistribution * ParticleDistribution::clone() const finaloverride
+ ParticleDistribution * ParticleDistribution::clone() const final override
Returns a clone of this ISample object.
@@ -25158,7 +25164,7 @@ class ParticleDistribution(IAbstractParticle):
"""
accept(ParticleDistribution self, INodeVisitor visitor)
- void ParticleDistribution::accept(INodeVisitor *visitor) const finaloverride
+ void ParticleDistribution::accept(INodeVisitor *visitor) const final override
Calls the INodeVisitor's visit method.
@@ -25170,7 +25176,7 @@ class ParticleDistribution(IAbstractParticle):
"""
translate(ParticleDistribution self, kvector_t translation)
- void ParticleDistribution::translate(kvector_t translation) finaloverride
+ void ParticleDistribution::translate(kvector_t translation) final override
Translates the particle with the given vector.
@@ -25220,7 +25226,7 @@ class ParticleDistribution(IAbstractParticle):
"""
getChildren(ParticleDistribution self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > ParticleDistribution::getChildren() const finaloverride
+ std::vector< const INode * > ParticleDistribution::getChildren() const final override
Returns a vector of children (const).
@@ -25273,7 +25279,7 @@ class ParticleLayout(ILayout):
"""
clone(ParticleLayout self) -> ParticleLayout
- ParticleLayout * ParticleLayout::clone() const finaloverride
+ ParticleLayout * ParticleLayout::clone() const final override
Returns a clone of this ISample object.
@@ -25285,7 +25291,7 @@ class ParticleLayout(ILayout):
"""
cloneWithOffset(ParticleLayout self, double offset) -> ParticleLayout
- ParticleLayout * ParticleLayout::cloneWithOffset(double offset) const finaloverride
+ ParticleLayout * ParticleLayout::cloneWithOffset(double offset) const final override
"""
return _libBornAgainCore.ParticleLayout_cloneWithOffset(self, offset)
@@ -25295,7 +25301,7 @@ class ParticleLayout(ILayout):
"""
accept(ParticleLayout self, INodeVisitor visitor)
- void ParticleLayout::accept(INodeVisitor *visitor) const finaloverride
+ void ParticleLayout::accept(INodeVisitor *visitor) const final override
Calls the INodeVisitor's visit method.
@@ -25337,7 +25343,7 @@ class ParticleLayout(ILayout):
"""
particles(ParticleLayout self) -> SafePointerVector< IParticle const >
- SafePointerVector< const IParticle > ParticleLayout::particles() const finaloverride
+ SafePointerVector< const IParticle > ParticleLayout::particles() const final override
Returns information on all particles (type and abundance) and generates new particles if an IAbstractParticle denotes a collection
@@ -25349,7 +25355,7 @@ class ParticleLayout(ILayout):
"""
getTotalAbundance(ParticleLayout self) -> double
- double ParticleLayout::getTotalAbundance() const finaloverride
+ double ParticleLayout::getTotalAbundance() const final override
Get total abundance of all particles.
@@ -25373,7 +25379,7 @@ class ParticleLayout(ILayout):
"""
totalParticleSurfaceDensity(ParticleLayout self) -> double
- double ParticleLayout::totalParticleSurfaceDensity() const finaloverride
+ double ParticleLayout::totalParticleSurfaceDensity() const final override
Returns surface density of all particles.
@@ -25385,7 +25391,7 @@ class ParticleLayout(ILayout):
"""
setTotalParticleSurfaceDensity(ParticleLayout self, double particle_density)
- void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) finaloverride
+ void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) final override
Sets total particle surface density. particle_density: number of particles per square nanometer
@@ -25397,7 +25403,7 @@ class ParticleLayout(ILayout):
"""
getChildren(ParticleLayout self) -> swig_dummy_type_const_inode_vector
- std::vector< const INode * > ParticleLayout::getChildren() const finaloverride
+ std::vector< const INode * > ParticleLayout::getChildren() const final override
Returns a vector of children (const).
@@ -25446,7 +25452,7 @@ class PoissonNoiseBackground(IBackground):
"""
clone(PoissonNoiseBackground self) -> PoissonNoiseBackground
- PoissonNoiseBackground * PoissonNoiseBackground::clone() const overridefinal
+ PoissonNoiseBackground * PoissonNoiseBackground::clone() const override final
"""
return _libBornAgainCore.PoissonNoiseBackground_clone(self)
@@ -25468,7 +25474,7 @@ class PoissonNoiseBackground(IBackground):
"""
addBackGround(PoissonNoiseBackground self, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator start, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator end)
- void PoissonNoiseBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const overridefinal
+ void PoissonNoiseBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const override final
"""
return _libBornAgainCore.PoissonNoiseBackground_addBackGround(self, start, end)
@@ -25517,7 +25523,7 @@ class Polygon(IShape2D):
"""
clone(Polygon self) -> Polygon
- virtual Polygon* Polygon::clone() const
+ virtual Polygon* Polygon::clone() const
"""
return _libBornAgainCore.Polygon_clone(self)
@@ -25540,7 +25546,7 @@ class Polygon(IShape2D):
"""
getArea(Polygon self) -> double
- double Polygon::getArea() const
+ double Polygon::getArea() const
"""
return _libBornAgainCore.Polygon_getArea(self)
@@ -25550,7 +25556,7 @@ class Polygon(IShape2D):
"""
getPoints(Polygon self, vdouble1d_t xpos, vdouble1d_t ypos)
- void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const
+ void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const
"""
return _libBornAgainCore.Polygon_getPoints(self, xpos, ypos)
@@ -25600,7 +25606,7 @@ class RealParameter(IParameterReal):
clone(RealParameter self, std::string const & new_name) -> RealParameter
clone(RealParameter self) -> RealParameter
- RealParameter * RealParameter::clone(const std::string &new_name="") const
+ RealParameter * RealParameter::clone(const std::string &new_name="") const
"""
return _libBornAgainCore.RealParameter_clone(self, *args)
@@ -25644,7 +25650,7 @@ class RealParameter(IParameterReal):
"""
limits(RealParameter self) -> RealLimits
- RealLimits RealParameter::limits() const
+ RealLimits RealParameter::limits() const
"""
return _libBornAgainCore.RealParameter_limits(self)
@@ -25694,7 +25700,7 @@ class RealParameter(IParameterReal):
"""
unit(RealParameter self) -> std::string
- std::string RealParameter::unit() const
+ std::string RealParameter::unit() const
"""
return _libBornAgainCore.RealParameter_unit(self)
@@ -25756,7 +25762,7 @@ class Rectangle(IShape2D):
"""
clone(Rectangle self) -> Rectangle
- Rectangle* Rectangle::clone() const
+ Rectangle* Rectangle::clone() const
"""
return _libBornAgainCore.Rectangle_clone(self)
@@ -25779,7 +25785,7 @@ class Rectangle(IShape2D):
"""
getArea(Rectangle self) -> double
- double Rectangle::getArea() const
+ double Rectangle::getArea() const
"""
return _libBornAgainCore.Rectangle_getArea(self)
@@ -25789,7 +25795,7 @@ class Rectangle(IShape2D):
"""
getXlow(Rectangle self) -> double
- double Rectangle::getXlow() const
+ double Rectangle::getXlow() const
"""
return _libBornAgainCore.Rectangle_getXlow(self)
@@ -25799,7 +25805,7 @@ class Rectangle(IShape2D):
"""
getYlow(Rectangle self) -> double
- double Rectangle::getYlow() const
+ double Rectangle::getYlow() const
"""
return _libBornAgainCore.Rectangle_getYlow(self)
@@ -25809,7 +25815,7 @@ class Rectangle(IShape2D):
"""
getXup(Rectangle self) -> double
- double Rectangle::getXup() const
+ double Rectangle::getXup() const
"""
return _libBornAgainCore.Rectangle_getXup(self)
@@ -25819,7 +25825,7 @@ class Rectangle(IShape2D):
"""
getYup(Rectangle self) -> double
- double Rectangle::getYup() const
+ double Rectangle::getYup() const
"""
return _libBornAgainCore.Rectangle_getYup(self)
@@ -25909,7 +25915,7 @@ class RectangularDetector(IDetector2D):
setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0, kvector_t direction)
setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0)
- void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0,-1.0, 0.0))
+ void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0, -1.0, 0.0))
"""
return _libBornAgainCore.RectangularDetector_setPosition(self, *args)
@@ -25961,7 +25967,7 @@ class RectangularDetector(IDetector2D):
"""
getWidth(RectangularDetector self) -> double
- double RectangularDetector::getWidth() const
+ double RectangularDetector::getWidth() const
"""
return _libBornAgainCore.RectangularDetector_getWidth(self)
@@ -25971,7 +25977,7 @@ class RectangularDetector(IDetector2D):
"""
getHeight(RectangularDetector self) -> double
- double RectangularDetector::getHeight() const
+ double RectangularDetector::getHeight() const
"""
return _libBornAgainCore.RectangularDetector_getHeight(self)
@@ -25981,7 +25987,7 @@ class RectangularDetector(IDetector2D):
"""
getNbinsX(RectangularDetector self) -> size_t
- size_t RectangularDetector::getNbinsX() const
+ size_t RectangularDetector::getNbinsX() const
"""
return _libBornAgainCore.RectangularDetector_getNbinsX(self)
@@ -25991,7 +25997,7 @@ class RectangularDetector(IDetector2D):
"""
getNbinsY(RectangularDetector self) -> size_t
- size_t RectangularDetector::getNbinsY() const
+ size_t RectangularDetector::getNbinsY() const
"""
return _libBornAgainCore.RectangularDetector_getNbinsY(self)
@@ -26001,7 +26007,7 @@ class RectangularDetector(IDetector2D):
"""
getNormalVector(RectangularDetector self) -> kvector_t
- kvector_t RectangularDetector::getNormalVector() const
+ kvector_t RectangularDetector::getNormalVector() const
"""
return _libBornAgainCore.RectangularDetector_getNormalVector(self)
@@ -26011,7 +26017,7 @@ class RectangularDetector(IDetector2D):
"""
getU0(RectangularDetector self) -> double
- double RectangularDetector::getU0() const
+ double RectangularDetector::getU0() const
"""
return _libBornAgainCore.RectangularDetector_getU0(self)
@@ -26021,7 +26027,7 @@ class RectangularDetector(IDetector2D):
"""
getV0(RectangularDetector self) -> double
- double RectangularDetector::getV0() const
+ double RectangularDetector::getV0() const
"""
return _libBornAgainCore.RectangularDetector_getV0(self)
@@ -26031,7 +26037,7 @@ class RectangularDetector(IDetector2D):
"""
getDirectionVector(RectangularDetector self) -> kvector_t
- kvector_t RectangularDetector::getDirectionVector() const
+ kvector_t RectangularDetector::getDirectionVector() const
"""
return _libBornAgainCore.RectangularDetector_getDirectionVector(self)
@@ -26041,7 +26047,7 @@ class RectangularDetector(IDetector2D):
"""
getDistance(RectangularDetector self) -> double
- double RectangularDetector::getDistance() const
+ double RectangularDetector::getDistance() const
"""
return _libBornAgainCore.RectangularDetector_getDistance(self)
@@ -26051,7 +26057,7 @@ class RectangularDetector(IDetector2D):
"""
getDirectBeamU0(RectangularDetector self) -> double
- double RectangularDetector::getDirectBeamU0() const
+ double RectangularDetector::getDirectBeamU0() const
"""
return _libBornAgainCore.RectangularDetector_getDirectBeamU0(self)
@@ -26061,7 +26067,7 @@ class RectangularDetector(IDetector2D):
"""
getDirectBeamV0(RectangularDetector self) -> double
- double RectangularDetector::getDirectBeamV0() const
+ double RectangularDetector::getDirectBeamV0() const
"""
return _libBornAgainCore.RectangularDetector_getDirectBeamV0(self)
@@ -26071,7 +26077,7 @@ class RectangularDetector(IDetector2D):
"""
getDetectorArrangment(RectangularDetector self) -> RectangularDetector::EDetectorArrangement
- RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const
+ RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const
"""
return _libBornAgainCore.RectangularDetector_getDetectorArrangment(self)
@@ -26220,7 +26226,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
"""
evaluateCDF(ResolutionFunction2DGaussian self, double x, double y) -> double
- double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const
+ double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const
"""
return _libBornAgainCore.ResolutionFunction2DGaussian_evaluateCDF(self, x, y)
@@ -26230,7 +26236,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
"""
clone(ResolutionFunction2DGaussian self) -> ResolutionFunction2DGaussian
- ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const
+ ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const
"""
return _libBornAgainCore.ResolutionFunction2DGaussian_clone(self)
@@ -26252,7 +26258,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
"""
getSigmaX(ResolutionFunction2DGaussian self) -> double
- double ResolutionFunction2DGaussian::getSigmaX() const
+ double ResolutionFunction2DGaussian::getSigmaX() const
"""
return _libBornAgainCore.ResolutionFunction2DGaussian_getSigmaX(self)
@@ -26262,7 +26268,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D):
"""
getSigmaY(ResolutionFunction2DGaussian self) -> double
- double ResolutionFunction2DGaussian::getSigmaY() const
+ double ResolutionFunction2DGaussian::getSigmaY() const
"""
return _libBornAgainCore.ResolutionFunction2DGaussian_getSigmaY(self)
@@ -26331,23 +26337,11 @@ class SpecularSimulation(Simulation):
return _libBornAgainCore.SpecularSimulation_prepareSimulation(self)
- def runSimulation(self):
- """
- runSimulation(SpecularSimulation self)
-
- void SpecularSimulation::runSimulation() override
-
- Run a simulation, possibly averaged over parameter distributions.
-
- """
- return _libBornAgainCore.SpecularSimulation_runSimulation(self)
-
-
def accept(self, visitor):
"""
accept(SpecularSimulation self, INodeVisitor visitor)
- virtual void SpecularSimulation::accept(INodeVisitor *visitor) const overridefinal
+ virtual void SpecularSimulation::accept(INodeVisitor *visitor) const override final
Calls the INodeVisitor's visit method.
@@ -26397,7 +26391,7 @@ class SpecularSimulation(Simulation):
OutputData< double > * SpecularSimulation::getDetectorIntensity(AxesUnits units_type=AxesUnits::DEFAULT) const override
- Returns reflectivity values $Reflectivity = \\|R\\|^2$ from the upper layer in the form of OutputData<double>.
+ Returns detector count values in the form of OutputData<double>. Detector counts are proportional to $Reflectivity = |R|^2$ from the upper layer.
"""
return _libBornAgainCore.SpecularSimulation_getDetectorIntensity(self, *args)
@@ -26601,7 +26595,7 @@ class SampleBuilderFactoryTemp(_object):
"""
begin(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator
- const_iterator IFactory< Key, AbstractProduct >::begin() const
+ const_iterator IFactory< Key, AbstractProduct >::begin() const
"""
return _libBornAgainCore.SampleBuilderFactoryTemp_begin(self)
@@ -26611,7 +26605,7 @@ class SampleBuilderFactoryTemp(_object):
"""
end(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator
- const_iterator IFactory< Key, AbstractProduct >::end() const
+ const_iterator IFactory< Key, AbstractProduct >::end() const
"""
return _libBornAgainCore.SampleBuilderFactoryTemp_end(self)
@@ -26750,7 +26744,7 @@ class SimulationFactoryTemp(_object):
"""
begin(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator
- const_iterator IFactory< Key, AbstractProduct >::begin() const
+ const_iterator IFactory< Key, AbstractProduct >::begin() const
"""
return _libBornAgainCore.SimulationFactoryTemp_begin(self)
@@ -26760,7 +26754,7 @@ class SimulationFactoryTemp(_object):
"""
end(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator
- const_iterator IFactory< Key, AbstractProduct >::end() const
+ const_iterator IFactory< Key, AbstractProduct >::end() const
"""
return _libBornAgainCore.SimulationFactoryTemp_end(self)
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index da3eef64dc1d31ee1162a0afb9ad515f116c121d..00c6fe67e6b3ccd87e9a4a26ce083add16bea87f 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -5994,7 +5994,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/home/pospelov/software/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
@@ -96667,21 +96667,38 @@ SWIGINTERN PyObject *Material_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObj
}
SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ SwigValueWrapper< Material > result;
+
+ if (!PyArg_ParseTuple(args,(char *)":HomogeneousMaterial")) SWIG_fail;
+ result = HomogeneousMaterial();
+ resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
- complex_t arg2 ;
- kvector_t arg3 ;
+ double arg2 ;
+ double arg3 ;
+ kvector_t arg4 ;
int res1 = SWIG_OLDOBJ ;
- std::complex< double > val2 ;
+ double val2 ;
int ecode2 = 0 ;
- void *argp3 ;
- int res3 = 0 ;
+ double val3 ;
+ int ecode3 = 0 ;
+ void *argp4 ;
+ int res4 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
+ PyObject * obj3 = 0 ;
SwigValueWrapper< Material > result;
- if (!PyArg_ParseTuple(args,(char *)"OOO:HomogeneousMaterial",&obj0,&obj1,&obj2)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OOOO:HomogeneousMaterial",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
{
std::string *ptr = (std::string *)0;
res1 = SWIG_AsPtr_std_string(obj0, &ptr);
@@ -96693,25 +96710,30 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_0(PyObject *SWIGUNUSEDPARM(
}
arg1 = ptr;
}
- ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+ ecode2 = SWIG_AsVal_double(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "complex_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "double""'");
}
- arg2 = static_cast< complex_t >(val2);
+ arg2 = static_cast< double >(val2);
+ ecode3 = SWIG_AsVal_double(obj2, &val3);
+ if (!SWIG_IsOK(ecode3)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "double""'");
+ }
+ arg3 = static_cast< double >(val3);
{
- res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "kvector_t""'");
+ res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
+ if (!SWIG_IsOK(res4)) {
+ SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "HomogeneousMaterial" "', argument " "4"" of type '" "kvector_t""'");
}
- if (!argp3) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "kvector_t""'");
+ if (!argp4) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HomogeneousMaterial" "', argument " "4"" of type '" "kvector_t""'");
} else {
- kvector_t * temp = reinterpret_cast< kvector_t * >(argp3);
- arg3 = *temp;
- if (SWIG_IsNewObj(res3)) delete temp;
+ kvector_t * temp = reinterpret_cast< kvector_t * >(argp4);
+ arg4 = *temp;
+ if (SWIG_IsNewObj(res4)) delete temp;
}
}
- result = HomogeneousMaterial((std::string const &)*arg1,arg2,arg3);
+ result = HomogeneousMaterial((std::string const &)*arg1,arg2,arg3,arg4);
resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
if (SWIG_IsNewObj(res1)) delete arg1;
return resultobj;
@@ -96721,18 +96743,22 @@ fail:
}
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
- complex_t arg2 ;
+ double arg2 ;
+ double arg3 ;
int res1 = SWIG_OLDOBJ ;
- std::complex< double > val2 ;
+ double val2 ;
int ecode2 = 0 ;
+ double val3 ;
+ int ecode3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
+ PyObject * obj2 = 0 ;
SwigValueWrapper< Material > result;
- if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial",&obj0,&obj1)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OOO:HomogeneousMaterial",&obj0,&obj1,&obj2)) SWIG_fail;
{
std::string *ptr = (std::string *)0;
res1 = SWIG_AsPtr_std_string(obj0, &ptr);
@@ -96744,12 +96770,17 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_1(PyObject *SWIGUNUSEDPARM(
}
arg1 = ptr;
}
- ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
+ ecode2 = SWIG_AsVal_double(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "complex_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "double""'");
}
- arg2 = static_cast< complex_t >(val2);
- result = HomogeneousMaterial((std::string const &)*arg1,arg2);
+ arg2 = static_cast< double >(val2);
+ ecode3 = SWIG_AsVal_double(obj2, &val3);
+ if (!SWIG_IsOK(ecode3)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "double""'");
+ }
+ arg3 = static_cast< double >(val3);
+ result = HomogeneousMaterial((std::string const &)*arg1,arg2,arg3);
resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
if (SWIG_IsNewObj(res1)) delete arg1;
return resultobj;
@@ -96759,26 +96790,22 @@ fail:
}
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
- double arg2 ;
- double arg3 ;
- kvector_t arg4 ;
+ complex_t arg2 ;
+ kvector_t arg3 ;
int res1 = SWIG_OLDOBJ ;
- double val2 ;
+ std::complex< double > val2 ;
int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- void *argp4 ;
- int res4 = 0 ;
+ void *argp3 ;
+ int res3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
SwigValueWrapper< Material > result;
- if (!PyArg_ParseTuple(args,(char *)"OOOO:HomogeneousMaterial",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OOO:HomogeneousMaterial",&obj0,&obj1,&obj2)) SWIG_fail;
{
std::string *ptr = (std::string *)0;
res1 = SWIG_AsPtr_std_string(obj0, &ptr);
@@ -96790,30 +96817,25 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_2(PyObject *SWIGUNUSEDPARM(
}
arg1 = ptr;
}
- ecode2 = SWIG_AsVal_double(obj1, &val2);
+ ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(obj2, &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "complex_t""'");
}
- arg3 = static_cast< double >(val3);
+ arg2 = static_cast< complex_t >(val2);
{
- res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
- if (!SWIG_IsOK(res4)) {
- SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "HomogeneousMaterial" "', argument " "4"" of type '" "kvector_t""'");
+ res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
+ if (!SWIG_IsOK(res3)) {
+ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "kvector_t""'");
}
- if (!argp4) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HomogeneousMaterial" "', argument " "4"" of type '" "kvector_t""'");
+ if (!argp3) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "kvector_t""'");
} else {
- kvector_t * temp = reinterpret_cast< kvector_t * >(argp4);
- arg4 = *temp;
- if (SWIG_IsNewObj(res4)) delete temp;
+ kvector_t * temp = reinterpret_cast< kvector_t * >(argp3);
+ arg3 = *temp;
+ if (SWIG_IsNewObj(res3)) delete temp;
}
}
- result = HomogeneousMaterial((std::string const &)*arg1,arg2,arg3,arg4);
+ result = HomogeneousMaterial((std::string const &)*arg1,arg2,arg3);
resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
if (SWIG_IsNewObj(res1)) delete arg1;
return resultobj;
@@ -96823,22 +96845,18 @@ fail:
}
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
- double arg2 ;
- double arg3 ;
+ complex_t arg2 ;
int res1 = SWIG_OLDOBJ ;
- double val2 ;
+ std::complex< double > val2 ;
int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
SwigValueWrapper< Material > result;
- if (!PyArg_ParseTuple(args,(char *)"OOO:HomogeneousMaterial",&obj0,&obj1,&obj2)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OO:HomogeneousMaterial",&obj0,&obj1)) SWIG_fail;
{
std::string *ptr = (std::string *)0;
res1 = SWIG_AsPtr_std_string(obj0, &ptr);
@@ -96850,17 +96868,12 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_3(PyObject *SWIGUNUSEDPARM(
}
arg1 = ptr;
}
- ecode2 = SWIG_AsVal_double(obj1, &val2);
+ ecode2 = SWIG_AsVal_std_complex_Sl_double_Sg_(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(obj2, &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HomogeneousMaterial" "', argument " "3"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HomogeneousMaterial" "', argument " "2"" of type '" "complex_t""'");
}
- arg3 = static_cast< double >(val3);
- result = HomogeneousMaterial((std::string const &)*arg1,arg2,arg3);
+ arg2 = static_cast< complex_t >(val2);
+ result = HomogeneousMaterial((std::string const &)*arg1,arg2);
resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
if (SWIG_IsNewObj(res1)) delete arg1;
return resultobj;
@@ -96870,19 +96883,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_HomogeneousMaterial__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SwigValueWrapper< Material > result;
-
- if (!PyArg_ParseTuple(args,(char *)":HomogeneousMaterial")) SWIG_fail;
- result = HomogeneousMaterial();
- resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[5] = {
@@ -96896,7 +96896,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
if (argc == 0) {
- return _wrap_HomogeneousMaterial__SWIG_4(self, args);
+ return _wrap_HomogeneousMaterial__SWIG_0(self, args);
}
if (argc == 2) {
int _v;
@@ -96908,7 +96908,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_HomogeneousMaterial__SWIG_1(self, args);
+ return _wrap_HomogeneousMaterial__SWIG_4(self, args);
}
}
}
@@ -96927,7 +96927,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_HomogeneousMaterial__SWIG_3(self, args);
+ return _wrap_HomogeneousMaterial__SWIG_2(self, args);
}
}
}
@@ -96945,7 +96945,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_HomogeneousMaterial__SWIG_0(self, args);
+ return _wrap_HomogeneousMaterial__SWIG_3(self, args);
}
}
}
@@ -96968,7 +96968,7 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_HomogeneousMaterial__SWIG_2(self, args);
+ return _wrap_HomogeneousMaterial__SWIG_1(self, args);
}
}
}
@@ -96978,16 +96978,29 @@ SWIGINTERN PyObject *_wrap_HomogeneousMaterial(PyObject *self, PyObject *args) {
fail:
SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'HomogeneousMaterial'.\n"
" Possible C/C++ prototypes are:\n"
- " HomogeneousMaterial(std::string const &,complex_t,kvector_t)\n"
- " HomogeneousMaterial(std::string const &,complex_t)\n"
+ " HomogeneousMaterial()\n"
" HomogeneousMaterial(std::string const &,double,double,kvector_t)\n"
" HomogeneousMaterial(std::string const &,double,double)\n"
- " HomogeneousMaterial()\n");
+ " HomogeneousMaterial(std::string const &,complex_t,kvector_t)\n"
+ " HomogeneousMaterial(std::string const &,complex_t)\n");
return 0;
}
SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ SwigValueWrapper< Material > result;
+
+ if (!PyArg_ParseTuple(args,(char *)":MaterialBySLD")) SWIG_fail;
+ result = MaterialBySLD();
+ resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
double arg2 ;
@@ -97051,7 +97064,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
double arg2 ;
@@ -97098,6 +97111,76 @@ fail:
}
+SWIGINTERN PyObject *_wrap_MaterialBySLD(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+ Py_ssize_t ii;
+
+ if (!PyTuple_Check(args)) SWIG_fail;
+ argc = args ? PyObject_Length(args) : 0;
+ for (ii = 0; (ii < 4) && (ii < argc); ii++) {
+ argv[ii] = PyTuple_GET_ITEM(args,ii);
+ }
+ if (argc == 0) {
+ return _wrap_MaterialBySLD__SWIG_0(self, args);
+ }
+ if (argc == 3) {
+ int _v;
+ int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[2], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_MaterialBySLD__SWIG_2(self, args);
+ }
+ }
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[2], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_MaterialBySLD__SWIG_1(self, args);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MaterialBySLD'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " MaterialBySLD()\n"
+ " MaterialBySLD(std::string const &,double,double,kvector_t)\n"
+ " MaterialBySLD(std::string const &,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_MaterialByAbsCX__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
@@ -97275,89 +97358,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MaterialBySLD__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SwigValueWrapper< Material > result;
-
- if (!PyArg_ParseTuple(args,(char *)":MaterialBySLD")) SWIG_fail;
- result = MaterialBySLD();
- resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_MaterialBySLD(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[5] = {
- 0
- };
- Py_ssize_t ii;
-
- if (!PyTuple_Check(args)) SWIG_fail;
- argc = args ? PyObject_Length(args) : 0;
- for (ii = 0; (ii < 4) && (ii < argc); ii++) {
- argv[ii] = PyTuple_GET_ITEM(args,ii);
- }
- if (argc == 0) {
- return _wrap_MaterialBySLD__SWIG_2(self, args);
- }
- if (argc == 3) {
- int _v;
- int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[1], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[2], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_MaterialBySLD__SWIG_1(self, args);
- }
- }
- }
- }
- if (argc == 4) {
- int _v;
- int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[1], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[2], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_BasicVector3DT_double_t, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_MaterialBySLD__SWIG_0(self, args);
- }
- }
- }
- }
- }
-
-fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'MaterialBySLD'.\n"
- " Possible C/C++ prototypes are:\n"
- " MaterialBySLD(std::string const &,double,double,kvector_t)\n"
- " MaterialBySLD(std::string const &,double,double)\n"
- " MaterialBySLD()\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_createAveragedMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
Material *arg1 = 0 ;
@@ -98100,37 +98100,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MultiLayer_cloneSliced(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- MultiLayer *arg1 = (MultiLayer *) 0 ;
- bool arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- bool val2 ;
- int ecode2 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- MultiLayer *result = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"OO:MultiLayer_cloneSliced",&obj0,&obj1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_MultiLayer, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MultiLayer_cloneSliced" "', argument " "1"" of type '" "MultiLayer const *""'");
- }
- arg1 = reinterpret_cast< MultiLayer * >(argp1);
- ecode2 = SWIG_AsVal_bool(obj1, &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "MultiLayer_cloneSliced" "', argument " "2"" of type '" "bool""'");
- }
- arg2 = static_cast< bool >(val2);
- result = (MultiLayer *)((MultiLayer const *)arg1)->cloneSliced(arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MultiLayer, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_MultiLayer_setCrossCorrLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
MultiLayer *arg1 = (MultiLayer *) 0 ;
@@ -109968,27 +109937,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SpecularSimulation_runSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject * obj0 = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"O:SpecularSimulation_runSimulation",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpecularSimulation, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_runSimulation" "', argument " "1"" of type '" "SpecularSimulation *""'");
- }
- arg1 = reinterpret_cast< SpecularSimulation * >(argp1);
- (arg1)->runSimulation();
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_SpecularSimulation_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
@@ -112335,7 +112283,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"INamed_getName", _wrap_INamed_getName, METH_VARARGS, (char *)"\n"
"INamed_getName(INamed self) -> std::string\n"
"\n"
- "std::string INamed::getName() const \n"
+ "std::string INamed::getName() const\n"
"\n"
""},
{ (char *)"disown_INamed", _wrap_disown_INamed, METH_VARARGS, NULL},
@@ -113118,31 +113066,31 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"WavevectorInfo_transformed", _wrap_WavevectorInfo_transformed, METH_VARARGS, (char *)"\n"
"WavevectorInfo_transformed(WavevectorInfo self, Transform3D const & transform) -> WavevectorInfo\n"
"\n"
- "WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const \n"
+ "WavevectorInfo WavevectorInfo::transformed(const Transform3D &transform) const\n"
"\n"
""},
{ (char *)"WavevectorInfo_getKi", _wrap_WavevectorInfo_getKi, METH_VARARGS, (char *)"\n"
"WavevectorInfo_getKi(WavevectorInfo self) -> cvector_t\n"
"\n"
- "cvector_t WavevectorInfo::getKi() const \n"
+ "cvector_t WavevectorInfo::getKi() const\n"
"\n"
""},
{ (char *)"WavevectorInfo_getKf", _wrap_WavevectorInfo_getKf, METH_VARARGS, (char *)"\n"
"WavevectorInfo_getKf(WavevectorInfo self) -> cvector_t\n"
"\n"
- "cvector_t WavevectorInfo::getKf() const \n"
+ "cvector_t WavevectorInfo::getKf() const\n"
"\n"
""},
{ (char *)"WavevectorInfo_getQ", _wrap_WavevectorInfo_getQ, METH_VARARGS, (char *)"\n"
"WavevectorInfo_getQ(WavevectorInfo self) -> cvector_t\n"
"\n"
- "cvector_t WavevectorInfo::getQ() const \n"
+ "cvector_t WavevectorInfo::getQ() const\n"
"\n"
""},
{ (char *)"WavevectorInfo_getWavelength", _wrap_WavevectorInfo_getWavelength, METH_VARARGS, (char *)"\n"
"WavevectorInfo_getWavelength(WavevectorInfo self) -> double\n"
"\n"
- "double WavevectorInfo::getWavelength() const \n"
+ "double WavevectorInfo::getWavelength() const\n"
"\n"
""},
{ (char *)"delete_WavevectorInfo", _wrap_delete_WavevectorInfo, METH_VARARGS, (char *)"delete_WavevectorInfo(WavevectorInfo self)"},
@@ -113203,25 +113151,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Beam_getBlochVector", _wrap_Beam_getBlochVector, METH_VARARGS, (char *)"\n"
"Beam_getBlochVector(Beam self) -> kvector_t\n"
"\n"
- "kvector_t Beam::getBlochVector() const \n"
+ "kvector_t Beam::getBlochVector() const\n"
"\n"
""},
{ (char *)"Beam_getWavelength", _wrap_Beam_getWavelength, METH_VARARGS, (char *)"\n"
"Beam_getWavelength(Beam self) -> double\n"
"\n"
- "double Beam::getWavelength() const \n"
+ "double Beam::getWavelength() const\n"
"\n"
""},
{ (char *)"Beam_getAlpha", _wrap_Beam_getAlpha, METH_VARARGS, (char *)"\n"
"Beam_getAlpha(Beam self) -> double\n"
"\n"
- "double Beam::getAlpha() const \n"
+ "double Beam::getAlpha() const\n"
"\n"
""},
{ (char *)"Beam_getPhi", _wrap_Beam_getPhi, METH_VARARGS, (char *)"\n"
"Beam_getPhi(Beam self) -> double\n"
"\n"
- "double Beam::getPhi() const \n"
+ "double Beam::getPhi() const\n"
"\n"
""},
{ (char *)"Beam_accept", _wrap_Beam_accept, METH_VARARGS, (char *)"\n"
@@ -113247,13 +113195,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Bin1D_getMidPoint", _wrap_Bin1D_getMidPoint, METH_VARARGS, (char *)"\n"
"Bin1D_getMidPoint(Bin1D self) -> double\n"
"\n"
- "double Bin1D::getMidPoint() const \n"
+ "double Bin1D::getMidPoint() const\n"
"\n"
""},
{ (char *)"Bin1D_getBinSize", _wrap_Bin1D_getBinSize, METH_VARARGS, (char *)"\n"
"Bin1D_getBinSize(Bin1D self) -> double\n"
"\n"
- "double Bin1D::getBinSize() const \n"
+ "double Bin1D::getBinSize() const\n"
"\n"
""},
{ (char *)"delete_Bin1D", _wrap_delete_Bin1D, METH_VARARGS, (char *)"delete_Bin1D(Bin1D self)"},
@@ -113279,13 +113227,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Bin1DKVector_getMidPoint", _wrap_Bin1DKVector_getMidPoint, METH_VARARGS, (char *)"\n"
"Bin1DKVector_getMidPoint(Bin1DKVector self) -> kvector_t\n"
"\n"
- "kvector_t Bin1DKVector::getMidPoint() const \n"
+ "kvector_t Bin1DKVector::getMidPoint() const\n"
"\n"
""},
{ (char *)"Bin1DKVector_getDelta", _wrap_Bin1DKVector_getDelta, METH_VARARGS, (char *)"\n"
"Bin1DKVector_getDelta(Bin1DKVector self) -> kvector_t\n"
"\n"
- "kvector_t Bin1DKVector::getDelta() const \n"
+ "kvector_t Bin1DKVector::getDelta() const\n"
"\n"
""},
{ (char *)"Bin1DKVector_m_q_lower_set", _wrap_Bin1DKVector_m_q_lower_set, METH_VARARGS, (char *)"Bin1DKVector_m_q_lower_set(Bin1DKVector self, kvector_t m_q_lower)"},
@@ -113307,13 +113255,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Bin1DCVector_getMidPoint", _wrap_Bin1DCVector_getMidPoint, METH_VARARGS, (char *)"\n"
"Bin1DCVector_getMidPoint(Bin1DCVector self) -> cvector_t\n"
"\n"
- "cvector_t Bin1DCVector::getMidPoint() const \n"
+ "cvector_t Bin1DCVector::getMidPoint() const\n"
"\n"
""},
{ (char *)"Bin1DCVector_getDelta", _wrap_Bin1DCVector_getDelta, METH_VARARGS, (char *)"\n"
"Bin1DCVector_getDelta(Bin1DCVector self) -> cvector_t\n"
"\n"
- "cvector_t Bin1DCVector::getDelta() const \n"
+ "cvector_t Bin1DCVector::getDelta() const\n"
"\n"
""},
{ (char *)"Bin1DCVector_m_q_lower_set", _wrap_Bin1DCVector_m_q_lower_set, METH_VARARGS, (char *)"Bin1DCVector_m_q_lower_set(Bin1DCVector self, cvector_t m_q_lower)"},
@@ -113421,13 +113369,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IAxis_getBinCenters", _wrap_IAxis_getBinCenters, METH_VARARGS, (char *)"\n"
"IAxis_getBinCenters(IAxis self) -> vdouble1d_t\n"
"\n"
- "std::vector< double > IAxis::getBinCenters() const \n"
+ "std::vector< double > IAxis::getBinCenters() const\n"
"\n"
""},
{ (char *)"IAxis_getBinBoundaries", _wrap_IAxis_getBinBoundaries, METH_VARARGS, (char *)"\n"
"IAxis_getBinBoundaries(IAxis self) -> vdouble1d_t\n"
"\n"
- "std::vector< double > IAxis::getBinBoundaries() const \n"
+ "std::vector< double > IAxis::getBinBoundaries() const\n"
"\n"
""},
{ (char *)"IAxis_createClippedAxis", _wrap_IAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
@@ -113524,7 +113472,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"VariableBinAxis_getBinCenter", _wrap_VariableBinAxis_getBinCenter, METH_VARARGS, (char *)"\n"
"VariableBinAxis_getBinCenter(VariableBinAxis self, size_t index) -> double\n"
"\n"
- "double VariableBinAxis::getBinCenter(size_t index) const \n"
+ "double VariableBinAxis::getBinCenter(size_t index) const\n"
"\n"
""},
{ (char *)"VariableBinAxis_findClosestIndex", _wrap_VariableBinAxis_findClosestIndex, METH_VARARGS, (char *)"\n"
@@ -113538,13 +113486,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"VariableBinAxis_getBinCenters", _wrap_VariableBinAxis_getBinCenters, METH_VARARGS, (char *)"\n"
"VariableBinAxis_getBinCenters(VariableBinAxis self) -> vdouble1d_t\n"
"\n"
- "std::vector< double > VariableBinAxis::getBinCenters() const \n"
+ "std::vector< double > VariableBinAxis::getBinCenters() const\n"
"\n"
""},
{ (char *)"VariableBinAxis_getBinBoundaries", _wrap_VariableBinAxis_getBinBoundaries, METH_VARARGS, (char *)"\n"
"VariableBinAxis_getBinBoundaries(VariableBinAxis self) -> vdouble1d_t\n"
"\n"
- "std::vector<double> VariableBinAxis::getBinBoundaries() const \n"
+ "std::vector<double> VariableBinAxis::getBinBoundaries() const\n"
"\n"
""},
{ (char *)"VariableBinAxis_createClippedAxis", _wrap_VariableBinAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
@@ -113651,7 +113599,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"CustomBinAxis_getBinCenters", _wrap_CustomBinAxis_getBinCenters, METH_VARARGS, (char *)"\n"
"CustomBinAxis_getBinCenters(CustomBinAxis self) -> vdouble1d_t\n"
"\n"
- "std::vector< double > CustomBinAxis::getBinCenters() const \n"
+ "std::vector< double > CustomBinAxis::getBinCenters() const\n"
"\n"
""},
{ (char *)"CustomBinAxis_createClippedAxis", _wrap_CustomBinAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
@@ -113894,7 +113842,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FitStrategyDefault_clone", _wrap_FitStrategyDefault_clone, METH_VARARGS, (char *)"\n"
"FitStrategyDefault_clone(FitStrategyDefault self) -> FitStrategyDefault\n"
"\n"
- "FitStrategyDefault * FitStrategyDefault::clone() const \n"
+ "FitStrategyDefault * FitStrategyDefault::clone() const\n"
"\n"
""},
{ (char *)"FitStrategyDefault_execute", _wrap_FitStrategyDefault_execute, METH_VARARGS, (char *)"\n"
@@ -113933,13 +113881,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IntensityFunctionLog_clone", _wrap_IntensityFunctionLog_clone, METH_VARARGS, (char *)"\n"
"IntensityFunctionLog_clone(IntensityFunctionLog self) -> IntensityFunctionLog\n"
"\n"
- "virtual IntensityFunctionLog* IntensityFunctionLog::clone() const \n"
+ "virtual IntensityFunctionLog* IntensityFunctionLog::clone() const\n"
"\n"
""},
{ (char *)"IntensityFunctionLog_evaluate", _wrap_IntensityFunctionLog_evaluate, METH_VARARGS, (char *)"\n"
"IntensityFunctionLog_evaluate(IntensityFunctionLog self, double value) -> double\n"
"\n"
- "double IntensityFunctionLog::evaluate(double value) const \n"
+ "double IntensityFunctionLog::evaluate(double value) const\n"
"\n"
""},
{ (char *)"new_IntensityFunctionLog", _wrap_new_IntensityFunctionLog, METH_VARARGS, (char *)"\n"
@@ -113962,13 +113910,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IntensityFunctionSqrt_clone", _wrap_IntensityFunctionSqrt_clone, METH_VARARGS, (char *)"\n"
"IntensityFunctionSqrt_clone(IntensityFunctionSqrt self) -> IntensityFunctionSqrt\n"
"\n"
- "virtual IntensityFunctionSqrt* IntensityFunctionSqrt::clone() const \n"
+ "virtual IntensityFunctionSqrt* IntensityFunctionSqrt::clone() const\n"
"\n"
""},
{ (char *)"IntensityFunctionSqrt_evaluate", _wrap_IntensityFunctionSqrt_evaluate, METH_VARARGS, (char *)"\n"
"IntensityFunctionSqrt_evaluate(IntensityFunctionSqrt self, double value) -> double\n"
"\n"
- "double IntensityFunctionSqrt::evaluate(double value) const \n"
+ "double IntensityFunctionSqrt::evaluate(double value) const\n"
"\n"
""},
{ (char *)"new_IntensityFunctionSqrt", _wrap_new_IntensityFunctionSqrt, METH_VARARGS, (char *)"\n"
@@ -114030,7 +113978,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IntensityNormalizer_clone", _wrap_IntensityNormalizer_clone, METH_VARARGS, (char *)"\n"
"IntensityNormalizer_clone(IntensityNormalizer self) -> IntensityNormalizer\n"
"\n"
- "IntensityNormalizer * IntensityNormalizer::clone() const \n"
+ "IntensityNormalizer * IntensityNormalizer::clone() const\n"
"\n"
""},
{ (char *)"IntensityNormalizer_accept", _wrap_IntensityNormalizer_accept, METH_VARARGS, (char *)"\n"
@@ -114044,7 +113992,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IntensityNormalizer_createNormalizedData", _wrap_IntensityNormalizer_createNormalizedData, METH_VARARGS, (char *)"\n"
"IntensityNormalizer_createNormalizedData(IntensityNormalizer self, IntensityData data) -> IntensityData\n"
"\n"
- "OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const \n"
+ "OutputData< double > * IntensityNormalizer::createNormalizedData(const OutputData< double > &data) const\n"
"\n"
""},
{ (char *)"IntensityNormalizer_apply", _wrap_IntensityNormalizer_apply, METH_VARARGS, (char *)"\n"
@@ -114387,7 +114335,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FitObject_getDefaultAxisUnits", _wrap_FitObject_getDefaultAxisUnits, METH_VARARGS, (char *)"\n"
"FitObject_getDefaultAxisUnits(FitObject self) -> std::string\n"
"\n"
- "std::string FitObject::getDefaultAxisUnits() const \n"
+ "std::string FitObject::getDefaultAxisUnits() const\n"
"\n"
""},
{ (char *)"FitObject_swigregister", FitObject_swigregister, METH_VARARGS, NULL},
@@ -114419,7 +114367,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FitParameter_clone", _wrap_FitParameter_clone, METH_VARARGS, (char *)"\n"
"FitParameter_clone(FitParameter self) -> FitParameter\n"
"\n"
- "FitParameter * FitParameter::clone() const \n"
+ "FitParameter * FitParameter::clone() const\n"
"\n"
""},
{ (char *)"FitParameter_setValue", _wrap_FitParameter_setValue, METH_VARARGS, (char *)"\n"
@@ -114457,7 +114405,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FitParameter_patterns", _wrap_FitParameter_patterns, METH_VARARGS, (char *)"\n"
"FitParameter_patterns(FitParameter self) -> vector_string_t\n"
"\n"
- "std::vector< std::string > FitParameter::patterns() const \n"
+ "std::vector< std::string > FitParameter::patterns() const\n"
"\n"
""},
{ (char *)"FitParameter_matchedParameterNames", _wrap_FitParameter_matchedParameterNames, METH_VARARGS, (char *)"\n"
@@ -114733,21 +114681,21 @@ static PyMethodDef SwigMethods[] = {
"getRealOutputData(size_t i_item=0) -> IntensityData\n"
"FitSuite_getRealOutputData(FitSuite self) -> IntensityData\n"
"\n"
- "const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const \n"
+ "const OutputData< double > * FitSuite::getRealOutputData(size_t i_item=0) const\n"
"\n"
""},
{ (char *)"FitSuite_getSimulationOutputData", _wrap_FitSuite_getSimulationOutputData, METH_VARARGS, (char *)"\n"
"getSimulationOutputData(size_t i_item=0) -> IntensityData\n"
"FitSuite_getSimulationOutputData(FitSuite self) -> IntensityData\n"
"\n"
- "const OutputData< double > * FitSuite::getSimulationOutputData(size_t i_item=0) const \n"
+ "const OutputData< double > * FitSuite::getSimulationOutputData(size_t i_item=0) const\n"
"\n"
""},
{ (char *)"FitSuite_getChiSquaredOutputData", _wrap_FitSuite_getChiSquaredOutputData, METH_VARARGS, (char *)"\n"
"getChiSquaredOutputData(size_t i_item=0) -> IntensityData\n"
"FitSuite_getChiSquaredOutputData(FitSuite self) -> IntensityData\n"
"\n"
- "const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const \n"
+ "const OutputData< double > * FitSuite::getChiSquaredOutputData(size_t i_item=0) const\n"
"\n"
""},
{ (char *)"FitSuite_parametersToString", _wrap_FitSuite_parametersToString, METH_VARARGS, (char *)"\n"
@@ -114916,7 +114864,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FitSuiteObjects_size", _wrap_FitSuiteObjects_size, METH_VARARGS, (char *)"\n"
"FitSuiteObjects_size(FitSuiteObjects self) -> size_t\n"
"\n"
- "size_t FitSuiteObjects::size() const \n"
+ "size_t FitSuiteObjects::size() const\n"
"\n"
""},
{ (char *)"FitSuiteObjects_begin", _wrap_FitSuiteObjects_begin, METH_VARARGS, (char *)"\n"
@@ -114943,7 +114891,7 @@ static PyMethodDef SwigMethods[] = {
"getDefaultAxesUnits(size_t i_item=0) -> std::string\n"
"FitSuiteObjects_getDefaultAxesUnits(FitSuiteObjects self) -> std::string\n"
"\n"
- "std::string FitSuiteObjects::getDefaultAxesUnits(size_t i_item=0) const \n"
+ "std::string FitSuiteObjects::getDefaultAxesUnits(size_t i_item=0) const\n"
"\n"
""},
{ (char *)"FitSuiteObjects_swigregister", FitSuiteObjects_swigregister, METH_VARARGS, NULL},
@@ -115086,7 +115034,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"AdjustMinimizerStrategy_clone", _wrap_AdjustMinimizerStrategy_clone, METH_VARARGS, (char *)"\n"
"AdjustMinimizerStrategy_clone(AdjustMinimizerStrategy self) -> AdjustMinimizerStrategy\n"
"\n"
- "AdjustMinimizerStrategy * AdjustMinimizerStrategy::clone() const \n"
+ "AdjustMinimizerStrategy * AdjustMinimizerStrategy::clone() const\n"
"\n"
""},
{ (char *)"AdjustMinimizerStrategy_setMinimizer", _wrap_AdjustMinimizerStrategy_setMinimizer, METH_VARARGS, (char *)"\n"
@@ -115349,7 +115297,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Crystal_clone", _wrap_Crystal_clone, METH_VARARGS, (char *)"\n"
"Crystal_clone(Crystal self) -> Crystal\n"
"\n"
- "Crystal * Crystal::clone() const overridefinal\n"
+ "Crystal * Crystal::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -115357,7 +115305,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Crystal_accept", _wrap_Crystal_accept, METH_VARARGS, (char *)"\n"
"Crystal_accept(Crystal self, INodeVisitor visitor)\n"
"\n"
- "void Crystal::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void Crystal::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -115365,7 +115313,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Crystal_createTotalFormFactor", _wrap_Crystal_createTotalFormFactor, METH_VARARGS, (char *)"\n"
"Crystal_createTotalFormFactor(Crystal self, IFormFactor meso_crystal_form_factor, IRotation p_rotation, kvector_t translation) -> IFormFactor\n"
"\n"
- "IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const overridefinal\n"
+ "IFormFactor * Crystal::createTotalFormFactor(const IFormFactor &meso_crystal_form_factor, const IRotation *p_rotation, const kvector_t &translation) const override final\n"
"\n"
"Creates a total form factor for the mesocrystal with a specific shape and content The bulk content of the mesocrystal is encapsulated by the IClusteredParticles object itself \n"
"\n"
@@ -115373,7 +115321,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Crystal_homogeneousRegions", _wrap_Crystal_homogeneousRegions, METH_VARARGS, (char *)"\n"
"Crystal_homogeneousRegions(Crystal self) -> std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > >\n"
"\n"
- "std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const overridefinal\n"
+ "std::vector< HomogeneousRegion > Crystal::homogeneousRegions() const override final\n"
"\n"
"Creates region information with volumetric densities instead of absolute volume These densities need to be multiplied by the total mesocrystal volume \n"
"\n"
@@ -115382,7 +115330,7 @@ static PyMethodDef SwigMethods[] = {
"transformedLattice(IRotation p_rotation=None) -> Lattice\n"
"Crystal_transformedLattice(Crystal self) -> Lattice\n"
"\n"
- "Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const \n"
+ "Lattice Crystal::transformedLattice(const IRotation *p_rotation=nullptr) const\n"
"\n"
""},
{ (char *)"Crystal_setDWFactor", _wrap_Crystal_setDWFactor, METH_VARARGS, (char *)"\n"
@@ -115394,7 +115342,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Crystal_getChildren", _wrap_Crystal_getChildren, METH_VARARGS, (char *)"\n"
"Crystal_getChildren(Crystal self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > Crystal::getChildren() const overridefinal\n"
+ "std::vector< const INode * > Crystal::getChildren() const override final\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -115518,13 +115466,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DistributionGate_getMin", _wrap_DistributionGate_getMin, METH_VARARGS, (char *)"\n"
"DistributionGate_getMin(DistributionGate self) -> double\n"
"\n"
- "double DistributionGate::getMin() const \n"
+ "double DistributionGate::getMin() const\n"
"\n"
""},
{ (char *)"DistributionGate_getMax", _wrap_DistributionGate_getMax, METH_VARARGS, (char *)"\n"
"DistributionGate_getMax(DistributionGate self) -> double\n"
"\n"
- "double DistributionGate::getMax() const \n"
+ "double DistributionGate::getMax() const\n"
"\n"
""},
{ (char *)"DistributionGate_equidistantPoints", _wrap_DistributionGate_equidistantPoints, METH_VARARGS, (char *)"\n"
@@ -115591,7 +115539,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DistributionLorentz_getHWHM", _wrap_DistributionLorentz_getHWHM, METH_VARARGS, (char *)"\n"
"DistributionLorentz_getHWHM(DistributionLorentz self) -> double\n"
"\n"
- "double DistributionLorentz::getHWHM() const \n"
+ "double DistributionLorentz::getHWHM() const\n"
"\n"
""},
{ (char *)"DistributionLorentz_equidistantPoints", _wrap_DistributionLorentz_equidistantPoints, METH_VARARGS, (char *)"\n"
@@ -115658,7 +115606,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DistributionGaussian_getStdDev", _wrap_DistributionGaussian_getStdDev, METH_VARARGS, (char *)"\n"
"DistributionGaussian_getStdDev(DistributionGaussian self) -> double\n"
"\n"
- "double DistributionGaussian::getStdDev() const \n"
+ "double DistributionGaussian::getStdDev() const\n"
"\n"
""},
{ (char *)"DistributionGaussian_equidistantPoints", _wrap_DistributionGaussian_equidistantPoints, METH_VARARGS, (char *)"\n"
@@ -115725,13 +115673,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DistributionLogNormal_getMedian", _wrap_DistributionLogNormal_getMedian, METH_VARARGS, (char *)"\n"
"DistributionLogNormal_getMedian(DistributionLogNormal self) -> double\n"
"\n"
- "double DistributionLogNormal::getMedian() const \n"
+ "double DistributionLogNormal::getMedian() const\n"
"\n"
""},
{ (char *)"DistributionLogNormal_getScalePar", _wrap_DistributionLogNormal_getScalePar, METH_VARARGS, (char *)"\n"
"DistributionLogNormal_getScalePar(DistributionLogNormal self) -> double\n"
"\n"
- "double DistributionLogNormal::getScalePar() const \n"
+ "double DistributionLogNormal::getScalePar() const\n"
"\n"
""},
{ (char *)"DistributionLogNormal_equidistantPoints", _wrap_DistributionLogNormal_equidistantPoints, METH_VARARGS, (char *)"\n"
@@ -115806,7 +115754,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DistributionCosine_getSigma", _wrap_DistributionCosine_getSigma, METH_VARARGS, (char *)"\n"
"DistributionCosine_getSigma(DistributionCosine self) -> double\n"
"\n"
- "double DistributionCosine::getSigma() const \n"
+ "double DistributionCosine::getSigma() const\n"
"\n"
""},
{ (char *)"DistributionCosine_equidistantPoints", _wrap_DistributionCosine_equidistantPoints, METH_VARARGS, (char *)"\n"
@@ -115873,19 +115821,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DistributionTrapezoid_getLeftWidth", _wrap_DistributionTrapezoid_getLeftWidth, METH_VARARGS, (char *)"\n"
"DistributionTrapezoid_getLeftWidth(DistributionTrapezoid self) -> double\n"
"\n"
- "double DistributionTrapezoid::getLeftWidth() const \n"
+ "double DistributionTrapezoid::getLeftWidth() const\n"
"\n"
""},
{ (char *)"DistributionTrapezoid_getMiddleWidth", _wrap_DistributionTrapezoid_getMiddleWidth, METH_VARARGS, (char *)"\n"
"DistributionTrapezoid_getMiddleWidth(DistributionTrapezoid self) -> double\n"
"\n"
- "double DistributionTrapezoid::getMiddleWidth() const \n"
+ "double DistributionTrapezoid::getMiddleWidth() const\n"
"\n"
""},
{ (char *)"DistributionTrapezoid_getRightWidth", _wrap_DistributionTrapezoid_getRightWidth, METH_VARARGS, (char *)"\n"
"DistributionTrapezoid_getRightWidth(DistributionTrapezoid self) -> double\n"
"\n"
- "double DistributionTrapezoid::getRightWidth() const \n"
+ "double DistributionTrapezoid::getRightWidth() const\n"
"\n"
""},
{ (char *)"DistributionTrapezoid_equidistantPoints", _wrap_DistributionTrapezoid_equidistantPoints, METH_VARARGS, (char *)"\n"
@@ -115948,19 +115896,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DetectorMask_isMasked", _wrap_DetectorMask_isMasked, METH_VARARGS, (char *)"\n"
"DetectorMask_isMasked(DetectorMask self, size_t index) -> bool\n"
"\n"
- "bool DetectorMask::isMasked(size_t index) const \n"
+ "bool DetectorMask::isMasked(size_t index) const\n"
"\n"
""},
{ (char *)"DetectorMask_getMaskData", _wrap_DetectorMask_getMaskData, METH_VARARGS, (char *)"\n"
"DetectorMask_getMaskData(DetectorMask self) -> OutputData< bool > const *\n"
"\n"
- "const OutputData<bool>* DetectorMask::getMaskData() const \n"
+ "const OutputData<bool>* DetectorMask::getMaskData() const\n"
"\n"
""},
{ (char *)"DetectorMask_createHistogram", _wrap_DetectorMask_createHistogram, METH_VARARGS, (char *)"\n"
"DetectorMask_createHistogram(DetectorMask self) -> Histogram2D\n"
"\n"
- "Histogram2D * DetectorMask::createHistogram() const \n"
+ "Histogram2D * DetectorMask::createHistogram() const\n"
"\n"
""},
{ (char *)"DetectorMask_removeMasks", _wrap_DetectorMask_removeMasks, METH_VARARGS, (char *)"\n"
@@ -115982,19 +115930,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DetectorMask_numberOfMaskedChannels", _wrap_DetectorMask_numberOfMaskedChannels, METH_VARARGS, (char *)"\n"
"DetectorMask_numberOfMaskedChannels(DetectorMask self) -> int\n"
"\n"
- "int DetectorMask::numberOfMaskedChannels() const \n"
+ "int DetectorMask::numberOfMaskedChannels() const\n"
"\n"
""},
{ (char *)"DetectorMask_numberOfMasks", _wrap_DetectorMask_numberOfMasks, METH_VARARGS, (char *)"\n"
"DetectorMask_numberOfMasks(DetectorMask self) -> size_t\n"
"\n"
- "size_t DetectorMask::numberOfMasks() const \n"
+ "size_t DetectorMask::numberOfMasks() const\n"
"\n"
""},
{ (char *)"DetectorMask_getMaskShape", _wrap_DetectorMask_getMaskShape, METH_VARARGS, (char *)"\n"
"DetectorMask_getMaskShape(DetectorMask self, size_t mask_index, bool & mask_value) -> IShape2D\n"
"\n"
- "const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const \n"
+ "const IShape2D * DetectorMask::getMaskShape(size_t mask_index, bool &mask_value) const\n"
"\n"
""},
{ (char *)"delete_DetectorMask", _wrap_delete_DetectorMask, METH_VARARGS, (char *)"delete_DetectorMask(DetectorMask self)"},
@@ -116027,7 +115975,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Ellipse_clone", _wrap_Ellipse_clone, METH_VARARGS, (char *)"\n"
"Ellipse_clone(Ellipse self) -> Ellipse\n"
"\n"
- "Ellipse* Ellipse::clone() const \n"
+ "Ellipse* Ellipse::clone() const\n"
"\n"
""},
{ (char *)"Ellipse_contains", _wrap_Ellipse_contains, METH_VARARGS, (char *)"\n"
@@ -116042,31 +115990,31 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Ellipse_getCenterX", _wrap_Ellipse_getCenterX, METH_VARARGS, (char *)"\n"
"Ellipse_getCenterX(Ellipse self) -> double\n"
"\n"
- "double Ellipse::getCenterX() const \n"
+ "double Ellipse::getCenterX() const\n"
"\n"
""},
{ (char *)"Ellipse_getCenterY", _wrap_Ellipse_getCenterY, METH_VARARGS, (char *)"\n"
"Ellipse_getCenterY(Ellipse self) -> double\n"
"\n"
- "double Ellipse::getCenterY() const \n"
+ "double Ellipse::getCenterY() const\n"
"\n"
""},
{ (char *)"Ellipse_getRadiusX", _wrap_Ellipse_getRadiusX, METH_VARARGS, (char *)"\n"
"Ellipse_getRadiusX(Ellipse self) -> double\n"
"\n"
- "double Ellipse::getRadiusX() const \n"
+ "double Ellipse::getRadiusX() const\n"
"\n"
""},
{ (char *)"Ellipse_getRadiusY", _wrap_Ellipse_getRadiusY, METH_VARARGS, (char *)"\n"
"Ellipse_getRadiusY(Ellipse self) -> double\n"
"\n"
- "double Ellipse::getRadiusY() const \n"
+ "double Ellipse::getRadiusY() const\n"
"\n"
""},
{ (char *)"Ellipse_getTheta", _wrap_Ellipse_getTheta, METH_VARARGS, (char *)"\n"
"Ellipse_getTheta(Ellipse self) -> double\n"
"\n"
- "double Ellipse::getTheta() const \n"
+ "double Ellipse::getTheta() const\n"
"\n"
""},
{ (char *)"delete_Ellipse", _wrap_delete_Ellipse, METH_VARARGS, (char *)"delete_Ellipse(Ellipse self)"},
@@ -116086,7 +116034,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IFTDecayFunction1D_decayLength", _wrap_IFTDecayFunction1D_decayLength, METH_VARARGS, (char *)"\n"
"IFTDecayFunction1D_decayLength(IFTDecayFunction1D self) -> double\n"
"\n"
- "double IFTDecayFunction1D::decayLength() const \n"
+ "double IFTDecayFunction1D::decayLength() const\n"
"\n"
""},
{ (char *)"delete_IFTDecayFunction1D", _wrap_delete_IFTDecayFunction1D, METH_VARARGS, (char *)"delete_IFTDecayFunction1D(IFTDecayFunction1D self)"},
@@ -116100,7 +116048,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction1DCauchy_clone", _wrap_FTDecayFunction1DCauchy_clone, METH_VARARGS, (char *)"\n"
"FTDecayFunction1DCauchy_clone(FTDecayFunction1DCauchy self) -> FTDecayFunction1DCauchy\n"
"\n"
- "FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const \n"
+ "FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const\n"
"\n"
""},
{ (char *)"FTDecayFunction1DCauchy_accept", _wrap_FTDecayFunction1DCauchy_accept, METH_VARARGS, (char *)"\n"
@@ -116128,7 +116076,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction1DGauss_clone", _wrap_FTDecayFunction1DGauss_clone, METH_VARARGS, (char *)"\n"
"FTDecayFunction1DGauss_clone(FTDecayFunction1DGauss self) -> FTDecayFunction1DGauss\n"
"\n"
- "FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const \n"
+ "FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const\n"
"\n"
""},
{ (char *)"FTDecayFunction1DGauss_accept", _wrap_FTDecayFunction1DGauss_accept, METH_VARARGS, (char *)"\n"
@@ -116156,7 +116104,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction1DTriangle_clone", _wrap_FTDecayFunction1DTriangle_clone, METH_VARARGS, (char *)"\n"
"FTDecayFunction1DTriangle_clone(FTDecayFunction1DTriangle self) -> FTDecayFunction1DTriangle\n"
"\n"
- "FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const \n"
+ "FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const\n"
"\n"
""},
{ (char *)"FTDecayFunction1DTriangle_accept", _wrap_FTDecayFunction1DTriangle_accept, METH_VARARGS, (char *)"\n"
@@ -116195,7 +116143,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction1DVoigt_clone", _wrap_FTDecayFunction1DVoigt_clone, METH_VARARGS, (char *)"\n"
"FTDecayFunction1DVoigt_clone(FTDecayFunction1DVoigt self) -> FTDecayFunction1DVoigt\n"
"\n"
- "FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const \n"
+ "FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const\n"
"\n"
""},
{ (char *)"FTDecayFunction1DVoigt_accept", _wrap_FTDecayFunction1DVoigt_accept, METH_VARARGS, (char *)"\n"
@@ -116215,7 +116163,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction1DVoigt_eEta", _wrap_FTDecayFunction1DVoigt_eEta, METH_VARARGS, (char *)"\n"
"FTDecayFunction1DVoigt_eEta(FTDecayFunction1DVoigt self) -> double\n"
"\n"
- "double FTDecayFunction1DVoigt::eEta() const \n"
+ "double FTDecayFunction1DVoigt::eEta() const\n"
"\n"
""},
{ (char *)"delete_FTDecayFunction1DVoigt", _wrap_delete_FTDecayFunction1DVoigt, METH_VARARGS, (char *)"delete_FTDecayFunction1DVoigt(FTDecayFunction1DVoigt self)"},
@@ -116294,7 +116242,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction2DCauchy_clone", _wrap_FTDecayFunction2DCauchy_clone, METH_VARARGS, (char *)"\n"
"FTDecayFunction2DCauchy_clone(FTDecayFunction2DCauchy self) -> FTDecayFunction2DCauchy\n"
"\n"
- "FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const \n"
+ "FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const\n"
"\n"
""},
{ (char *)"FTDecayFunction2DCauchy_accept", _wrap_FTDecayFunction2DCauchy_accept, METH_VARARGS, (char *)"\n"
@@ -116325,7 +116273,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction2DGauss_clone", _wrap_FTDecayFunction2DGauss_clone, METH_VARARGS, (char *)"\n"
"FTDecayFunction2DGauss_clone(FTDecayFunction2DGauss self) -> FTDecayFunction2DGauss\n"
"\n"
- "FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const \n"
+ "FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const\n"
"\n"
""},
{ (char *)"FTDecayFunction2DGauss_accept", _wrap_FTDecayFunction2DGauss_accept, METH_VARARGS, (char *)"\n"
@@ -116373,7 +116321,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction2DVoigt_clone", _wrap_FTDecayFunction2DVoigt_clone, METH_VARARGS, (char *)"\n"
"FTDecayFunction2DVoigt_clone(FTDecayFunction2DVoigt self) -> FTDecayFunction2DVoigt\n"
"\n"
- "FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const \n"
+ "FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const\n"
"\n"
""},
{ (char *)"FTDecayFunction2DVoigt_accept", _wrap_FTDecayFunction2DVoigt_accept, METH_VARARGS, (char *)"\n"
@@ -116395,7 +116343,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDecayFunction2DVoigt_eta", _wrap_FTDecayFunction2DVoigt_eta, METH_VARARGS, (char *)"\n"
"FTDecayFunction2DVoigt_eta(FTDecayFunction2DVoigt self) -> double\n"
"\n"
- "double FTDecayFunction2DVoigt::eta() const \n"
+ "double FTDecayFunction2DVoigt::eta() const\n"
"\n"
""},
{ (char *)"delete_FTDecayFunction2DVoigt", _wrap_delete_FTDecayFunction2DVoigt, METH_VARARGS, (char *)"delete_FTDecayFunction2DVoigt(FTDecayFunction2DVoigt self)"},
@@ -116423,7 +116371,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IFTDistribution1D_omega", _wrap_IFTDistribution1D_omega, METH_VARARGS, (char *)"\n"
"IFTDistribution1D_omega(IFTDistribution1D self) -> double\n"
"\n"
- "double IFTDistribution1D::omega() const \n"
+ "double IFTDistribution1D::omega() const\n"
"\n"
""},
{ (char *)"delete_IFTDistribution1D", _wrap_delete_IFTDistribution1D, METH_VARARGS, (char *)"delete_IFTDistribution1D(IFTDistribution1D self)"},
@@ -116620,7 +116568,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDistribution1DVoigt_eta", _wrap_FTDistribution1DVoigt_eta, METH_VARARGS, (char *)"\n"
"FTDistribution1DVoigt_eta(FTDistribution1DVoigt self) -> double\n"
"\n"
- "double FTDistribution1DVoigt::eta() const \n"
+ "double FTDistribution1DVoigt::eta() const\n"
"\n"
""},
{ (char *)"delete_FTDistribution1DVoigt", _wrap_delete_FTDistribution1DVoigt, METH_VARARGS, (char *)"delete_FTDistribution1DVoigt(FTDistribution1DVoigt self)"},
@@ -116640,25 +116588,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IFTDistribution2D_gamma", _wrap_IFTDistribution2D_gamma, METH_VARARGS, (char *)"\n"
"IFTDistribution2D_gamma(IFTDistribution2D self) -> double\n"
"\n"
- "double IFTDistribution2D::gamma() const \n"
+ "double IFTDistribution2D::gamma() const\n"
"\n"
""},
{ (char *)"IFTDistribution2D_delta", _wrap_IFTDistribution2D_delta, METH_VARARGS, (char *)"\n"
"IFTDistribution2D_delta(IFTDistribution2D self) -> double\n"
"\n"
- "double IFTDistribution2D::delta() const \n"
+ "double IFTDistribution2D::delta() const\n"
"\n"
""},
{ (char *)"IFTDistribution2D_omegaX", _wrap_IFTDistribution2D_omegaX, METH_VARARGS, (char *)"\n"
"IFTDistribution2D_omegaX(IFTDistribution2D self) -> double\n"
"\n"
- "double IFTDistribution2D::omegaX() const \n"
+ "double IFTDistribution2D::omegaX() const\n"
"\n"
""},
{ (char *)"IFTDistribution2D_omegaY", _wrap_IFTDistribution2D_omegaY, METH_VARARGS, (char *)"\n"
"IFTDistribution2D_omegaY(IFTDistribution2D self) -> double\n"
"\n"
- "double IFTDistribution2D::omegaY() const \n"
+ "double IFTDistribution2D::omegaY() const\n"
"\n"
""},
{ (char *)"IFTDistribution2D_evaluate", _wrap_IFTDistribution2D_evaluate, METH_VARARGS, (char *)"\n"
@@ -116844,7 +116792,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDistribution2DVoigt_eta", _wrap_FTDistribution2DVoigt_eta, METH_VARARGS, (char *)"\n"
"FTDistribution2DVoigt_eta(FTDistribution2DVoigt self) -> double\n"
"\n"
- "double FTDistribution2DVoigt::eta() const \n"
+ "double FTDistribution2DVoigt::eta() const\n"
"\n"
""},
{ (char *)"delete_FTDistribution2DVoigt", _wrap_delete_FTDistribution2DVoigt, METH_VARARGS, (char *)"delete_FTDistribution2DVoigt(FTDistribution2DVoigt self)"},
@@ -116921,7 +116869,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FixedBinAxis_getBinCenter", _wrap_FixedBinAxis_getBinCenter, METH_VARARGS, (char *)"\n"
"FixedBinAxis_getBinCenter(FixedBinAxis self, size_t index) -> double\n"
"\n"
- "double FixedBinAxis::getBinCenter(size_t index) const \n"
+ "double FixedBinAxis::getBinCenter(size_t index) const\n"
"\n"
""},
{ (char *)"FixedBinAxis_findClosestIndex", _wrap_FixedBinAxis_findClosestIndex, METH_VARARGS, (char *)"\n"
@@ -116935,13 +116883,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FixedBinAxis_getBinCenters", _wrap_FixedBinAxis_getBinCenters, METH_VARARGS, (char *)"\n"
"FixedBinAxis_getBinCenters(FixedBinAxis self) -> vdouble1d_t\n"
"\n"
- "std::vector< double > FixedBinAxis::getBinCenters() const \n"
+ "std::vector< double > FixedBinAxis::getBinCenters() const\n"
"\n"
""},
{ (char *)"FixedBinAxis_getBinBoundaries", _wrap_FixedBinAxis_getBinBoundaries, METH_VARARGS, (char *)"\n"
"FixedBinAxis_getBinBoundaries(FixedBinAxis self) -> vdouble1d_t\n"
"\n"
- "std::vector< double > FixedBinAxis::getBinBoundaries() const \n"
+ "std::vector< double > FixedBinAxis::getBinBoundaries() const\n"
"\n"
""},
{ (char *)"FixedBinAxis_createClippedAxis", _wrap_FixedBinAxis_createClippedAxis, METH_VARARGS, (char *)"\n"
@@ -117302,25 +117250,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PolyhedralEdge_E", _wrap_PolyhedralEdge_E, METH_VARARGS, (char *)"\n"
"PolyhedralEdge_E(PolyhedralEdge self) -> kvector_t\n"
"\n"
- "kvector_t PolyhedralEdge::E() const \n"
+ "kvector_t PolyhedralEdge::E() const\n"
"\n"
""},
{ (char *)"PolyhedralEdge_R", _wrap_PolyhedralEdge_R, METH_VARARGS, (char *)"\n"
"PolyhedralEdge_R(PolyhedralEdge self) -> kvector_t\n"
"\n"
- "kvector_t PolyhedralEdge::R() const \n"
+ "kvector_t PolyhedralEdge::R() const\n"
"\n"
""},
{ (char *)"PolyhedralEdge_qE", _wrap_PolyhedralEdge_qE, METH_VARARGS, (char *)"\n"
"PolyhedralEdge_qE(PolyhedralEdge self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t PolyhedralEdge::qE(cvector_t q) const \n"
+ "complex_t PolyhedralEdge::qE(cvector_t q) const\n"
"\n"
""},
{ (char *)"PolyhedralEdge_qR", _wrap_PolyhedralEdge_qR, METH_VARARGS, (char *)"\n"
"PolyhedralEdge_qR(PolyhedralEdge self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t PolyhedralEdge::qR(cvector_t q) const \n"
+ "complex_t PolyhedralEdge::qR(cvector_t q) const\n"
"\n"
""},
{ (char *)"PolyhedralEdge_contrib", _wrap_PolyhedralEdge_contrib, METH_VARARGS, (char *)"\n"
@@ -117356,25 +117304,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PolyhedralFace_area", _wrap_PolyhedralFace_area, METH_VARARGS, (char *)"\n"
"PolyhedralFace_area(PolyhedralFace self) -> double\n"
"\n"
- "double PolyhedralFace::area() const \n"
+ "double PolyhedralFace::area() const\n"
"\n"
""},
{ (char *)"PolyhedralFace_center", _wrap_PolyhedralFace_center, METH_VARARGS, (char *)"\n"
"PolyhedralFace_center(PolyhedralFace self) -> kvector_t\n"
"\n"
- "kvector_t PolyhedralFace::center() const \n"
+ "kvector_t PolyhedralFace::center() const\n"
"\n"
""},
{ (char *)"PolyhedralFace_pyramidalVolume", _wrap_PolyhedralFace_pyramidalVolume, METH_VARARGS, (char *)"\n"
"PolyhedralFace_pyramidalVolume(PolyhedralFace self) -> double\n"
"\n"
- "double PolyhedralFace::pyramidalVolume() const \n"
+ "double PolyhedralFace::pyramidalVolume() const\n"
"\n"
""},
{ (char *)"PolyhedralFace_radius3d", _wrap_PolyhedralFace_radius3d, METH_VARARGS, (char *)"\n"
"PolyhedralFace_radius3d(PolyhedralFace self) -> double\n"
"\n"
- "double PolyhedralFace::radius3d() const \n"
+ "double PolyhedralFace::radius3d() const\n"
"\n"
""},
{ (char *)"PolyhedralFace_normalProjectionConj", _wrap_PolyhedralFace_normalProjectionConj, METH_VARARGS, (char *)"\n"
@@ -117422,7 +117370,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolyhedron_evaluate_for_q", _wrap_FormFactorPolyhedron_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorPolyhedron_evaluate_for_q(FormFactorPolyhedron self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorPolyhedron::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns the form factor F(q) of this polyhedron, respecting the offset z_origin. \n"
"\n"
@@ -117438,7 +117386,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolyhedron_volume", _wrap_FormFactorPolyhedron_volume, METH_VARARGS, (char *)"\n"
"FormFactorPolyhedron_volume(FormFactorPolyhedron self) -> double\n"
"\n"
- "double FormFactorPolyhedron::volume() const overridefinal\n"
+ "double FormFactorPolyhedron::volume() const override final\n"
"\n"
"Returns the total volume of the particle of this form factor's shape. \n"
"\n"
@@ -117446,7 +117394,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolyhedron_radialExtension", _wrap_FormFactorPolyhedron_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorPolyhedron_radialExtension(FormFactorPolyhedron self) -> double\n"
"\n"
- "double FormFactorPolyhedron::radialExtension() const overridefinal\n"
+ "double FormFactorPolyhedron::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -117464,7 +117412,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolygonalPrism_evaluate_for_q", _wrap_FormFactorPolygonalPrism_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorPolygonalPrism_evaluate_for_q(FormFactorPolygonalPrism self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorPolygonalPrism::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns the form factor F(q) of this polyhedron, respecting the offset height/2. \n"
"\n"
@@ -117472,7 +117420,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolygonalPrism_volume", _wrap_FormFactorPolygonalPrism_volume, METH_VARARGS, (char *)"\n"
"FormFactorPolygonalPrism_volume(FormFactorPolygonalPrism self) -> double\n"
"\n"
- "double FormFactorPolygonalPrism::volume() const overridefinal\n"
+ "double FormFactorPolygonalPrism::volume() const override final\n"
"\n"
"Returns the volume of this prism. \n"
"\n"
@@ -117480,13 +117428,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolygonalPrism_getHeight", _wrap_FormFactorPolygonalPrism_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorPolygonalPrism_getHeight(FormFactorPolygonalPrism self) -> double\n"
"\n"
- "double FormFactorPolygonalPrism::getHeight() const \n"
+ "double FormFactorPolygonalPrism::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorPolygonalPrism_radialExtension", _wrap_FormFactorPolygonalPrism_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorPolygonalPrism_radialExtension(FormFactorPolygonalPrism self) -> double\n"
"\n"
- "double FormFactorPolygonalPrism::radialExtension() const overridefinal\n"
+ "double FormFactorPolygonalPrism::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -117496,7 +117444,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolygonalSurface_evaluate_for_q", _wrap_FormFactorPolygonalSurface_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorPolygonalSurface_evaluate_for_q(FormFactorPolygonalSurface self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorPolygonalSurface::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -117512,7 +117460,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPolygonalSurface_radialExtension", _wrap_FormFactorPolygonalSurface_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorPolygonalSurface_radialExtension(FormFactorPolygonalSurface self) -> double\n"
"\n"
- "double FormFactorPolygonalSurface::radialExtension() const overridefinal\n"
+ "double FormFactorPolygonalSurface::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -117545,7 +117493,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorAnisoPyramid_clone", _wrap_FormFactorAnisoPyramid_clone, METH_VARARGS, (char *)"\n"
"FormFactorAnisoPyramid_clone(FormFactorAnisoPyramid self) -> FormFactorAnisoPyramid\n"
"\n"
- "FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const overridefinal\n"
+ "FormFactorAnisoPyramid* FormFactorAnisoPyramid::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -117553,7 +117501,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorAnisoPyramid_accept", _wrap_FormFactorAnisoPyramid_accept, METH_VARARGS, (char *)"\n"
"FormFactorAnisoPyramid_accept(FormFactorAnisoPyramid self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorAnisoPyramid::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -117561,25 +117509,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorAnisoPyramid_getLength", _wrap_FormFactorAnisoPyramid_getLength, METH_VARARGS, (char *)"\n"
"FormFactorAnisoPyramid_getLength(FormFactorAnisoPyramid self) -> double\n"
"\n"
- "double FormFactorAnisoPyramid::getLength() const \n"
+ "double FormFactorAnisoPyramid::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorAnisoPyramid_getWidth", _wrap_FormFactorAnisoPyramid_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorAnisoPyramid_getWidth(FormFactorAnisoPyramid self) -> double\n"
"\n"
- "double FormFactorAnisoPyramid::getWidth() const \n"
+ "double FormFactorAnisoPyramid::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorAnisoPyramid_getHeight", _wrap_FormFactorAnisoPyramid_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorAnisoPyramid_getHeight(FormFactorAnisoPyramid self) -> double\n"
"\n"
- "double FormFactorAnisoPyramid::getHeight() const \n"
+ "double FormFactorAnisoPyramid::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorAnisoPyramid_getAlpha", _wrap_FormFactorAnisoPyramid_getAlpha, METH_VARARGS, (char *)"\n"
"FormFactorAnisoPyramid_getAlpha(FormFactorAnisoPyramid self) -> double\n"
"\n"
- "double FormFactorAnisoPyramid::getAlpha() const \n"
+ "double FormFactorAnisoPyramid::getAlpha() const\n"
"\n"
""},
{ (char *)"delete_FormFactorAnisoPyramid", _wrap_delete_FormFactorAnisoPyramid, METH_VARARGS, (char *)"delete_FormFactorAnisoPyramid(FormFactorAnisoPyramid self)"},
@@ -117607,7 +117555,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorBox_clone", _wrap_FormFactorBox_clone, METH_VARARGS, (char *)"\n"
"FormFactorBox_clone(FormFactorBox self) -> FormFactorBox\n"
"\n"
- "FormFactorBox* FormFactorBox::clone() const overridefinal\n"
+ "FormFactorBox* FormFactorBox::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -117615,7 +117563,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorBox_accept", _wrap_FormFactorBox_accept, METH_VARARGS, (char *)"\n"
"FormFactorBox_accept(FormFactorBox self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorBox::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorBox::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -117623,25 +117571,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorBox_getLength", _wrap_FormFactorBox_getLength, METH_VARARGS, (char *)"\n"
"FormFactorBox_getLength(FormFactorBox self) -> double\n"
"\n"
- "double FormFactorBox::getLength() const \n"
+ "double FormFactorBox::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorBox_getHeight", _wrap_FormFactorBox_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorBox_getHeight(FormFactorBox self) -> double\n"
"\n"
- "double FormFactorBox::getHeight() const \n"
+ "double FormFactorBox::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorBox_getWidth", _wrap_FormFactorBox_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorBox_getWidth(FormFactorBox self) -> double\n"
"\n"
- "double FormFactorBox::getWidth() const \n"
+ "double FormFactorBox::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorBox_radialExtension", _wrap_FormFactorBox_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorBox_radialExtension(FormFactorBox self) -> double\n"
"\n"
- "double FormFactorBox::radialExtension() const overridefinal\n"
+ "double FormFactorBox::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -117649,7 +117597,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorBox_evaluate_for_q", _wrap_FormFactorBox_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorBox_evaluate_for_q(FormFactorBox self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorBox::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorBox::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -117679,7 +117627,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCone_clone", _wrap_FormFactorCone_clone, METH_VARARGS, (char *)"\n"
"FormFactorCone_clone(FormFactorCone self) -> FormFactorCone\n"
"\n"
- "FormFactorCone* FormFactorCone::clone() const overridefinal\n"
+ "FormFactorCone* FormFactorCone::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -117687,7 +117635,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCone_accept", _wrap_FormFactorCone_accept, METH_VARARGS, (char *)"\n"
"FormFactorCone_accept(FormFactorCone self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorCone::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorCone::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -117695,25 +117643,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCone_getHeight", _wrap_FormFactorCone_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorCone_getHeight(FormFactorCone self) -> double\n"
"\n"
- "double FormFactorCone::getHeight() const \n"
+ "double FormFactorCone::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorCone_getAlpha", _wrap_FormFactorCone_getAlpha, METH_VARARGS, (char *)"\n"
"FormFactorCone_getAlpha(FormFactorCone self) -> double\n"
"\n"
- "double FormFactorCone::getAlpha() const \n"
+ "double FormFactorCone::getAlpha() const\n"
"\n"
""},
{ (char *)"FormFactorCone_getRadius", _wrap_FormFactorCone_getRadius, METH_VARARGS, (char *)"\n"
"FormFactorCone_getRadius(FormFactorCone self) -> double\n"
"\n"
- "double FormFactorCone::getRadius() const \n"
+ "double FormFactorCone::getRadius() const\n"
"\n"
""},
{ (char *)"FormFactorCone_radialExtension", _wrap_FormFactorCone_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorCone_radialExtension(FormFactorCone self) -> double\n"
"\n"
- "double FormFactorCone::radialExtension() const overridefinal\n"
+ "double FormFactorCone::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -117721,7 +117669,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCone_evaluate_for_q", _wrap_FormFactorCone_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorCone_evaluate_for_q(FormFactorCone self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorCone::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorCone::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -117751,7 +117699,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCone6_clone", _wrap_FormFactorCone6_clone, METH_VARARGS, (char *)"\n"
"FormFactorCone6_clone(FormFactorCone6 self) -> FormFactorCone6\n"
"\n"
- "FormFactorCone6* FormFactorCone6::clone() const overridefinal\n"
+ "FormFactorCone6* FormFactorCone6::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -117759,7 +117707,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCone6_accept", _wrap_FormFactorCone6_accept, METH_VARARGS, (char *)"\n"
"FormFactorCone6_accept(FormFactorCone6 self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorCone6::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorCone6::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -117767,19 +117715,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCone6_getBaseEdge", _wrap_FormFactorCone6_getBaseEdge, METH_VARARGS, (char *)"\n"
"FormFactorCone6_getBaseEdge(FormFactorCone6 self) -> double\n"
"\n"
- "double FormFactorCone6::getBaseEdge() const \n"
+ "double FormFactorCone6::getBaseEdge() const\n"
"\n"
""},
{ (char *)"FormFactorCone6_getHeight", _wrap_FormFactorCone6_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorCone6_getHeight(FormFactorCone6 self) -> double\n"
"\n"
- "double FormFactorCone6::getHeight() const \n"
+ "double FormFactorCone6::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorCone6_getAlpha", _wrap_FormFactorCone6_getAlpha, METH_VARARGS, (char *)"\n"
"FormFactorCone6_getAlpha(FormFactorCone6 self) -> double\n"
"\n"
- "double FormFactorCone6::getAlpha() const \n"
+ "double FormFactorCone6::getAlpha() const\n"
"\n"
""},
{ (char *)"delete_FormFactorCone6", _wrap_delete_FormFactorCone6, METH_VARARGS, (char *)"delete_FormFactorCone6(FormFactorCone6 self)"},
@@ -117793,13 +117741,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"delete_FormFactorCrystal", _wrap_delete_FormFactorCrystal, METH_VARARGS, (char *)"\n"
"delete_FormFactorCrystal(FormFactorCrystal self)\n"
"\n"
- "FormFactorCrystal::~FormFactorCrystal() overridefinal\n"
+ "FormFactorCrystal::~FormFactorCrystal() override final\n"
"\n"
""},
{ (char *)"FormFactorCrystal_clone", _wrap_FormFactorCrystal_clone, METH_VARARGS, (char *)"\n"
"FormFactorCrystal_clone(FormFactorCrystal self) -> FormFactorCrystal\n"
"\n"
- "FormFactorCrystal* FormFactorCrystal::clone() const overridefinal\n"
+ "FormFactorCrystal* FormFactorCrystal::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -117807,7 +117755,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCrystal_accept", _wrap_FormFactorCrystal_accept, METH_VARARGS, (char *)"\n"
"FormFactorCrystal_accept(FormFactorCrystal self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorCrystal::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorCrystal::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -117823,7 +117771,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCrystal_volume", _wrap_FormFactorCrystal_volume, METH_VARARGS, (char *)"\n"
"FormFactorCrystal_volume(FormFactorCrystal self) -> double\n"
"\n"
- "double FormFactorCrystal::volume() const overridefinal\n"
+ "double FormFactorCrystal::volume() const override final\n"
"\n"
"Returns the total volume of the particle of this form factor's shape. \n"
"\n"
@@ -117831,7 +117779,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCrystal_radialExtension", _wrap_FormFactorCrystal_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorCrystal_radialExtension(FormFactorCrystal self) -> double\n"
"\n"
- "double FormFactorCrystal::radialExtension() const overridefinal\n"
+ "double FormFactorCrystal::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -117847,7 +117795,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCrystal_topZ", _wrap_FormFactorCrystal_topZ, METH_VARARGS, (char *)"\n"
"FormFactorCrystal_topZ(FormFactorCrystal self, IRotation rotation) -> double\n"
"\n"
- "double FormFactorCrystal::topZ(const IRotation &rotation) const overridefinal\n"
+ "double FormFactorCrystal::topZ(const IRotation &rotation) const override final\n"
"\n"
"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
"\n"
@@ -117855,7 +117803,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCrystal_evaluate", _wrap_FormFactorCrystal_evaluate, METH_VARARGS, (char *)"\n"
"FormFactorCrystal_evaluate(FormFactorCrystal self, WavevectorInfo wavevectors) -> complex_t\n"
"\n"
- "complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const overridefinal\n"
+ "complex_t FormFactorCrystal::evaluate(const WavevectorInfo &wavevectors) const override final\n"
"\n"
"Returns scattering amplitude for complex wavevectors ki, kf. \n"
"\n"
@@ -117887,7 +117835,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCuboctahedron_clone", _wrap_FormFactorCuboctahedron_clone, METH_VARARGS, (char *)"\n"
"FormFactorCuboctahedron_clone(FormFactorCuboctahedron self) -> FormFactorCuboctahedron\n"
"\n"
- "FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const overridefinal\n"
+ "FormFactorCuboctahedron* FormFactorCuboctahedron::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -117895,7 +117843,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCuboctahedron_accept", _wrap_FormFactorCuboctahedron_accept, METH_VARARGS, (char *)"\n"
"FormFactorCuboctahedron_accept(FormFactorCuboctahedron self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorCuboctahedron::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -117903,25 +117851,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCuboctahedron_getLength", _wrap_FormFactorCuboctahedron_getLength, METH_VARARGS, (char *)"\n"
"FormFactorCuboctahedron_getLength(FormFactorCuboctahedron self) -> double\n"
"\n"
- "double FormFactorCuboctahedron::getLength() const \n"
+ "double FormFactorCuboctahedron::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorCuboctahedron_getHeight", _wrap_FormFactorCuboctahedron_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorCuboctahedron_getHeight(FormFactorCuboctahedron self) -> double\n"
"\n"
- "double FormFactorCuboctahedron::getHeight() const \n"
+ "double FormFactorCuboctahedron::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorCuboctahedron_getHeightRatio", _wrap_FormFactorCuboctahedron_getHeightRatio, METH_VARARGS, (char *)"\n"
"FormFactorCuboctahedron_getHeightRatio(FormFactorCuboctahedron self) -> double\n"
"\n"
- "double FormFactorCuboctahedron::getHeightRatio() const \n"
+ "double FormFactorCuboctahedron::getHeightRatio() const\n"
"\n"
""},
{ (char *)"FormFactorCuboctahedron_getAlpha", _wrap_FormFactorCuboctahedron_getAlpha, METH_VARARGS, (char *)"\n"
"FormFactorCuboctahedron_getAlpha(FormFactorCuboctahedron self) -> double\n"
"\n"
- "double FormFactorCuboctahedron::getAlpha() const \n"
+ "double FormFactorCuboctahedron::getAlpha() const\n"
"\n"
""},
{ (char *)"delete_FormFactorCuboctahedron", _wrap_delete_FormFactorCuboctahedron, METH_VARARGS, (char *)"delete_FormFactorCuboctahedron(FormFactorCuboctahedron self)"},
@@ -117946,7 +117894,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCylinder_clone", _wrap_FormFactorCylinder_clone, METH_VARARGS, (char *)"\n"
"FormFactorCylinder_clone(FormFactorCylinder self) -> FormFactorCylinder\n"
"\n"
- "FormFactorCylinder* FormFactorCylinder::clone() const overridefinal\n"
+ "FormFactorCylinder* FormFactorCylinder::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -117954,7 +117902,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCylinder_accept", _wrap_FormFactorCylinder_accept, METH_VARARGS, (char *)"\n"
"FormFactorCylinder_accept(FormFactorCylinder self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorCylinder::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorCylinder::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -117962,19 +117910,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCylinder_getHeight", _wrap_FormFactorCylinder_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorCylinder_getHeight(FormFactorCylinder self) -> double\n"
"\n"
- "double FormFactorCylinder::getHeight() const \n"
+ "double FormFactorCylinder::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorCylinder_getRadius", _wrap_FormFactorCylinder_getRadius, METH_VARARGS, (char *)"\n"
"FormFactorCylinder_getRadius(FormFactorCylinder self) -> double\n"
"\n"
- "double FormFactorCylinder::getRadius() const \n"
+ "double FormFactorCylinder::getRadius() const\n"
"\n"
""},
{ (char *)"FormFactorCylinder_radialExtension", _wrap_FormFactorCylinder_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorCylinder_radialExtension(FormFactorCylinder self) -> double\n"
"\n"
- "double FormFactorCylinder::radialExtension() const overridefinal\n"
+ "double FormFactorCylinder::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -117982,7 +117930,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorCylinder_evaluate_for_q", _wrap_FormFactorCylinder_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorCylinder_evaluate_for_q(FormFactorCylinder self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118001,7 +117949,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDecoratorDebyeWaller_clone", _wrap_FormFactorDecoratorDebyeWaller_clone, METH_VARARGS, (char *)"\n"
"FormFactorDecoratorDebyeWaller_clone(FormFactorDecoratorDebyeWaller self) -> FormFactorDecoratorDebyeWaller\n"
"\n"
- "FormFactorDecoratorDebyeWaller* FormFactorDecoratorDebyeWaller::clone() const overridefinal\n"
+ "FormFactorDecoratorDebyeWaller* FormFactorDecoratorDebyeWaller::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118009,7 +117957,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDecoratorDebyeWaller_accept", _wrap_FormFactorDecoratorDebyeWaller_accept, METH_VARARGS, (char *)"\n"
"FormFactorDecoratorDebyeWaller_accept(FormFactorDecoratorDebyeWaller self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorDecoratorDebyeWaller::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorDecoratorDebyeWaller::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118017,7 +117965,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDecoratorDebyeWaller_evaluate", _wrap_FormFactorDecoratorDebyeWaller_evaluate, METH_VARARGS, (char *)"\n"
"FormFactorDecoratorDebyeWaller_evaluate(FormFactorDecoratorDebyeWaller self, WavevectorInfo wavevectors) -> complex_t\n"
"\n"
- "complex_t FormFactorDecoratorDebyeWaller::evaluate(const WavevectorInfo &wavevectors) const overridefinal\n"
+ "complex_t FormFactorDecoratorDebyeWaller::evaluate(const WavevectorInfo &wavevectors) const override final\n"
"\n"
"Returns scattering amplitude for complex wavevectors ki, kf. \n"
"\n"
@@ -118049,7 +117997,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDodecahedron_clone", _wrap_FormFactorDodecahedron_clone, METH_VARARGS, (char *)"\n"
"FormFactorDodecahedron_clone(FormFactorDodecahedron self) -> FormFactorDodecahedron\n"
"\n"
- "FormFactorDodecahedron* FormFactorDodecahedron::clone() const overridefinal\n"
+ "FormFactorDodecahedron* FormFactorDodecahedron::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118057,7 +118005,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDodecahedron_accept", _wrap_FormFactorDodecahedron_accept, METH_VARARGS, (char *)"\n"
"FormFactorDodecahedron_accept(FormFactorDodecahedron self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorDodecahedron::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorDodecahedron::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118065,7 +118013,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDodecahedron_getEdge", _wrap_FormFactorDodecahedron_getEdge, METH_VARARGS, (char *)"\n"
"FormFactorDodecahedron_getEdge(FormFactorDodecahedron self) -> double\n"
"\n"
- "double FormFactorDodecahedron::getEdge() const \n"
+ "double FormFactorDodecahedron::getEdge() const\n"
"\n"
""},
{ (char *)"delete_FormFactorDodecahedron", _wrap_delete_FormFactorDodecahedron, METH_VARARGS, (char *)"delete_FormFactorDodecahedron(FormFactorDodecahedron self)"},
@@ -118079,7 +118027,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDot_clone", _wrap_FormFactorDot_clone, METH_VARARGS, (char *)"\n"
"FormFactorDot_clone(FormFactorDot self) -> FormFactorDot\n"
"\n"
- "FormFactorDot* FormFactorDot::clone() const overridefinal\n"
+ "FormFactorDot* FormFactorDot::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118087,7 +118035,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDot_accept", _wrap_FormFactorDot_accept, METH_VARARGS, (char *)"\n"
"FormFactorDot_accept(FormFactorDot self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorDot::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorDot::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118095,7 +118043,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDot_radialExtension", _wrap_FormFactorDot_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorDot_radialExtension(FormFactorDot self) -> double\n"
"\n"
- "double FormFactorDot::radialExtension() const overridefinal\n"
+ "double FormFactorDot::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118103,7 +118051,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorDot_evaluate_for_q", _wrap_FormFactorDot_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorDot_evaluate_for_q(FormFactorDot self, cvector_t arg3) -> complex_t\n"
"\n"
- "complex_t FormFactorDot::evaluate_for_q(cvector_t) const overridefinal\n"
+ "complex_t FormFactorDot::evaluate_for_q(cvector_t) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118133,7 +118081,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorEllipsoidalCylinder_clone", _wrap_FormFactorEllipsoidalCylinder_clone, METH_VARARGS, (char *)"\n"
"FormFactorEllipsoidalCylinder_clone(FormFactorEllipsoidalCylinder self) -> FormFactorEllipsoidalCylinder\n"
"\n"
- "FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const overridefinal\n"
+ "FormFactorEllipsoidalCylinder* FormFactorEllipsoidalCylinder::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118141,7 +118089,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorEllipsoidalCylinder_accept", _wrap_FormFactorEllipsoidalCylinder_accept, METH_VARARGS, (char *)"\n"
"FormFactorEllipsoidalCylinder_accept(FormFactorEllipsoidalCylinder self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorEllipsoidalCylinder::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118149,25 +118097,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorEllipsoidalCylinder_getRadiusX", _wrap_FormFactorEllipsoidalCylinder_getRadiusX, METH_VARARGS, (char *)"\n"
"FormFactorEllipsoidalCylinder_getRadiusX(FormFactorEllipsoidalCylinder self) -> double\n"
"\n"
- "double FormFactorEllipsoidalCylinder::getRadiusX() const \n"
+ "double FormFactorEllipsoidalCylinder::getRadiusX() const\n"
"\n"
""},
{ (char *)"FormFactorEllipsoidalCylinder_getRadiusY", _wrap_FormFactorEllipsoidalCylinder_getRadiusY, METH_VARARGS, (char *)"\n"
"FormFactorEllipsoidalCylinder_getRadiusY(FormFactorEllipsoidalCylinder self) -> double\n"
"\n"
- "double FormFactorEllipsoidalCylinder::getRadiusY() const \n"
+ "double FormFactorEllipsoidalCylinder::getRadiusY() const\n"
"\n"
""},
{ (char *)"FormFactorEllipsoidalCylinder_getHeight", _wrap_FormFactorEllipsoidalCylinder_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorEllipsoidalCylinder_getHeight(FormFactorEllipsoidalCylinder self) -> double\n"
"\n"
- "double FormFactorEllipsoidalCylinder::getHeight() const \n"
+ "double FormFactorEllipsoidalCylinder::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorEllipsoidalCylinder_radialExtension", _wrap_FormFactorEllipsoidalCylinder_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorEllipsoidalCylinder_radialExtension(FormFactorEllipsoidalCylinder self) -> double\n"
"\n"
- "double FormFactorEllipsoidalCylinder::radialExtension() const overridefinal\n"
+ "double FormFactorEllipsoidalCylinder::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118175,7 +118123,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorEllipsoidalCylinder_evaluate_for_q", _wrap_FormFactorEllipsoidalCylinder_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorEllipsoidalCylinder_evaluate_for_q(FormFactorEllipsoidalCylinder self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorEllipsoidalCylinder::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118199,7 +118147,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSphere_clone", _wrap_FormFactorFullSphere_clone, METH_VARARGS, (char *)"\n"
"FormFactorFullSphere_clone(FormFactorFullSphere self) -> FormFactorFullSphere\n"
"\n"
- "FormFactorFullSphere* FormFactorFullSphere::clone() const overridefinal\n"
+ "FormFactorFullSphere* FormFactorFullSphere::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118207,7 +118155,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSphere_accept", _wrap_FormFactorFullSphere_accept, METH_VARARGS, (char *)"\n"
"FormFactorFullSphere_accept(FormFactorFullSphere self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorFullSphere::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorFullSphere::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118215,13 +118163,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSphere_getRadius", _wrap_FormFactorFullSphere_getRadius, METH_VARARGS, (char *)"\n"
"FormFactorFullSphere_getRadius(FormFactorFullSphere self) -> double\n"
"\n"
- "double FormFactorFullSphere::getRadius() const \n"
+ "double FormFactorFullSphere::getRadius() const\n"
"\n"
""},
{ (char *)"FormFactorFullSphere_radialExtension", _wrap_FormFactorFullSphere_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorFullSphere_radialExtension(FormFactorFullSphere self) -> double\n"
"\n"
- "double FormFactorFullSphere::radialExtension() const overridefinal\n"
+ "double FormFactorFullSphere::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118229,7 +118177,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSphere_bottomZ", _wrap_FormFactorFullSphere_bottomZ, METH_VARARGS, (char *)"\n"
"FormFactorFullSphere_bottomZ(FormFactorFullSphere self, IRotation rotation) -> double\n"
"\n"
- "double FormFactorFullSphere::bottomZ(const IRotation &rotation) const overridefinal\n"
+ "double FormFactorFullSphere::bottomZ(const IRotation &rotation) const override final\n"
"\n"
"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
"\n"
@@ -118237,7 +118185,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSphere_topZ", _wrap_FormFactorFullSphere_topZ, METH_VARARGS, (char *)"\n"
"FormFactorFullSphere_topZ(FormFactorFullSphere self, IRotation rotation) -> double\n"
"\n"
- "double FormFactorFullSphere::topZ(const IRotation &rotation) const overridefinal\n"
+ "double FormFactorFullSphere::topZ(const IRotation &rotation) const override final\n"
"\n"
"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
"\n"
@@ -118245,7 +118193,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSphere_evaluate_for_q", _wrap_FormFactorFullSphere_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorFullSphere_evaluate_for_q(FormFactorFullSphere self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorFullSphere::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118272,7 +118220,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSpheroid_clone", _wrap_FormFactorFullSpheroid_clone, METH_VARARGS, (char *)"\n"
"FormFactorFullSpheroid_clone(FormFactorFullSpheroid self) -> FormFactorFullSpheroid\n"
"\n"
- "FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const overridefinal\n"
+ "FormFactorFullSpheroid* FormFactorFullSpheroid::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118280,7 +118228,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSpheroid_accept", _wrap_FormFactorFullSpheroid_accept, METH_VARARGS, (char *)"\n"
"FormFactorFullSpheroid_accept(FormFactorFullSpheroid self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorFullSpheroid::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118288,19 +118236,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSpheroid_getHeight", _wrap_FormFactorFullSpheroid_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorFullSpheroid_getHeight(FormFactorFullSpheroid self) -> double\n"
"\n"
- "double FormFactorFullSpheroid::getHeight() const \n"
+ "double FormFactorFullSpheroid::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorFullSpheroid_getRadius", _wrap_FormFactorFullSpheroid_getRadius, METH_VARARGS, (char *)"\n"
"FormFactorFullSpheroid_getRadius(FormFactorFullSpheroid self) -> double\n"
"\n"
- "double FormFactorFullSpheroid::getRadius() const \n"
+ "double FormFactorFullSpheroid::getRadius() const\n"
"\n"
""},
{ (char *)"FormFactorFullSpheroid_radialExtension", _wrap_FormFactorFullSpheroid_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorFullSpheroid_radialExtension(FormFactorFullSpheroid self) -> double\n"
"\n"
- "double FormFactorFullSpheroid::radialExtension() const overridefinal\n"
+ "double FormFactorFullSpheroid::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118308,7 +118256,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorFullSpheroid_evaluate_for_q", _wrap_FormFactorFullSpheroid_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorFullSpheroid_evaluate_for_q(FormFactorFullSpheroid self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118325,7 +118273,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorGauss_clone", _wrap_FormFactorGauss_clone, METH_VARARGS, (char *)"\n"
"FormFactorGauss_clone(FormFactorGauss self) -> FormFactorGauss\n"
"\n"
- "FormFactorGauss* FormFactorGauss::clone() const overridefinal\n"
+ "FormFactorGauss* FormFactorGauss::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118333,7 +118281,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorGauss_accept", _wrap_FormFactorGauss_accept, METH_VARARGS, (char *)"\n"
"FormFactorGauss_accept(FormFactorGauss self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorGauss::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorGauss::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118341,19 +118289,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorGauss_getWidth", _wrap_FormFactorGauss_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorGauss_getWidth(FormFactorGauss self) -> double\n"
"\n"
- "double FormFactorGauss::getWidth() const \n"
+ "double FormFactorGauss::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorGauss_getHeight", _wrap_FormFactorGauss_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorGauss_getHeight(FormFactorGauss self) -> double\n"
"\n"
- "double FormFactorGauss::getHeight() const \n"
+ "double FormFactorGauss::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorGauss_radialExtension", _wrap_FormFactorGauss_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorGauss_radialExtension(FormFactorGauss self) -> double\n"
"\n"
- "double FormFactorGauss::radialExtension() const overridefinal\n"
+ "double FormFactorGauss::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118361,7 +118309,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorGauss_evaluate_for_q", _wrap_FormFactorGauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorGauss_evaluate_for_q(FormFactorGauss self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorGauss::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118397,7 +118345,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorHemiEllipsoid_clone", _wrap_FormFactorHemiEllipsoid_clone, METH_VARARGS, (char *)"\n"
"FormFactorHemiEllipsoid_clone(FormFactorHemiEllipsoid self) -> FormFactorHemiEllipsoid\n"
"\n"
- "FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const overridefinal\n"
+ "FormFactorHemiEllipsoid* FormFactorHemiEllipsoid::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118405,7 +118353,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorHemiEllipsoid_accept", _wrap_FormFactorHemiEllipsoid_accept, METH_VARARGS, (char *)"\n"
"FormFactorHemiEllipsoid_accept(FormFactorHemiEllipsoid self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorHemiEllipsoid::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118413,25 +118361,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorHemiEllipsoid_getHeight", _wrap_FormFactorHemiEllipsoid_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorHemiEllipsoid_getHeight(FormFactorHemiEllipsoid self) -> double\n"
"\n"
- "double FormFactorHemiEllipsoid::getHeight() const \n"
+ "double FormFactorHemiEllipsoid::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorHemiEllipsoid_getRadiusX", _wrap_FormFactorHemiEllipsoid_getRadiusX, METH_VARARGS, (char *)"\n"
"FormFactorHemiEllipsoid_getRadiusX(FormFactorHemiEllipsoid self) -> double\n"
"\n"
- "double FormFactorHemiEllipsoid::getRadiusX() const \n"
+ "double FormFactorHemiEllipsoid::getRadiusX() const\n"
"\n"
""},
{ (char *)"FormFactorHemiEllipsoid_getRadiusY", _wrap_FormFactorHemiEllipsoid_getRadiusY, METH_VARARGS, (char *)"\n"
"FormFactorHemiEllipsoid_getRadiusY(FormFactorHemiEllipsoid self) -> double\n"
"\n"
- "double FormFactorHemiEllipsoid::getRadiusY() const \n"
+ "double FormFactorHemiEllipsoid::getRadiusY() const\n"
"\n"
""},
{ (char *)"FormFactorHemiEllipsoid_radialExtension", _wrap_FormFactorHemiEllipsoid_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorHemiEllipsoid_radialExtension(FormFactorHemiEllipsoid self) -> double\n"
"\n"
- "double FormFactorHemiEllipsoid::radialExtension() const overridefinal\n"
+ "double FormFactorHemiEllipsoid::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118439,7 +118387,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorHemiEllipsoid_evaluate_for_q", _wrap_FormFactorHemiEllipsoid_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorHemiEllipsoid_evaluate_for_q(FormFactorHemiEllipsoid self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118462,7 +118410,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorIcosahedron_clone", _wrap_FormFactorIcosahedron_clone, METH_VARARGS, (char *)"\n"
"FormFactorIcosahedron_clone(FormFactorIcosahedron self) -> FormFactorIcosahedron\n"
"\n"
- "FormFactorIcosahedron* FormFactorIcosahedron::clone() const overridefinal\n"
+ "FormFactorIcosahedron* FormFactorIcosahedron::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118470,7 +118418,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorIcosahedron_accept", _wrap_FormFactorIcosahedron_accept, METH_VARARGS, (char *)"\n"
"FormFactorIcosahedron_accept(FormFactorIcosahedron self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorIcosahedron::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorIcosahedron::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118478,7 +118426,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorIcosahedron_getEdge", _wrap_FormFactorIcosahedron_getEdge, METH_VARARGS, (char *)"\n"
"FormFactorIcosahedron_getEdge(FormFactorIcosahedron self) -> double\n"
"\n"
- "double FormFactorIcosahedron::getEdge() const \n"
+ "double FormFactorIcosahedron::getEdge() const\n"
"\n"
""},
{ (char *)"delete_FormFactorIcosahedron", _wrap_delete_FormFactorIcosahedron, METH_VARARGS, (char *)"delete_FormFactorIcosahedron(FormFactorIcosahedron self)"},
@@ -118506,7 +118454,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxGauss_clone", _wrap_FormFactorLongBoxGauss_clone, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxGauss_clone(FormFactorLongBoxGauss self) -> FormFactorLongBoxGauss\n"
"\n"
- "FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const overridefinal\n"
+ "FormFactorLongBoxGauss* FormFactorLongBoxGauss::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118514,7 +118462,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxGauss_accept", _wrap_FormFactorLongBoxGauss_accept, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxGauss_accept(FormFactorLongBoxGauss self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorLongBoxGauss::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118522,25 +118470,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxGauss_getLength", _wrap_FormFactorLongBoxGauss_getLength, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxGauss_getLength(FormFactorLongBoxGauss self) -> double\n"
"\n"
- "double FormFactorLongBoxGauss::getLength() const \n"
+ "double FormFactorLongBoxGauss::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorLongBoxGauss_getHeight", _wrap_FormFactorLongBoxGauss_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxGauss_getHeight(FormFactorLongBoxGauss self) -> double\n"
"\n"
- "double FormFactorLongBoxGauss::getHeight() const \n"
+ "double FormFactorLongBoxGauss::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorLongBoxGauss_getWidth", _wrap_FormFactorLongBoxGauss_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxGauss_getWidth(FormFactorLongBoxGauss self) -> double\n"
"\n"
- "double FormFactorLongBoxGauss::getWidth() const \n"
+ "double FormFactorLongBoxGauss::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorLongBoxGauss_radialExtension", _wrap_FormFactorLongBoxGauss_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxGauss_radialExtension(FormFactorLongBoxGauss self) -> double\n"
"\n"
- "double FormFactorLongBoxGauss::radialExtension() const overridefinal\n"
+ "double FormFactorLongBoxGauss::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118548,7 +118496,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxGauss_evaluate_for_q", _wrap_FormFactorLongBoxGauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxGauss_evaluate_for_q(FormFactorLongBoxGauss self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118578,7 +118526,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxLorentz_clone", _wrap_FormFactorLongBoxLorentz_clone, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxLorentz_clone(FormFactorLongBoxLorentz self) -> FormFactorLongBoxLorentz\n"
"\n"
- "FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const overridefinal\n"
+ "FormFactorLongBoxLorentz* FormFactorLongBoxLorentz::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118586,7 +118534,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxLorentz_accept", _wrap_FormFactorLongBoxLorentz_accept, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxLorentz_accept(FormFactorLongBoxLorentz self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorLongBoxLorentz::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118594,25 +118542,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxLorentz_getLength", _wrap_FormFactorLongBoxLorentz_getLength, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxLorentz_getLength(FormFactorLongBoxLorentz self) -> double\n"
"\n"
- "double FormFactorLongBoxLorentz::getLength() const \n"
+ "double FormFactorLongBoxLorentz::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorLongBoxLorentz_getHeight", _wrap_FormFactorLongBoxLorentz_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxLorentz_getHeight(FormFactorLongBoxLorentz self) -> double\n"
"\n"
- "double FormFactorLongBoxLorentz::getHeight() const \n"
+ "double FormFactorLongBoxLorentz::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorLongBoxLorentz_getWidth", _wrap_FormFactorLongBoxLorentz_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxLorentz_getWidth(FormFactorLongBoxLorentz self) -> double\n"
"\n"
- "double FormFactorLongBoxLorentz::getWidth() const \n"
+ "double FormFactorLongBoxLorentz::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorLongBoxLorentz_radialExtension", _wrap_FormFactorLongBoxLorentz_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxLorentz_radialExtension(FormFactorLongBoxLorentz self) -> double\n"
"\n"
- "double FormFactorLongBoxLorentz::radialExtension() const overridefinal\n"
+ "double FormFactorLongBoxLorentz::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118620,7 +118568,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongBoxLorentz_evaluate_for_q", _wrap_FormFactorLongBoxLorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorLongBoxLorentz_evaluate_for_q(FormFactorLongBoxLorentz self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -118650,7 +118598,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Gauss_clone", _wrap_FormFactorLongRipple1Gauss_clone, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Gauss_clone(FormFactorLongRipple1Gauss self) -> FormFactorLongRipple1Gauss\n"
"\n"
- "FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const overridefinal\n"
+ "FormFactorLongRipple1Gauss* FormFactorLongRipple1Gauss::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118658,7 +118606,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Gauss_accept", _wrap_FormFactorLongRipple1Gauss_accept, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Gauss_accept(FormFactorLongRipple1Gauss self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorLongRipple1Gauss::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118666,25 +118614,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Gauss_getHeight", _wrap_FormFactorLongRipple1Gauss_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Gauss_getHeight(FormFactorLongRipple1Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple1Gauss::getHeight() const \n"
+ "double FormFactorLongRipple1Gauss::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple1Gauss_getWidth", _wrap_FormFactorLongRipple1Gauss_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Gauss_getWidth(FormFactorLongRipple1Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple1Gauss::getWidth() const \n"
+ "double FormFactorLongRipple1Gauss::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple1Gauss_getLength", _wrap_FormFactorLongRipple1Gauss_getLength, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Gauss_getLength(FormFactorLongRipple1Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple1Gauss::getLength() const \n"
+ "double FormFactorLongRipple1Gauss::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple1Gauss_radialExtension", _wrap_FormFactorLongRipple1Gauss_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Gauss_radialExtension(FormFactorLongRipple1Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple1Gauss::radialExtension() const overridefinal\n"
+ "double FormFactorLongRipple1Gauss::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118692,7 +118640,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Gauss_evaluate_for_q", _wrap_FormFactorLongRipple1Gauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Gauss_evaluate_for_q(FormFactorLongRipple1Gauss self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorLongRipple1Gauss::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Complex formfactor. \n"
"\n"
@@ -118722,7 +118670,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Lorentz_clone", _wrap_FormFactorLongRipple1Lorentz_clone, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Lorentz_clone(FormFactorLongRipple1Lorentz self) -> FormFactorLongRipple1Lorentz\n"
"\n"
- "FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const overridefinal\n"
+ "FormFactorLongRipple1Lorentz* FormFactorLongRipple1Lorentz::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118730,7 +118678,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Lorentz_accept", _wrap_FormFactorLongRipple1Lorentz_accept, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Lorentz_accept(FormFactorLongRipple1Lorentz self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorLongRipple1Lorentz::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118738,7 +118686,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Lorentz_radialExtension", _wrap_FormFactorLongRipple1Lorentz_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Lorentz_radialExtension(FormFactorLongRipple1Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple1Lorentz::radialExtension() const overridefinal\n"
+ "double FormFactorLongRipple1Lorentz::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118746,25 +118694,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple1Lorentz_getHeight", _wrap_FormFactorLongRipple1Lorentz_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Lorentz_getHeight(FormFactorLongRipple1Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple1Lorentz::getHeight() const \n"
+ "double FormFactorLongRipple1Lorentz::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple1Lorentz_getWidth", _wrap_FormFactorLongRipple1Lorentz_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Lorentz_getWidth(FormFactorLongRipple1Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple1Lorentz::getWidth() const \n"
+ "double FormFactorLongRipple1Lorentz::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple1Lorentz_getLength", _wrap_FormFactorLongRipple1Lorentz_getLength, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Lorentz_getLength(FormFactorLongRipple1Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple1Lorentz::getLength() const \n"
+ "double FormFactorLongRipple1Lorentz::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple1Lorentz_evaluate_for_q", _wrap_FormFactorLongRipple1Lorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple1Lorentz_evaluate_for_q(FormFactorLongRipple1Lorentz self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorLongRipple1Lorentz::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Complex formfactor. \n"
"\n"
@@ -118797,7 +118745,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Gauss_clone", _wrap_FormFactorLongRipple2Gauss_clone, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_clone(FormFactorLongRipple2Gauss self) -> FormFactorLongRipple2Gauss\n"
"\n"
- "FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const overridefinal\n"
+ "FormFactorLongRipple2Gauss* FormFactorLongRipple2Gauss::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118805,7 +118753,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Gauss_accept", _wrap_FormFactorLongRipple2Gauss_accept, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_accept(FormFactorLongRipple2Gauss self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorLongRipple2Gauss::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118813,31 +118761,31 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Gauss_getHeight", _wrap_FormFactorLongRipple2Gauss_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_getHeight(FormFactorLongRipple2Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple2Gauss::getHeight() const \n"
+ "double FormFactorLongRipple2Gauss::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Gauss_getWidth", _wrap_FormFactorLongRipple2Gauss_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_getWidth(FormFactorLongRipple2Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple2Gauss::getWidth() const \n"
+ "double FormFactorLongRipple2Gauss::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Gauss_getLength", _wrap_FormFactorLongRipple2Gauss_getLength, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_getLength(FormFactorLongRipple2Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple2Gauss::getLength() const \n"
+ "double FormFactorLongRipple2Gauss::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Gauss_getAsymmetry", _wrap_FormFactorLongRipple2Gauss_getAsymmetry, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_getAsymmetry(FormFactorLongRipple2Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple2Gauss::getAsymmetry() const \n"
+ "double FormFactorLongRipple2Gauss::getAsymmetry() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Gauss_radialExtension", _wrap_FormFactorLongRipple2Gauss_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_radialExtension(FormFactorLongRipple2Gauss self) -> double\n"
"\n"
- "double FormFactorLongRipple2Gauss::radialExtension() const overridefinal\n"
+ "double FormFactorLongRipple2Gauss::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118845,7 +118793,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Gauss_evaluate_for_q", _wrap_FormFactorLongRipple2Gauss_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Gauss_evaluate_for_q(FormFactorLongRipple2Gauss self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorLongRipple2Gauss::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Complex formfactor. \n"
"\n"
@@ -118876,7 +118824,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Lorentz_clone", _wrap_FormFactorLongRipple2Lorentz_clone, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_clone(FormFactorLongRipple2Lorentz self) -> FormFactorLongRipple2Lorentz\n"
"\n"
- "FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const overridefinal\n"
+ "FormFactorLongRipple2Lorentz* FormFactorLongRipple2Lorentz::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118884,7 +118832,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Lorentz_accept", _wrap_FormFactorLongRipple2Lorentz_accept, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_accept(FormFactorLongRipple2Lorentz self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorLongRipple2Lorentz::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118892,31 +118840,31 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Lorentz_getHeight", _wrap_FormFactorLongRipple2Lorentz_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_getHeight(FormFactorLongRipple2Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple2Lorentz::getHeight() const \n"
+ "double FormFactorLongRipple2Lorentz::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Lorentz_getWidth", _wrap_FormFactorLongRipple2Lorentz_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_getWidth(FormFactorLongRipple2Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple2Lorentz::getWidth() const \n"
+ "double FormFactorLongRipple2Lorentz::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Lorentz_getLength", _wrap_FormFactorLongRipple2Lorentz_getLength, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_getLength(FormFactorLongRipple2Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple2Lorentz::getLength() const \n"
+ "double FormFactorLongRipple2Lorentz::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Lorentz_getAsymmetry", _wrap_FormFactorLongRipple2Lorentz_getAsymmetry, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_getAsymmetry(FormFactorLongRipple2Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple2Lorentz::getAsymmetry() const \n"
+ "double FormFactorLongRipple2Lorentz::getAsymmetry() const\n"
"\n"
""},
{ (char *)"FormFactorLongRipple2Lorentz_radialExtension", _wrap_FormFactorLongRipple2Lorentz_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_radialExtension(FormFactorLongRipple2Lorentz self) -> double\n"
"\n"
- "double FormFactorLongRipple2Lorentz::radialExtension() const overridefinal\n"
+ "double FormFactorLongRipple2Lorentz::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118924,7 +118872,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLongRipple2Lorentz_evaluate_for_q", _wrap_FormFactorLongRipple2Lorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorLongRipple2Lorentz_evaluate_for_q(FormFactorLongRipple2Lorentz self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorLongRipple2Lorentz::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Complex formfactor. \n"
"\n"
@@ -118941,7 +118889,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLorentz_clone", _wrap_FormFactorLorentz_clone, METH_VARARGS, (char *)"\n"
"FormFactorLorentz_clone(FormFactorLorentz self) -> FormFactorLorentz\n"
"\n"
- "FormFactorLorentz* FormFactorLorentz::clone() const overridefinal\n"
+ "FormFactorLorentz* FormFactorLorentz::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -118949,7 +118897,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLorentz_accept", _wrap_FormFactorLorentz_accept, METH_VARARGS, (char *)"\n"
"FormFactorLorentz_accept(FormFactorLorentz self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorLorentz::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorLorentz::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -118957,19 +118905,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLorentz_getWidth", _wrap_FormFactorLorentz_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorLorentz_getWidth(FormFactorLorentz self) -> double\n"
"\n"
- "double FormFactorLorentz::getWidth() const \n"
+ "double FormFactorLorentz::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorLorentz_getHeight", _wrap_FormFactorLorentz_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorLorentz_getHeight(FormFactorLorentz self) -> double\n"
"\n"
- "double FormFactorLorentz::getHeight() const \n"
+ "double FormFactorLorentz::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorLorentz_radialExtension", _wrap_FormFactorLorentz_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorLorentz_radialExtension(FormFactorLorentz self) -> double\n"
"\n"
- "double FormFactorLorentz::radialExtension() const overridefinal\n"
+ "double FormFactorLorentz::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -118977,7 +118925,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorLorentz_evaluate_for_q", _wrap_FormFactorLorentz_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorLorentz_evaluate_for_q(FormFactorLorentz self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorLorentz::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -119004,7 +118952,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPrism3_clone", _wrap_FormFactorPrism3_clone, METH_VARARGS, (char *)"\n"
"FormFactorPrism3_clone(FormFactorPrism3 self) -> FormFactorPrism3\n"
"\n"
- "FormFactorPrism3* FormFactorPrism3::clone() const overridefinal\n"
+ "FormFactorPrism3* FormFactorPrism3::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119012,7 +118960,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPrism3_accept", _wrap_FormFactorPrism3_accept, METH_VARARGS, (char *)"\n"
"FormFactorPrism3_accept(FormFactorPrism3 self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorPrism3::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorPrism3::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119020,7 +118968,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPrism3_getBaseEdge", _wrap_FormFactorPrism3_getBaseEdge, METH_VARARGS, (char *)"\n"
"FormFactorPrism3_getBaseEdge(FormFactorPrism3 self) -> double\n"
"\n"
- "double FormFactorPrism3::getBaseEdge() const \n"
+ "double FormFactorPrism3::getBaseEdge() const\n"
"\n"
""},
{ (char *)"delete_FormFactorPrism3", _wrap_delete_FormFactorPrism3, METH_VARARGS, (char *)"delete_FormFactorPrism3(FormFactorPrism3 self)"},
@@ -119045,7 +118993,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPrism6_clone", _wrap_FormFactorPrism6_clone, METH_VARARGS, (char *)"\n"
"FormFactorPrism6_clone(FormFactorPrism6 self) -> FormFactorPrism6\n"
"\n"
- "FormFactorPrism6* FormFactorPrism6::clone() const overridefinal\n"
+ "FormFactorPrism6* FormFactorPrism6::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119053,7 +119001,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPrism6_accept", _wrap_FormFactorPrism6_accept, METH_VARARGS, (char *)"\n"
"FormFactorPrism6_accept(FormFactorPrism6 self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorPrism6::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorPrism6::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119061,7 +119009,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPrism6_getBaseEdge", _wrap_FormFactorPrism6_getBaseEdge, METH_VARARGS, (char *)"\n"
"FormFactorPrism6_getBaseEdge(FormFactorPrism6 self) -> double\n"
"\n"
- "double FormFactorPrism6::getBaseEdge() const \n"
+ "double FormFactorPrism6::getBaseEdge() const\n"
"\n"
""},
{ (char *)"delete_FormFactorPrism6", _wrap_delete_FormFactorPrism6, METH_VARARGS, (char *)"delete_FormFactorPrism6(FormFactorPrism6 self)"},
@@ -119089,7 +119037,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPyramid_clone", _wrap_FormFactorPyramid_clone, METH_VARARGS, (char *)"\n"
"FormFactorPyramid_clone(FormFactorPyramid self) -> FormFactorPyramid\n"
"\n"
- "FormFactorPyramid* FormFactorPyramid::clone() const overridefinal\n"
+ "FormFactorPyramid* FormFactorPyramid::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119097,7 +119045,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPyramid_accept", _wrap_FormFactorPyramid_accept, METH_VARARGS, (char *)"\n"
"FormFactorPyramid_accept(FormFactorPyramid self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorPyramid::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorPyramid::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119105,19 +119053,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorPyramid_getHeight", _wrap_FormFactorPyramid_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorPyramid_getHeight(FormFactorPyramid self) -> double\n"
"\n"
- "double FormFactorPyramid::getHeight() const \n"
+ "double FormFactorPyramid::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorPyramid_getBaseEdge", _wrap_FormFactorPyramid_getBaseEdge, METH_VARARGS, (char *)"\n"
"FormFactorPyramid_getBaseEdge(FormFactorPyramid self) -> double\n"
"\n"
- "double FormFactorPyramid::getBaseEdge() const \n"
+ "double FormFactorPyramid::getBaseEdge() const\n"
"\n"
""},
{ (char *)"FormFactorPyramid_getAlpha", _wrap_FormFactorPyramid_getAlpha, METH_VARARGS, (char *)"\n"
"FormFactorPyramid_getAlpha(FormFactorPyramid self) -> double\n"
"\n"
- "double FormFactorPyramid::getAlpha() const \n"
+ "double FormFactorPyramid::getAlpha() const\n"
"\n"
""},
{ (char *)"delete_FormFactorPyramid", _wrap_delete_FormFactorPyramid, METH_VARARGS, (char *)"delete_FormFactorPyramid(FormFactorPyramid self)"},
@@ -119145,7 +119093,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple1_clone", _wrap_FormFactorRipple1_clone, METH_VARARGS, (char *)"\n"
"FormFactorRipple1_clone(FormFactorRipple1 self) -> FormFactorRipple1\n"
"\n"
- "FormFactorRipple1* FormFactorRipple1::clone() const overridefinal\n"
+ "FormFactorRipple1* FormFactorRipple1::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119153,7 +119101,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple1_accept", _wrap_FormFactorRipple1_accept, METH_VARARGS, (char *)"\n"
"FormFactorRipple1_accept(FormFactorRipple1 self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorRipple1::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorRipple1::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119161,25 +119109,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple1_getLength", _wrap_FormFactorRipple1_getLength, METH_VARARGS, (char *)"\n"
"FormFactorRipple1_getLength(FormFactorRipple1 self) -> double\n"
"\n"
- "double FormFactorRipple1::getLength() const \n"
+ "double FormFactorRipple1::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorRipple1_getHeight", _wrap_FormFactorRipple1_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorRipple1_getHeight(FormFactorRipple1 self) -> double\n"
"\n"
- "double FormFactorRipple1::getHeight() const \n"
+ "double FormFactorRipple1::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorRipple1_getWidth", _wrap_FormFactorRipple1_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorRipple1_getWidth(FormFactorRipple1 self) -> double\n"
"\n"
- "double FormFactorRipple1::getWidth() const \n"
+ "double FormFactorRipple1::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorRipple1_radialExtension", _wrap_FormFactorRipple1_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorRipple1_radialExtension(FormFactorRipple1 self) -> double\n"
"\n"
- "double FormFactorRipple1::radialExtension() const overridefinal\n"
+ "double FormFactorRipple1::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119187,7 +119135,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple1_evaluate_for_q", _wrap_FormFactorRipple1_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorRipple1_evaluate_for_q(FormFactorRipple1 self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorRipple1::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Complex formfactor. \n"
"\n"
@@ -119220,7 +119168,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple2_clone", _wrap_FormFactorRipple2_clone, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_clone(FormFactorRipple2 self) -> FormFactorRipple2\n"
"\n"
- "FormFactorRipple2* FormFactorRipple2::clone() const overridefinal\n"
+ "FormFactorRipple2* FormFactorRipple2::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119228,7 +119176,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple2_accept", _wrap_FormFactorRipple2_accept, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_accept(FormFactorRipple2 self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorRipple2::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorRipple2::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119236,31 +119184,31 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple2_getHeight", _wrap_FormFactorRipple2_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_getHeight(FormFactorRipple2 self) -> double\n"
"\n"
- "double FormFactorRipple2::getHeight() const \n"
+ "double FormFactorRipple2::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorRipple2_getWidth", _wrap_FormFactorRipple2_getWidth, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_getWidth(FormFactorRipple2 self) -> double\n"
"\n"
- "double FormFactorRipple2::getWidth() const \n"
+ "double FormFactorRipple2::getWidth() const\n"
"\n"
""},
{ (char *)"FormFactorRipple2_getLength", _wrap_FormFactorRipple2_getLength, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_getLength(FormFactorRipple2 self) -> double\n"
"\n"
- "double FormFactorRipple2::getLength() const \n"
+ "double FormFactorRipple2::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorRipple2_getAsymmetry", _wrap_FormFactorRipple2_getAsymmetry, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_getAsymmetry(FormFactorRipple2 self) -> double\n"
"\n"
- "double FormFactorRipple2::getAsymmetry() const \n"
+ "double FormFactorRipple2::getAsymmetry() const\n"
"\n"
""},
{ (char *)"FormFactorRipple2_radialExtension", _wrap_FormFactorRipple2_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_radialExtension(FormFactorRipple2 self) -> double\n"
"\n"
- "double FormFactorRipple2::radialExtension() const overridefinal\n"
+ "double FormFactorRipple2::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119268,7 +119216,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorRipple2_evaluate_for_q", _wrap_FormFactorRipple2_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorRipple2_evaluate_for_q(FormFactorRipple2 self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorRipple2::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Complex formfactor. \n"
"\n"
@@ -119284,7 +119232,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereGaussianRadius_clone", _wrap_FormFactorSphereGaussianRadius_clone, METH_VARARGS, (char *)"\n"
"FormFactorSphereGaussianRadius_clone(FormFactorSphereGaussianRadius self) -> FormFactorSphereGaussianRadius\n"
"\n"
- "FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const overridefinal\n"
+ "FormFactorSphereGaussianRadius* FormFactorSphereGaussianRadius::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119292,7 +119240,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereGaussianRadius_accept", _wrap_FormFactorSphereGaussianRadius_accept, METH_VARARGS, (char *)"\n"
"FormFactorSphereGaussianRadius_accept(FormFactorSphereGaussianRadius self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorSphereGaussianRadius::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119300,7 +119248,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereGaussianRadius_radialExtension", _wrap_FormFactorSphereGaussianRadius_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorSphereGaussianRadius_radialExtension(FormFactorSphereGaussianRadius self) -> double\n"
"\n"
- "double FormFactorSphereGaussianRadius::radialExtension() const overridefinal\n"
+ "double FormFactorSphereGaussianRadius::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119308,7 +119256,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereGaussianRadius_evaluate_for_q", _wrap_FormFactorSphereGaussianRadius_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorSphereGaussianRadius_evaluate_for_q(FormFactorSphereGaussianRadius self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -119324,7 +119272,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereLogNormalRadius_clone", _wrap_FormFactorSphereLogNormalRadius_clone, METH_VARARGS, (char *)"\n"
"FormFactorSphereLogNormalRadius_clone(FormFactorSphereLogNormalRadius self) -> FormFactorSphereLogNormalRadius\n"
"\n"
- "FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const overridefinal\n"
+ "FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119332,7 +119280,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereLogNormalRadius_accept", _wrap_FormFactorSphereLogNormalRadius_accept, METH_VARARGS, (char *)"\n"
"FormFactorSphereLogNormalRadius_accept(FormFactorSphereLogNormalRadius self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorSphereLogNormalRadius::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119340,7 +119288,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereLogNormalRadius_radialExtension", _wrap_FormFactorSphereLogNormalRadius_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorSphereLogNormalRadius_radialExtension(FormFactorSphereLogNormalRadius self) -> double\n"
"\n"
- "double FormFactorSphereLogNormalRadius::radialExtension() const overridefinal\n"
+ "double FormFactorSphereLogNormalRadius::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119348,7 +119296,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereLogNormalRadius_evaluate_for_q", _wrap_FormFactorSphereLogNormalRadius_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorSphereLogNormalRadius_evaluate_for_q(FormFactorSphereLogNormalRadius self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorSphereLogNormalRadius::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -119364,7 +119312,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereUniformRadius_clone", _wrap_FormFactorSphereUniformRadius_clone, METH_VARARGS, (char *)"\n"
"FormFactorSphereUniformRadius_clone(FormFactorSphereUniformRadius self) -> FormFactorSphereUniformRadius\n"
"\n"
- "FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const overridefinal\n"
+ "FormFactorSphereUniformRadius* FormFactorSphereUniformRadius::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119372,7 +119320,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereUniformRadius_accept", _wrap_FormFactorSphereUniformRadius_accept, METH_VARARGS, (char *)"\n"
"FormFactorSphereUniformRadius_accept(FormFactorSphereUniformRadius self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorSphereUniformRadius::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119380,7 +119328,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereUniformRadius_radialExtension", _wrap_FormFactorSphereUniformRadius_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorSphereUniformRadius_radialExtension(FormFactorSphereUniformRadius self) -> double\n"
"\n"
- "double FormFactorSphereUniformRadius::radialExtension() const overridefinal\n"
+ "double FormFactorSphereUniformRadius::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119388,7 +119336,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorSphereUniformRadius_evaluate_for_q", _wrap_FormFactorSphereUniformRadius_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorSphereUniformRadius_evaluate_for_q(FormFactorSphereUniformRadius self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorSphereUniformRadius::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -119418,7 +119366,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTetrahedron_clone", _wrap_FormFactorTetrahedron_clone, METH_VARARGS, (char *)"\n"
"FormFactorTetrahedron_clone(FormFactorTetrahedron self) -> FormFactorTetrahedron\n"
"\n"
- "FormFactorTetrahedron* FormFactorTetrahedron::clone() const overridefinal\n"
+ "FormFactorTetrahedron* FormFactorTetrahedron::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119426,7 +119374,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTetrahedron_accept", _wrap_FormFactorTetrahedron_accept, METH_VARARGS, (char *)"\n"
"FormFactorTetrahedron_accept(FormFactorTetrahedron self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorTetrahedron::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorTetrahedron::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119434,19 +119382,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTetrahedron_getBaseEdge", _wrap_FormFactorTetrahedron_getBaseEdge, METH_VARARGS, (char *)"\n"
"FormFactorTetrahedron_getBaseEdge(FormFactorTetrahedron self) -> double\n"
"\n"
- "double FormFactorTetrahedron::getBaseEdge() const \n"
+ "double FormFactorTetrahedron::getBaseEdge() const\n"
"\n"
""},
{ (char *)"FormFactorTetrahedron_getHeight", _wrap_FormFactorTetrahedron_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorTetrahedron_getHeight(FormFactorTetrahedron self) -> double\n"
"\n"
- "double FormFactorTetrahedron::getHeight() const \n"
+ "double FormFactorTetrahedron::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorTetrahedron_getAlpha", _wrap_FormFactorTetrahedron_getAlpha, METH_VARARGS, (char *)"\n"
"FormFactorTetrahedron_getAlpha(FormFactorTetrahedron self) -> double\n"
"\n"
- "double FormFactorTetrahedron::getAlpha() const \n"
+ "double FormFactorTetrahedron::getAlpha() const\n"
"\n"
""},
{ (char *)"delete_FormFactorTetrahedron", _wrap_delete_FormFactorTetrahedron, METH_VARARGS, (char *)"delete_FormFactorTetrahedron(FormFactorTetrahedron self)"},
@@ -119471,7 +119419,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedCube_clone", _wrap_FormFactorTruncatedCube_clone, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedCube_clone(FormFactorTruncatedCube self) -> FormFactorTruncatedCube\n"
"\n"
- "FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const overridefinal\n"
+ "FormFactorTruncatedCube* FormFactorTruncatedCube::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119479,7 +119427,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedCube_accept", _wrap_FormFactorTruncatedCube_accept, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedCube_accept(FormFactorTruncatedCube self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorTruncatedCube::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119487,13 +119435,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedCube_getLength", _wrap_FormFactorTruncatedCube_getLength, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedCube_getLength(FormFactorTruncatedCube self) -> double\n"
"\n"
- "double FormFactorTruncatedCube::getLength() const \n"
+ "double FormFactorTruncatedCube::getLength() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedCube_getRemovedLength", _wrap_FormFactorTruncatedCube_getRemovedLength, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedCube_getRemovedLength(FormFactorTruncatedCube self) -> double\n"
"\n"
- "double FormFactorTruncatedCube::getRemovedLength() const \n"
+ "double FormFactorTruncatedCube::getRemovedLength() const\n"
"\n"
""},
{ (char *)"delete_FormFactorTruncatedCube", _wrap_delete_FormFactorTruncatedCube, METH_VARARGS, (char *)"delete_FormFactorTruncatedCube(FormFactorTruncatedCube self)"},
@@ -119522,7 +119470,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSphere_clone", _wrap_FormFactorTruncatedSphere_clone, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSphere_clone(FormFactorTruncatedSphere self) -> FormFactorTruncatedSphere\n"
"\n"
- "FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const overridefinal\n"
+ "FormFactorTruncatedSphere* FormFactorTruncatedSphere::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119530,7 +119478,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSphere_accept", _wrap_FormFactorTruncatedSphere_accept, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSphere_accept(FormFactorTruncatedSphere self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorTruncatedSphere::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119538,25 +119486,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSphere_getHeight", _wrap_FormFactorTruncatedSphere_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSphere_getHeight(FormFactorTruncatedSphere self) -> double\n"
"\n"
- "double FormFactorTruncatedSphere::getHeight() const \n"
+ "double FormFactorTruncatedSphere::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedSphere_getRadius", _wrap_FormFactorTruncatedSphere_getRadius, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSphere_getRadius(FormFactorTruncatedSphere self) -> double\n"
"\n"
- "double FormFactorTruncatedSphere::getRadius() const \n"
+ "double FormFactorTruncatedSphere::getRadius() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedSphere_getRemovedTop", _wrap_FormFactorTruncatedSphere_getRemovedTop, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSphere_getRemovedTop(FormFactorTruncatedSphere self) -> double\n"
"\n"
- "double FormFactorTruncatedSphere::getRemovedTop() const \n"
+ "double FormFactorTruncatedSphere::getRemovedTop() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedSphere_radialExtension", _wrap_FormFactorTruncatedSphere_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSphere_radialExtension(FormFactorTruncatedSphere self) -> double\n"
"\n"
- "double FormFactorTruncatedSphere::radialExtension() const overridefinal\n"
+ "double FormFactorTruncatedSphere::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119564,7 +119512,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSphere_evaluate_for_q", _wrap_FormFactorTruncatedSphere_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSphere_evaluate_for_q(FormFactorTruncatedSphere self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Complex formfactor. \n"
"\n"
@@ -119598,7 +119546,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSpheroid_clone", _wrap_FormFactorTruncatedSpheroid_clone, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_clone(FormFactorTruncatedSpheroid self) -> FormFactorTruncatedSpheroid\n"
"\n"
- "FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const overridefinal\n"
+ "FormFactorTruncatedSpheroid* FormFactorTruncatedSpheroid::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119606,7 +119554,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSpheroid_accept", _wrap_FormFactorTruncatedSpheroid_accept, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_accept(FormFactorTruncatedSpheroid self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorTruncatedSpheroid::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119614,31 +119562,31 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSpheroid_getRadius", _wrap_FormFactorTruncatedSpheroid_getRadius, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_getRadius(FormFactorTruncatedSpheroid self) -> double\n"
"\n"
- "double FormFactorTruncatedSpheroid::getRadius() const \n"
+ "double FormFactorTruncatedSpheroid::getRadius() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedSpheroid_getHeight", _wrap_FormFactorTruncatedSpheroid_getHeight, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_getHeight(FormFactorTruncatedSpheroid self) -> double\n"
"\n"
- "double FormFactorTruncatedSpheroid::getHeight() const \n"
+ "double FormFactorTruncatedSpheroid::getHeight() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedSpheroid_getHeightFlattening", _wrap_FormFactorTruncatedSpheroid_getHeightFlattening, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_getHeightFlattening(FormFactorTruncatedSpheroid self) -> double\n"
"\n"
- "double FormFactorTruncatedSpheroid::getHeightFlattening() const \n"
+ "double FormFactorTruncatedSpheroid::getHeightFlattening() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedSpheroid_getRemovedTop", _wrap_FormFactorTruncatedSpheroid_getRemovedTop, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_getRemovedTop(FormFactorTruncatedSpheroid self) -> double\n"
"\n"
- "double FormFactorTruncatedSpheroid::getRemovedTop() const \n"
+ "double FormFactorTruncatedSpheroid::getRemovedTop() const\n"
"\n"
""},
{ (char *)"FormFactorTruncatedSpheroid_radialExtension", _wrap_FormFactorTruncatedSpheroid_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_radialExtension(FormFactorTruncatedSpheroid self) -> double\n"
"\n"
- "double FormFactorTruncatedSpheroid::radialExtension() const overridefinal\n"
+ "double FormFactorTruncatedSpheroid::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119646,7 +119594,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorTruncatedSpheroid_evaluate_for_q", _wrap_FormFactorTruncatedSpheroid_evaluate_for_q, METH_VARARGS, (char *)"\n"
"FormFactorTruncatedSpheroid_evaluate_for_q(FormFactorTruncatedSpheroid self, cvector_t q) -> complex_t\n"
"\n"
- "complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const overridefinal\n"
+ "complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const override final\n"
"\n"
"Returns scattering amplitude for complex scattering wavevector q=k_i-k_f. This method is public only for convenience of plotting form factors in Python. \n"
"\n"
@@ -119662,13 +119610,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"delete_FormFactorWeighted", _wrap_delete_FormFactorWeighted, METH_VARARGS, (char *)"\n"
"delete_FormFactorWeighted(FormFactorWeighted self)\n"
"\n"
- "FormFactorWeighted::~FormFactorWeighted() overridefinal\n"
+ "FormFactorWeighted::~FormFactorWeighted() override final\n"
"\n"
""},
{ (char *)"FormFactorWeighted_clone", _wrap_FormFactorWeighted_clone, METH_VARARGS, (char *)"\n"
"FormFactorWeighted_clone(FormFactorWeighted self) -> FormFactorWeighted\n"
"\n"
- "FormFactorWeighted * FormFactorWeighted::clone() const overridefinal\n"
+ "FormFactorWeighted * FormFactorWeighted::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -119676,7 +119624,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorWeighted_accept", _wrap_FormFactorWeighted_accept, METH_VARARGS, (char *)"\n"
"FormFactorWeighted_accept(FormFactorWeighted self, INodeVisitor visitor)\n"
"\n"
- "void FormFactorWeighted::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void FormFactorWeighted::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -119684,7 +119632,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorWeighted_radialExtension", _wrap_FormFactorWeighted_radialExtension, METH_VARARGS, (char *)"\n"
"FormFactorWeighted_radialExtension(FormFactorWeighted self) -> double\n"
"\n"
- "double FormFactorWeighted::radialExtension() const overridefinal\n"
+ "double FormFactorWeighted::radialExtension() const override final\n"
"\n"
"Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations \n"
"\n"
@@ -119692,7 +119640,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorWeighted_bottomZ", _wrap_FormFactorWeighted_bottomZ, METH_VARARGS, (char *)"\n"
"FormFactorWeighted_bottomZ(FormFactorWeighted self, IRotation rotation) -> double\n"
"\n"
- "double FormFactorWeighted::bottomZ(const IRotation &rotation) const overridefinal\n"
+ "double FormFactorWeighted::bottomZ(const IRotation &rotation) const override final\n"
"\n"
"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
"\n"
@@ -119700,7 +119648,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorWeighted_topZ", _wrap_FormFactorWeighted_topZ, METH_VARARGS, (char *)"\n"
"FormFactorWeighted_topZ(FormFactorWeighted self, IRotation rotation) -> double\n"
"\n"
- "double FormFactorWeighted::topZ(const IRotation &rotation) const overridefinal\n"
+ "double FormFactorWeighted::topZ(const IRotation &rotation) const override final\n"
"\n"
"Returns the z-coordinate of the lowest point in this shape after a given rotation. \n"
"\n"
@@ -119715,7 +119663,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorWeighted_setAmbientMaterial", _wrap_FormFactorWeighted_setAmbientMaterial, METH_VARARGS, (char *)"\n"
"FormFactorWeighted_setAmbientMaterial(FormFactorWeighted self, Material material)\n"
"\n"
- "void FormFactorWeighted::setAmbientMaterial(Material material) overridefinal\n"
+ "void FormFactorWeighted::setAmbientMaterial(Material material) override final\n"
"\n"
"Passes the material in which this particle is embedded. \n"
"\n"
@@ -119723,7 +119671,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FormFactorWeighted_evaluate", _wrap_FormFactorWeighted_evaluate, METH_VARARGS, (char *)"\n"
"FormFactorWeighted_evaluate(FormFactorWeighted self, WavevectorInfo wavevectors) -> complex_t\n"
"\n"
- "complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const overridefinal\n"
+ "complex_t FormFactorWeighted::evaluate(const WavevectorInfo &wavevectors) const override final\n"
"\n"
"Returns scattering amplitude for complex wavevectors ki, kf. \n"
"\n"
@@ -119781,7 +119729,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Simulation_getBeamIntensity", _wrap_Simulation_getBeamIntensity, METH_VARARGS, (char *)"\n"
"Simulation_getBeamIntensity(Simulation self) -> double\n"
"\n"
- "double Simulation::getBeamIntensity() const \n"
+ "double Simulation::getBeamIntensity() const\n"
"\n"
""},
{ (char *)"Simulation_setBeamPolarization", _wrap_Simulation_setBeamPolarization, METH_VARARGS, (char *)"\n"
@@ -119823,7 +119771,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Simulation_sample", _wrap_Simulation_sample, METH_VARARGS, (char *)"\n"
"Simulation_sample(Simulation self) -> MultiLayer\n"
"\n"
- "const MultiLayer * Simulation::sample() const \n"
+ "const MultiLayer * Simulation::sample() const\n"
"\n"
""},
{ (char *)"Simulation_setSampleBuilderCpp", _wrap_Simulation_setSampleBuilderCpp, METH_VARARGS, (char *)"\n"
@@ -119841,7 +119789,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Simulation_background", _wrap_Simulation_background, METH_VARARGS, (char *)"\n"
"Simulation_background(Simulation self) -> IBackground\n"
"\n"
- "const IBackground* Simulation::background() const \n"
+ "const IBackground* Simulation::background() const\n"
"\n"
""},
{ (char *)"Simulation_numberOfSimulationElements", _wrap_Simulation_numberOfSimulationElements, METH_VARARGS, (char *)"\n"
@@ -119871,7 +119819,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Simulation_getDistributionHandler", _wrap_Simulation_getDistributionHandler, METH_VARARGS, (char *)"\n"
"Simulation_getDistributionHandler(Simulation self) -> DistributionHandler const &\n"
"\n"
- "const DistributionHandler& Simulation::getDistributionHandler() const \n"
+ "const DistributionHandler& Simulation::getDistributionHandler() const\n"
"\n"
""},
{ (char *)"Simulation_setOptions", _wrap_Simulation_setOptions, METH_VARARGS, (char *)"\n"
@@ -119919,13 +119867,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimulationOptions_isIntegrate", _wrap_SimulationOptions_isIntegrate, METH_VARARGS, (char *)"\n"
"SimulationOptions_isIntegrate(SimulationOptions self) -> bool\n"
"\n"
- "bool SimulationOptions::isIntegrate() const \n"
+ "bool SimulationOptions::isIntegrate() const\n"
"\n"
""},
{ (char *)"SimulationOptions_getMcPoints", _wrap_SimulationOptions_getMcPoints, METH_VARARGS, (char *)"\n"
"SimulationOptions_getMcPoints(SimulationOptions self) -> size_t\n"
"\n"
- "size_t SimulationOptions::getMcPoints() const \n"
+ "size_t SimulationOptions::getMcPoints() const\n"
"\n"
""},
{ (char *)"SimulationOptions_setMonteCarloIntegration", _wrap_SimulationOptions_setMonteCarloIntegration, METH_VARARGS, (char *)"\n"
@@ -119958,7 +119906,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimulationOptions_getNumberOfThreads", _wrap_SimulationOptions_getNumberOfThreads, METH_VARARGS, (char *)"\n"
"SimulationOptions_getNumberOfThreads(SimulationOptions self) -> int\n"
"\n"
- "int SimulationOptions::getNumberOfThreads() const \n"
+ "int SimulationOptions::getNumberOfThreads() const\n"
"\n"
""},
{ (char *)"SimulationOptions_setNumberOfBatches", _wrap_SimulationOptions_setNumberOfBatches, METH_VARARGS, (char *)"\n"
@@ -119972,13 +119920,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimulationOptions_getNumberOfBatches", _wrap_SimulationOptions_getNumberOfBatches, METH_VARARGS, (char *)"\n"
"SimulationOptions_getNumberOfBatches(SimulationOptions self) -> int\n"
"\n"
- "int SimulationOptions::getNumberOfBatches() const \n"
+ "int SimulationOptions::getNumberOfBatches() const\n"
"\n"
""},
{ (char *)"SimulationOptions_getCurrentBatch", _wrap_SimulationOptions_getCurrentBatch, METH_VARARGS, (char *)"\n"
"SimulationOptions_getCurrentBatch(SimulationOptions self) -> int\n"
"\n"
- "int SimulationOptions::getCurrentBatch() const \n"
+ "int SimulationOptions::getCurrentBatch() const\n"
"\n"
""},
{ (char *)"SimulationOptions_setThreadInfo", _wrap_SimulationOptions_setThreadInfo, METH_VARARGS, (char *)"\n"
@@ -119992,7 +119940,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimulationOptions_getHardwareConcurrency", _wrap_SimulationOptions_getHardwareConcurrency, METH_VARARGS, (char *)"\n"
"SimulationOptions_getHardwareConcurrency(SimulationOptions self) -> int\n"
"\n"
- "int SimulationOptions::getHardwareConcurrency() const \n"
+ "int SimulationOptions::getHardwareConcurrency() const\n"
"\n"
""},
{ (char *)"SimulationOptions_setIncludeSpecular", _wrap_SimulationOptions_setIncludeSpecular, METH_VARARGS, (char *)"\n"
@@ -120004,7 +119952,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimulationOptions_includeSpecular", _wrap_SimulationOptions_includeSpecular, METH_VARARGS, (char *)"\n"
"SimulationOptions_includeSpecular(SimulationOptions self) -> bool\n"
"\n"
- "bool SimulationOptions::includeSpecular() const \n"
+ "bool SimulationOptions::includeSpecular() const\n"
"\n"
""},
{ (char *)"SimulationOptions_setUseAvgMaterials", _wrap_SimulationOptions_setUseAvgMaterials, METH_VARARGS, (char *)"\n"
@@ -120016,7 +119964,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimulationOptions_useAvgMaterials", _wrap_SimulationOptions_useAvgMaterials, METH_VARARGS, (char *)"\n"
"SimulationOptions_useAvgMaterials(SimulationOptions self) -> bool\n"
"\n"
- "bool SimulationOptions::useAvgMaterials() const \n"
+ "bool SimulationOptions::useAvgMaterials() const\n"
"\n"
""},
{ (char *)"delete_SimulationOptions", _wrap_delete_SimulationOptions, METH_VARARGS, (char *)"delete_SimulationOptions(SimulationOptions self)"},
@@ -120038,7 +119986,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"GISASSimulation_clone", _wrap_GISASSimulation_clone, METH_VARARGS, (char *)"\n"
"GISASSimulation_clone(GISASSimulation self) -> GISASSimulation\n"
"\n"
- "GISASSimulation* GISASSimulation::clone() const \n"
+ "GISASSimulation* GISASSimulation::clone() const\n"
"\n"
""},
{ (char *)"GISASSimulation_accept", _wrap_GISASSimulation_accept, METH_VARARGS, (char *)"\n"
@@ -120548,7 +120496,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IHistogram_axesUnits", _wrap_IHistogram_axesUnits, METH_VARARGS, (char *)"\n"
"IHistogram_axesUnits(IHistogram self) -> std::string\n"
"\n"
- "std::string IHistogram::axesUnits() const \n"
+ "std::string IHistogram::axesUnits() const\n"
"\n"
""},
{ (char *)"IHistogram_swigregister", IHistogram_swigregister, METH_VARARGS, NULL},
@@ -120762,13 +120710,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ConstantBackground_clone", _wrap_ConstantBackground_clone, METH_VARARGS, (char *)"\n"
"ConstantBackground_clone(ConstantBackground self) -> ConstantBackground\n"
"\n"
- "ConstantBackground * ConstantBackground::clone() const overridefinal\n"
+ "ConstantBackground * ConstantBackground::clone() const override final\n"
"\n"
""},
{ (char *)"ConstantBackground_backgroundValue", _wrap_ConstantBackground_backgroundValue, METH_VARARGS, (char *)"\n"
"ConstantBackground_backgroundValue(ConstantBackground self) -> double\n"
"\n"
- "double ConstantBackground::backgroundValue() const \n"
+ "double ConstantBackground::backgroundValue() const\n"
"\n"
""},
{ (char *)"ConstantBackground_accept", _wrap_ConstantBackground_accept, METH_VARARGS, (char *)"\n"
@@ -120782,7 +120730,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ConstantBackground_addBackGround", _wrap_ConstantBackground_addBackGround, METH_VARARGS, (char *)"\n"
"ConstantBackground_addBackGround(ConstantBackground self, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator start, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator end)\n"
"\n"
- "void ConstantBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const overridefinal\n"
+ "void ConstantBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const override final\n"
"\n"
""},
{ (char *)"ConstantBackground_swigregister", ConstantBackground_swigregister, METH_VARARGS, NULL},
@@ -120823,7 +120771,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IDetector_getAxis", _wrap_IDetector_getAxis, METH_VARARGS, (char *)"\n"
"IDetector_getAxis(IDetector self, size_t index) -> IAxis\n"
"\n"
- "const IAxis & IDetector::getAxis(size_t index) const \n"
+ "const IAxis & IDetector::getAxis(size_t index) const\n"
"\n"
""},
{ (char *)"IDetector_dimension", _wrap_IDetector_dimension, METH_VARARGS, (char *)"\n"
@@ -121254,7 +121202,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IAbstractParticle_abundance", _wrap_IAbstractParticle_abundance, METH_VARARGS, (char *)"\n"
"IAbstractParticle_abundance(IAbstractParticle self) -> double\n"
"\n"
- "double IAbstractParticle::abundance() const \n"
+ "double IAbstractParticle::abundance() const\n"
"\n"
""},
{ (char *)"IAbstractParticle_setAbundance", _wrap_IAbstractParticle_setAbundance, METH_VARARGS, (char *)"\n"
@@ -121298,7 +121246,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IParameterReal_getData", _wrap_IParameterReal_getData, METH_VARARGS, (char *)"\n"
"IParameterReal_getData(IParameterReal self) -> double &\n"
"\n"
- "T& IParameter< T >::getData() const \n"
+ "T& IParameter< T >::getData() const\n"
"\n"
""},
{ (char *)"IParameterReal_setData", _wrap_IParameterReal_setData, METH_VARARGS, (char *)"\n"
@@ -121394,7 +121342,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IParticle_translate", _wrap_IParticle_translate, METH_VARARGS, (char *)"\n"
"IParticle_translate(IParticle self, kvector_t translation)\n"
"\n"
- "void IParticle::translate(kvector_t translation) overridefinal\n"
+ "void IParticle::translate(kvector_t translation) override final\n"
"\n"
"Translates the particle. \n"
"\n"
@@ -121587,7 +121535,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RotationX_getAngle", _wrap_RotationX_getAngle, METH_VARARGS, (char *)"\n"
"RotationX_getAngle(RotationX self) -> double\n"
"\n"
- "double RotationX::getAngle() const \n"
+ "double RotationX::getAngle() const\n"
"\n"
""},
{ (char *)"RotationX_getTransform3D", _wrap_RotationX_getTransform3D, METH_VARARGS, (char *)"\n"
@@ -121641,7 +121589,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RotationY_getAngle", _wrap_RotationY_getAngle, METH_VARARGS, (char *)"\n"
"RotationY_getAngle(RotationY self) -> double\n"
"\n"
- "double RotationY::getAngle() const \n"
+ "double RotationY::getAngle() const\n"
"\n"
""},
{ (char *)"RotationY_getTransform3D", _wrap_RotationY_getTransform3D, METH_VARARGS, (char *)"\n"
@@ -121696,7 +121644,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RotationZ_getAngle", _wrap_RotationZ_getAngle, METH_VARARGS, (char *)"\n"
"RotationZ_getAngle(RotationZ self) -> double\n"
"\n"
- "double RotationZ::getAngle() const \n"
+ "double RotationZ::getAngle() const\n"
"\n"
""},
{ (char *)"RotationZ_getTransform3D", _wrap_RotationZ_getTransform3D, METH_VARARGS, (char *)"\n"
@@ -121756,19 +121704,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RotationEuler_getAlpha", _wrap_RotationEuler_getAlpha, METH_VARARGS, (char *)"\n"
"RotationEuler_getAlpha(RotationEuler self) -> double\n"
"\n"
- "double RotationEuler::getAlpha() const \n"
+ "double RotationEuler::getAlpha() const\n"
"\n"
""},
{ (char *)"RotationEuler_getBeta", _wrap_RotationEuler_getBeta, METH_VARARGS, (char *)"\n"
"RotationEuler_getBeta(RotationEuler self) -> double\n"
"\n"
- "double RotationEuler::getBeta() const \n"
+ "double RotationEuler::getBeta() const\n"
"\n"
""},
{ (char *)"RotationEuler_getGamma", _wrap_RotationEuler_getGamma, METH_VARARGS, (char *)"\n"
"RotationEuler_getGamma(RotationEuler self) -> double\n"
"\n"
- "double RotationEuler::getGamma() const \n"
+ "double RotationEuler::getGamma() const\n"
"\n"
""},
{ (char *)"RotationEuler_getTransform3D", _wrap_RotationEuler_getTransform3D, METH_VARARGS, (char *)"\n"
@@ -121815,13 +121763,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimpleSelectionRule_clone", _wrap_SimpleSelectionRule_clone, METH_VARARGS, (char *)"\n"
"SimpleSelectionRule_clone(SimpleSelectionRule self) -> SimpleSelectionRule\n"
"\n"
- "SimpleSelectionRule * SimpleSelectionRule::clone() const \n"
+ "SimpleSelectionRule * SimpleSelectionRule::clone() const\n"
"\n"
""},
{ (char *)"SimpleSelectionRule_coordinateSelected", _wrap_SimpleSelectionRule_coordinateSelected, METH_VARARGS, (char *)"\n"
"SimpleSelectionRule_coordinateSelected(SimpleSelectionRule self, ivector_t const & coordinate) -> bool\n"
"\n"
- "bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const \n"
+ "bool SimpleSelectionRule::coordinateSelected(const ivector_t &coordinate) const\n"
"\n"
""},
{ (char *)"SimpleSelectionRule_swigregister", SimpleSelectionRule_swigregister, METH_VARARGS, NULL},
@@ -121850,7 +121798,7 @@ static PyMethodDef SwigMethods[] = {
"getBeam() -> Beam\n"
"Instrument_getBeam(Instrument self) -> Beam\n"
"\n"
- "const Beam& Instrument::getBeam() const \n"
+ "const Beam& Instrument::getBeam() const\n"
"\n"
""},
{ (char *)"Instrument_setBeam", _wrap_Instrument_setBeam, METH_VARARGS, (char *)"\n"
@@ -121909,7 +121857,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Instrument_getDetectorMask", _wrap_Instrument_getDetectorMask, METH_VARARGS, (char *)"\n"
"Instrument_getDetectorMask(Instrument self) -> DetectorMask\n"
"\n"
- "const DetectorMask * Instrument::getDetectorMask() const \n"
+ "const DetectorMask * Instrument::getDetectorMask() const\n"
"\n"
""},
{ (char *)"Instrument_getDetectorAxis", _wrap_Instrument_getDetectorAxis, METH_VARARGS, (char *)"\n"
@@ -122131,7 +122079,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunction1DLattice_getLatticeParameters", _wrap_InterferenceFunction1DLattice_getLatticeParameters, METH_VARARGS, (char *)"\n"
"InterferenceFunction1DLattice_getLatticeParameters(InterferenceFunction1DLattice self) -> Lattice1DParameters\n"
"\n"
- "Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const \n"
+ "Lattice1DParameters InterferenceFunction1DLattice::getLatticeParameters() const\n"
"\n"
""},
{ (char *)"InterferenceFunction1DLattice_evaluate", _wrap_InterferenceFunction1DLattice_evaluate, METH_VARARGS, (char *)"\n"
@@ -122224,7 +122172,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunctionRadialParaCrystal_domainSize", _wrap_InterferenceFunctionRadialParaCrystal_domainSize, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_domainSize(InterferenceFunctionRadialParaCrystal self) -> double\n"
"\n"
- "double InterferenceFunctionRadialParaCrystal::domainSize() const \n"
+ "double InterferenceFunctionRadialParaCrystal::domainSize() const\n"
"\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_evaluate", _wrap_InterferenceFunctionRadialParaCrystal_evaluate, METH_VARARGS, (char *)"\n"
@@ -122238,7 +122186,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunctionRadialParaCrystal_FTPDF", _wrap_InterferenceFunctionRadialParaCrystal_FTPDF, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_FTPDF(InterferenceFunctionRadialParaCrystal self, double qpar) -> complex_t\n"
"\n"
- "complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const \n"
+ "complex_t InterferenceFunctionRadialParaCrystal::FTPDF(double qpar) const\n"
"\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_setProbabilityDistribution", _wrap_InterferenceFunctionRadialParaCrystal_setProbabilityDistribution, METH_VARARGS, (char *)"\n"
@@ -122258,13 +122206,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunctionRadialParaCrystal_peakDistance", _wrap_InterferenceFunctionRadialParaCrystal_peakDistance, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_peakDistance(InterferenceFunctionRadialParaCrystal self) -> double\n"
"\n"
- "double InterferenceFunctionRadialParaCrystal::peakDistance() const \n"
+ "double InterferenceFunctionRadialParaCrystal::peakDistance() const\n"
"\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_dampingLength", _wrap_InterferenceFunctionRadialParaCrystal_dampingLength, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_dampingLength(InterferenceFunctionRadialParaCrystal self) -> double\n"
"\n"
- "double InterferenceFunctionRadialParaCrystal::dampingLength() const \n"
+ "double InterferenceFunctionRadialParaCrystal::dampingLength() const\n"
"\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_getChildren", _wrap_InterferenceFunctionRadialParaCrystal_getChildren, METH_VARARGS, (char *)"\n"
@@ -122363,13 +122311,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunction2DLattice_integrationOverXi", _wrap_InterferenceFunction2DLattice_integrationOverXi, METH_VARARGS, (char *)"\n"
"InterferenceFunction2DLattice_integrationOverXi(InterferenceFunction2DLattice self) -> bool\n"
"\n"
- "bool InterferenceFunction2DLattice::integrationOverXi() const \n"
+ "bool InterferenceFunction2DLattice::integrationOverXi() const\n"
"\n"
""},
{ (char *)"InterferenceFunction2DLattice_lattice", _wrap_InterferenceFunction2DLattice_lattice, METH_VARARGS, (char *)"\n"
"InterferenceFunction2DLattice_lattice(InterferenceFunction2DLattice self) -> Lattice2D\n"
"\n"
- "const Lattice2D & InterferenceFunction2DLattice::lattice() const \n"
+ "const Lattice2D & InterferenceFunction2DLattice::lattice() const\n"
"\n"
""},
{ (char *)"InterferenceFunction2DLattice_getParticleDensity", _wrap_InterferenceFunction2DLattice_getParticleDensity, METH_VARARGS, (char *)"\n"
@@ -122391,7 +122339,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunction2DLattice_onChange", _wrap_InterferenceFunction2DLattice_onChange, METH_VARARGS, (char *)"\n"
"InterferenceFunction2DLattice_onChange(InterferenceFunction2DLattice self)\n"
"\n"
- "void InterferenceFunction2DLattice::onChange() overridefinal\n"
+ "void InterferenceFunction2DLattice::onChange() override final\n"
"\n"
"Action to be taken in inherited class when a parameter has changed. \n"
"\n"
@@ -122522,7 +122470,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunction2DParaCrystal_domainSizes", _wrap_InterferenceFunction2DParaCrystal_domainSizes, METH_VARARGS, (char *)"\n"
"InterferenceFunction2DParaCrystal_domainSizes(InterferenceFunction2DParaCrystal self) -> vdouble1d_t\n"
"\n"
- "std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const \n"
+ "std::vector< double > InterferenceFunction2DParaCrystal::domainSizes() const\n"
"\n"
""},
{ (char *)"InterferenceFunction2DParaCrystal_setIntegrationOverXi", _wrap_InterferenceFunction2DParaCrystal_setIntegrationOverXi, METH_VARARGS, (char *)"\n"
@@ -122542,19 +122490,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunction2DParaCrystal_integrationOverXi", _wrap_InterferenceFunction2DParaCrystal_integrationOverXi, METH_VARARGS, (char *)"\n"
"InterferenceFunction2DParaCrystal_integrationOverXi(InterferenceFunction2DParaCrystal self) -> bool\n"
"\n"
- "bool InterferenceFunction2DParaCrystal::integrationOverXi() const \n"
+ "bool InterferenceFunction2DParaCrystal::integrationOverXi() const\n"
"\n"
""},
{ (char *)"InterferenceFunction2DParaCrystal_dampingLength", _wrap_InterferenceFunction2DParaCrystal_dampingLength, METH_VARARGS, (char *)"\n"
"InterferenceFunction2DParaCrystal_dampingLength(InterferenceFunction2DParaCrystal self) -> double\n"
"\n"
- "double InterferenceFunction2DParaCrystal::dampingLength() const \n"
+ "double InterferenceFunction2DParaCrystal::dampingLength() const\n"
"\n"
""},
{ (char *)"InterferenceFunction2DParaCrystal_lattice", _wrap_InterferenceFunction2DParaCrystal_lattice, METH_VARARGS, (char *)"\n"
"InterferenceFunction2DParaCrystal_lattice(InterferenceFunction2DParaCrystal self) -> Lattice2D\n"
"\n"
- "const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const \n"
+ "const Lattice2D & InterferenceFunction2DParaCrystal::lattice() const\n"
"\n"
""},
{ (char *)"InterferenceFunction2DParaCrystal_getParticleDensity", _wrap_InterferenceFunction2DParaCrystal_getParticleDensity, METH_VARARGS, (char *)"\n"
@@ -122930,13 +122878,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Lattice2D_rotationAngle", _wrap_Lattice2D_rotationAngle, METH_VARARGS, (char *)"\n"
"Lattice2D_rotationAngle(Lattice2D self) -> double\n"
"\n"
- "double Lattice2D::rotationAngle() const \n"
+ "double Lattice2D::rotationAngle() const\n"
"\n"
""},
{ (char *)"Lattice2D_reciprocalBases", _wrap_Lattice2D_reciprocalBases, METH_VARARGS, (char *)"\n"
"Lattice2D_reciprocalBases(Lattice2D self) -> Lattice2D::ReciprocalBases\n"
"\n"
- "Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const \n"
+ "Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const\n"
"\n"
""},
{ (char *)"Lattice2D_setRotationEnabled", _wrap_Lattice2D_setRotationEnabled, METH_VARARGS, (char *)"\n"
@@ -122957,7 +122905,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"BasicLattice_clone", _wrap_BasicLattice_clone, METH_VARARGS, (char *)"\n"
"BasicLattice_clone(BasicLattice self) -> BasicLattice\n"
"\n"
- "BasicLattice * BasicLattice::clone() const \n"
+ "BasicLattice * BasicLattice::clone() const\n"
"\n"
""},
{ (char *)"BasicLattice_accept", _wrap_BasicLattice_accept, METH_VARARGS, (char *)"\n"
@@ -122971,25 +122919,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"BasicLattice_length1", _wrap_BasicLattice_length1, METH_VARARGS, (char *)"\n"
"BasicLattice_length1(BasicLattice self) -> double\n"
"\n"
- "virtual double BasicLattice::length1() const \n"
+ "virtual double BasicLattice::length1() const\n"
"\n"
""},
{ (char *)"BasicLattice_length2", _wrap_BasicLattice_length2, METH_VARARGS, (char *)"\n"
"BasicLattice_length2(BasicLattice self) -> double\n"
"\n"
- "virtual double BasicLattice::length2() const \n"
+ "virtual double BasicLattice::length2() const\n"
"\n"
""},
{ (char *)"BasicLattice_latticeAngle", _wrap_BasicLattice_latticeAngle, METH_VARARGS, (char *)"\n"
"BasicLattice_latticeAngle(BasicLattice self) -> double\n"
"\n"
- "virtual double BasicLattice::latticeAngle() const \n"
+ "virtual double BasicLattice::latticeAngle() const\n"
"\n"
""},
{ (char *)"BasicLattice_unitCellArea", _wrap_BasicLattice_unitCellArea, METH_VARARGS, (char *)"\n"
"BasicLattice_unitCellArea(BasicLattice self) -> double\n"
"\n"
- "double BasicLattice::unitCellArea() const \n"
+ "double BasicLattice::unitCellArea() const\n"
"\n"
""},
{ (char *)"delete_BasicLattice", _wrap_delete_BasicLattice, METH_VARARGS, (char *)"delete_BasicLattice(BasicLattice self)"},
@@ -123004,7 +122952,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SquareLattice_clone", _wrap_SquareLattice_clone, METH_VARARGS, (char *)"\n"
"SquareLattice_clone(SquareLattice self) -> SquareLattice\n"
"\n"
- "SquareLattice * SquareLattice::clone() const \n"
+ "SquareLattice * SquareLattice::clone() const\n"
"\n"
""},
{ (char *)"SquareLattice_accept", _wrap_SquareLattice_accept, METH_VARARGS, (char *)"\n"
@@ -123018,25 +122966,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SquareLattice_length1", _wrap_SquareLattice_length1, METH_VARARGS, (char *)"\n"
"SquareLattice_length1(SquareLattice self) -> double\n"
"\n"
- "virtual double SquareLattice::length1() const \n"
+ "virtual double SquareLattice::length1() const\n"
"\n"
""},
{ (char *)"SquareLattice_length2", _wrap_SquareLattice_length2, METH_VARARGS, (char *)"\n"
"SquareLattice_length2(SquareLattice self) -> double\n"
"\n"
- "virtual double SquareLattice::length2() const \n"
+ "virtual double SquareLattice::length2() const\n"
"\n"
""},
{ (char *)"SquareLattice_latticeAngle", _wrap_SquareLattice_latticeAngle, METH_VARARGS, (char *)"\n"
"SquareLattice_latticeAngle(SquareLattice self) -> double\n"
"\n"
- "double SquareLattice::latticeAngle() const \n"
+ "double SquareLattice::latticeAngle() const\n"
"\n"
""},
{ (char *)"SquareLattice_unitCellArea", _wrap_SquareLattice_unitCellArea, METH_VARARGS, (char *)"\n"
"SquareLattice_unitCellArea(SquareLattice self) -> double\n"
"\n"
- "double SquareLattice::unitCellArea() const \n"
+ "double SquareLattice::unitCellArea() const\n"
"\n"
""},
{ (char *)"delete_SquareLattice", _wrap_delete_SquareLattice, METH_VARARGS, (char *)"delete_SquareLattice(SquareLattice self)"},
@@ -123051,7 +122999,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HexagonalLattice_clone", _wrap_HexagonalLattice_clone, METH_VARARGS, (char *)"\n"
"HexagonalLattice_clone(HexagonalLattice self) -> HexagonalLattice\n"
"\n"
- "HexagonalLattice * HexagonalLattice::clone() const \n"
+ "HexagonalLattice * HexagonalLattice::clone() const\n"
"\n"
""},
{ (char *)"HexagonalLattice_accept", _wrap_HexagonalLattice_accept, METH_VARARGS, (char *)"\n"
@@ -123065,25 +123013,25 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HexagonalLattice_length1", _wrap_HexagonalLattice_length1, METH_VARARGS, (char *)"\n"
"HexagonalLattice_length1(HexagonalLattice self) -> double\n"
"\n"
- "virtual double HexagonalLattice::length1() const \n"
+ "virtual double HexagonalLattice::length1() const\n"
"\n"
""},
{ (char *)"HexagonalLattice_length2", _wrap_HexagonalLattice_length2, METH_VARARGS, (char *)"\n"
"HexagonalLattice_length2(HexagonalLattice self) -> double\n"
"\n"
- "virtual double HexagonalLattice::length2() const \n"
+ "virtual double HexagonalLattice::length2() const\n"
"\n"
""},
{ (char *)"HexagonalLattice_latticeAngle", _wrap_HexagonalLattice_latticeAngle, METH_VARARGS, (char *)"\n"
"HexagonalLattice_latticeAngle(HexagonalLattice self) -> double\n"
"\n"
- "double HexagonalLattice::latticeAngle() const \n"
+ "double HexagonalLattice::latticeAngle() const\n"
"\n"
""},
{ (char *)"HexagonalLattice_unitCellArea", _wrap_HexagonalLattice_unitCellArea, METH_VARARGS, (char *)"\n"
"HexagonalLattice_unitCellArea(HexagonalLattice self) -> double\n"
"\n"
- "double HexagonalLattice::unitCellArea() const \n"
+ "double HexagonalLattice::unitCellArea() const\n"
"\n"
""},
{ (char *)"delete_HexagonalLattice", _wrap_delete_HexagonalLattice, METH_VARARGS, (char *)"delete_HexagonalLattice(HexagonalLattice self)"},
@@ -123115,7 +123063,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Layer_clone", _wrap_Layer_clone, METH_VARARGS, (char *)"\n"
"Layer_clone(Layer self) -> Layer\n"
"\n"
- "Layer * Layer::clone() const overridefinal\n"
+ "Layer * Layer::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -123123,13 +123071,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Layer_cloneInvertB", _wrap_Layer_cloneInvertB, METH_VARARGS, (char *)"\n"
"Layer_cloneInvertB(Layer self) -> Layer\n"
"\n"
- "Layer * Layer::cloneInvertB() const \n"
+ "Layer * Layer::cloneInvertB() const\n"
"\n"
""},
{ (char *)"Layer_accept", _wrap_Layer_accept, METH_VARARGS, (char *)"\n"
"Layer_accept(Layer self, INodeVisitor visitor)\n"
"\n"
- "void Layer::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void Layer::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -123145,13 +123093,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Layer_thickness", _wrap_Layer_thickness, METH_VARARGS, (char *)"\n"
"Layer_thickness(Layer self) -> double\n"
"\n"
- "double Layer::thickness() const \n"
+ "double Layer::thickness() const\n"
"\n"
""},
{ (char *)"Layer_material", _wrap_Layer_material, METH_VARARGS, (char *)"\n"
"Layer_material(Layer self) -> Material\n"
"\n"
- "const Material* Layer::material() const overridefinal\n"
+ "const Material* Layer::material() const override final\n"
"\n"
"Returns nullptr, unless overwritten to return a specific material. \n"
"\n"
@@ -123171,19 +123119,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Layer_numberOfLayouts", _wrap_Layer_numberOfLayouts, METH_VARARGS, (char *)"\n"
"Layer_numberOfLayouts(Layer self) -> size_t\n"
"\n"
- "size_t Layer::numberOfLayouts() const \n"
+ "size_t Layer::numberOfLayouts() const\n"
"\n"
""},
{ (char *)"Layer_layouts", _wrap_Layer_layouts, METH_VARARGS, (char *)"\n"
"Layer_layouts(Layer self) -> std::vector< ILayout const *,std::allocator< ILayout const * > >\n"
"\n"
- "std::vector< const ILayout * > Layer::layouts() const \n"
+ "std::vector< const ILayout * > Layer::layouts() const\n"
"\n"
""},
{ (char *)"Layer_getChildren", _wrap_Layer_getChildren, METH_VARARGS, (char *)"\n"
"Layer_getChildren(Layer self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > Layer::getChildren() const overridefinal\n"
+ "std::vector< const INode * > Layer::getChildren() const override final\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -123204,13 +123152,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Layer_numberOfSlices", _wrap_Layer_numberOfSlices, METH_VARARGS, (char *)"\n"
"Layer_numberOfSlices(Layer self) -> unsigned int\n"
"\n"
- "unsigned int Layer::numberOfSlices() const \n"
+ "unsigned int Layer::numberOfSlices() const\n"
"\n"
""},
{ (char *)"Layer_slice", _wrap_Layer_slice, METH_VARARGS, (char *)"\n"
"Layer_slice(Layer self, ZLimits limits, Layer::ELayerType layer_type) -> SafePointerVector< Layer >\n"
"\n"
- "SafePointerVector< Layer > Layer::slice(ZLimits limits, ELayerType layer_type) const \n"
+ "SafePointerVector< Layer > Layer::slice(ZLimits limits, ELayerType layer_type) const\n"
"\n"
""},
{ (char *)"Layer_scalarReducedPotential", _wrap_Layer_scalarReducedPotential, METH_VARARGS, (char *)"\n"
@@ -123346,7 +123294,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Line_clone", _wrap_Line_clone, METH_VARARGS, (char *)"\n"
"Line_clone(Line self) -> Line\n"
"\n"
- "Line* Line::clone() const \n"
+ "Line* Line::clone() const\n"
"\n"
""},
{ (char *)"Line_contains", _wrap_Line_contains, METH_VARARGS, (char *)"\n"
@@ -123375,7 +123323,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"VerticalLine_clone", _wrap_VerticalLine_clone, METH_VARARGS, (char *)"\n"
"VerticalLine_clone(VerticalLine self) -> VerticalLine\n"
"\n"
- "VerticalLine* VerticalLine::clone() const \n"
+ "VerticalLine* VerticalLine::clone() const\n"
"\n"
""},
{ (char *)"VerticalLine_contains", _wrap_VerticalLine_contains, METH_VARARGS, (char *)"\n"
@@ -123390,7 +123338,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"VerticalLine_getXpos", _wrap_VerticalLine_getXpos, METH_VARARGS, (char *)"\n"
"VerticalLine_getXpos(VerticalLine self) -> double\n"
"\n"
- "double VerticalLine::getXpos() const \n"
+ "double VerticalLine::getXpos() const\n"
"\n"
""},
{ (char *)"delete_VerticalLine", _wrap_delete_VerticalLine, METH_VARARGS, (char *)"delete_VerticalLine(VerticalLine self)"},
@@ -123410,7 +123358,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HorizontalLine_clone", _wrap_HorizontalLine_clone, METH_VARARGS, (char *)"\n"
"HorizontalLine_clone(HorizontalLine self) -> HorizontalLine\n"
"\n"
- "HorizontalLine* HorizontalLine::clone() const \n"
+ "HorizontalLine* HorizontalLine::clone() const\n"
"\n"
""},
{ (char *)"HorizontalLine_contains", _wrap_HorizontalLine_contains, METH_VARARGS, (char *)"\n"
@@ -123425,7 +123373,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HorizontalLine_getYpos", _wrap_HorizontalLine_getYpos, METH_VARARGS, (char *)"\n"
"HorizontalLine_getYpos(HorizontalLine self) -> double\n"
"\n"
- "double HorizontalLine::getYpos() const \n"
+ "double HorizontalLine::getYpos() const\n"
"\n"
""},
{ (char *)"delete_HorizontalLine", _wrap_delete_HorizontalLine, METH_VARARGS, (char *)"delete_HorizontalLine(HorizontalLine self)"},
@@ -123474,7 +123422,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Material_isMagneticMaterial", _wrap_Material_isMagneticMaterial, METH_VARARGS, (char *)"\n"
"Material_isMagneticMaterial(Material self) -> bool\n"
"\n"
- "bool Material::isMagneticMaterial() const \n"
+ "bool Material::isMagneticMaterial() const\n"
"\n"
""},
{ (char *)"Material_getName", _wrap_Material_getName, METH_VARARGS, (char *)"\n"
@@ -123528,21 +123476,46 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Material_transformedMaterial", _wrap_Material_transformedMaterial, METH_VARARGS, (char *)"\n"
"Material_transformedMaterial(Material self, Transform3D const & transform) -> Material\n"
"\n"
- "Material Material::transformedMaterial(const Transform3D &transform) const \n"
+ "Material Material::transformedMaterial(const Transform3D &transform) const\n"
"\n"
""},
{ (char *)"delete_Material", _wrap_delete_Material, METH_VARARGS, (char *)"delete_Material(Material self)"},
{ (char *)"Material_swigregister", Material_swigregister, METH_VARARGS, NULL},
{ (char *)"HomogeneousMaterial", _wrap_HomogeneousMaterial, METH_VARARGS, (char *)"\n"
- "HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization) -> Material\n"
- "HomogeneousMaterial(std::string const & name, complex_t refractive_index) -> Material\n"
+ "HomogeneousMaterial() -> Material\n"
"HomogeneousMaterial(std::string const & name, double delta, double beta, kvector_t magnetization) -> Material\n"
"HomogeneousMaterial(std::string const & name, double delta, double beta) -> Material\n"
- "HomogeneousMaterial() -> Material\n"
+ "HomogeneousMaterial(std::string const & name, complex_t refractive_index, kvector_t magnetization) -> Material\n"
+ "HomogeneousMaterial(std::string const & name, complex_t refractive_index) -> Material\n"
+ "\n"
+ "BA_CORE_API_ Material HomogeneousMaterial(const std::string &name, complex_t refractive_index, kvector_t magnetization=kvector_t())\n"
+ "\n"
+ "Constructs a material with name, refractive_index and magnetization (in A/m). Alternatively, $\\\\delta$ and $\\\\beta$ for refractive index $n = 1 - \\\\delta + i \\\\beta$ can be passed directly. With no parameters given, constructs default (vacuum) material with $n = 1$ and zero magnetization. \n"
+ "\n"
+ ""},
+ { (char *)"MaterialBySLD", _wrap_MaterialBySLD, METH_VARARGS, (char *)"\n"
+ "MaterialBySLD() -> Material\n"
+ "MaterialBySLD(std::string const & name, double sld, double abs_term, kvector_t magnetization) -> Material\n"
+ "MaterialBySLD(std::string const & name, double sld, double abs_term) -> Material\n"
+ "\n"
+ "BA_CORE_API_ Material MaterialBySLD(const std::string &name, double sld, double abs_term, kvector_t magnetization=kvector_t())\n"
+ "\n"
+ "Constructs a wavelength-independent material with given sld and absorptive term Absorptive term is wavelength-independent (normalized to a wavelength) and can be considered as inverse of imaginary part of complex scattering length density: $ SLD = (N b_{coh}, N \\\\sigma_{abs}(\\\\lambda_0) / \\\\lambda_0) $ Here $ N $ - material number density, $ b_{coh} $ - bound coherent scattering length $ \\\\sigma_{abs}(\\\\lambda_0) $ - absorption cross-section at $ \\\\lambda_0 $ wavelength. With no parameters given, constructs default (vacuum) material with zero sld and zero magnetization.\n"
+ "\n"
+ "Parameters:\n"
+ "-----------\n"
"\n"
- "BA_CORE_API_ Material HomogeneousMaterial()\n"
+ "name: \n"
+ "material name\n"
"\n"
- "Constructs material with zero refractive coefficients and zero magnetization. \n"
+ "sld: \n"
+ "scattering length density, $ nm^{-2} $\n"
+ "\n"
+ "abs_term: \n"
+ "wavelength-independent absorptive term, $ nm^{-2} $\n"
+ "\n"
+ "magnetization: \n"
+ "magnetization (in A/m) \n"
"\n"
""},
{ (char *)"MaterialByAbsCX", _wrap_MaterialByAbsCX, METH_VARARGS, (char *)"\n"
@@ -123556,6 +123529,9 @@ static PyMethodDef SwigMethods[] = {
"Parameters:\n"
"-----------\n"
"\n"
+ "name: \n"
+ "material name\n"
+ "\n"
"sld: \n"
"scattering length density, $ nm^{-2} $\n"
"\n"
@@ -123566,16 +123542,6 @@ static PyMethodDef SwigMethods[] = {
"magnetization (in A/m) \n"
"\n"
""},
- { (char *)"MaterialBySLD", _wrap_MaterialBySLD, METH_VARARGS, (char *)"\n"
- "MaterialBySLD(std::string const & name, double sld, double abs_term, kvector_t magnetization) -> Material\n"
- "MaterialBySLD(std::string const & name, double sld, double abs_term) -> Material\n"
- "MaterialBySLD() -> Material\n"
- "\n"
- "BA_CORE_API_ Material MaterialBySLD()\n"
- "\n"
- "Constructs wavelength-independent material with zero sld and zero magnetization. \n"
- "\n"
- ""},
{ (char *)"createAveragedMaterial", _wrap_createAveragedMaterial, METH_VARARGS, (char *)"\n"
"createAveragedMaterial(Material layer_mat, std::vector< HomogeneousRegion,std::allocator< HomogeneousRegion > > const & regions) -> Material\n"
"\n"
@@ -123599,7 +123565,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MesoCrystal_clone", _wrap_MesoCrystal_clone, METH_VARARGS, (char *)"\n"
"MesoCrystal_clone(MesoCrystal self) -> MesoCrystal\n"
"\n"
- "MesoCrystal * MesoCrystal::clone() const overridefinal\n"
+ "MesoCrystal * MesoCrystal::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -123607,7 +123573,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MesoCrystal_accept", _wrap_MesoCrystal_accept, METH_VARARGS, (char *)"\n"
"MesoCrystal_accept(MesoCrystal self, INodeVisitor visitor)\n"
"\n"
- "void MesoCrystal::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void MesoCrystal::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -123615,7 +123581,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MesoCrystal_createSlicedParticle", _wrap_MesoCrystal_createSlicedParticle, METH_VARARGS, (char *)"\n"
"MesoCrystal_createSlicedParticle(MesoCrystal self, ZLimits limits) -> SlicedParticle\n"
"\n"
- "SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const overridefinal\n"
+ "SlicedParticle MesoCrystal::createSlicedParticle(ZLimits limits) const override final\n"
"\n"
"Create a sliced form factor for this particle. \n"
"\n"
@@ -123623,7 +123589,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MesoCrystal_getChildren", _wrap_MesoCrystal_getChildren, METH_VARARGS, (char *)"\n"
"MesoCrystal_getChildren(MesoCrystal self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > MesoCrystal::getChildren() const overridefinal\n"
+ "std::vector< const INode * > MesoCrystal::getChildren() const override final\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -123644,7 +123610,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MultiLayer_accept", _wrap_MultiLayer_accept, METH_VARARGS, (char *)"\n"
"MultiLayer_accept(MultiLayer self, INodeVisitor visitor)\n"
"\n"
- "virtual void MultiLayer::accept(INodeVisitor *visitor) const finaloverride\n"
+ "virtual void MultiLayer::accept(INodeVisitor *visitor) const final override\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -123652,13 +123618,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MultiLayer_numberOfLayers", _wrap_MultiLayer_numberOfLayers, METH_VARARGS, (char *)"\n"
"MultiLayer_numberOfLayers(MultiLayer self) -> size_t\n"
"\n"
- "size_t MultiLayer::numberOfLayers() const \n"
+ "size_t MultiLayer::numberOfLayers() const\n"
"\n"
""},
{ (char *)"MultiLayer_numberOfInterfaces", _wrap_MultiLayer_numberOfInterfaces, METH_VARARGS, (char *)"\n"
"MultiLayer_numberOfInterfaces(MultiLayer self) -> size_t\n"
"\n"
- "size_t MultiLayer::numberOfInterfaces() const \n"
+ "size_t MultiLayer::numberOfInterfaces() const\n"
"\n"
""},
{ (char *)"MultiLayer_addLayer", _wrap_MultiLayer_addLayer, METH_VARARGS, (char *)"\n"
@@ -123758,7 +123724,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MultiLayer_clone", _wrap_MultiLayer_clone, METH_VARARGS, (char *)"\n"
"MultiLayer_clone(MultiLayer self) -> MultiLayer\n"
"\n"
- "MultiLayer * MultiLayer::clone() const finaloverride\n"
+ "MultiLayer * MultiLayer::clone() const final override\n"
"\n"
"Returns a clone of multilayer with clones of all layers and recreated interfaces between layers \n"
"\n"
@@ -123771,14 +123737,6 @@ static PyMethodDef SwigMethods[] = {
"Returns a clone with inverted magnetic fields. \n"
"\n"
""},
- { (char *)"MultiLayer_cloneSliced", _wrap_MultiLayer_cloneSliced, METH_VARARGS, (char *)"\n"
- "MultiLayer_cloneSliced(MultiLayer self, bool use_average_layers) -> MultiLayer\n"
- "\n"
- "MultiLayer * MultiLayer::cloneSliced(bool use_average_layers) const\n"
- "\n"
- "Returns a clone of multilayer where the original layers may be sliced into several sublayers for usage with the graded layer approximation \n"
- "\n"
- ""},
{ (char *)"MultiLayer_setCrossCorrLength", _wrap_MultiLayer_setCrossCorrLength, METH_VARARGS, (char *)"\n"
"MultiLayer_setCrossCorrLength(MultiLayer self, double crossCorrLength)\n"
"\n"
@@ -123856,7 +123814,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MultiLayer_containsMagneticMaterial", _wrap_MultiLayer_containsMagneticMaterial, METH_VARARGS, (char *)"\n"
"MultiLayer_containsMagneticMaterial(MultiLayer self) -> bool\n"
"\n"
- "bool MultiLayer::containsMagneticMaterial() const \n"
+ "bool MultiLayer::containsMagneticMaterial() const\n"
"\n"
""},
{ (char *)"MultiLayer_containsCompatibleMaterials", _wrap_MultiLayer_containsCompatibleMaterials, METH_VARARGS, (char *)"\n"
@@ -123878,19 +123836,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MultiLayer_hasRoughness", _wrap_MultiLayer_hasRoughness, METH_VARARGS, (char *)"\n"
"MultiLayer_hasRoughness(MultiLayer self) -> bool\n"
"\n"
- "bool MultiLayer::hasRoughness() const \n"
+ "bool MultiLayer::hasRoughness() const\n"
"\n"
""},
{ (char *)"MultiLayer_totalNofLayouts", _wrap_MultiLayer_totalNofLayouts, METH_VARARGS, (char *)"\n"
"MultiLayer_totalNofLayouts(MultiLayer self) -> size_t\n"
"\n"
- "size_t MultiLayer::totalNofLayouts() const \n"
+ "size_t MultiLayer::totalNofLayouts() const\n"
"\n"
""},
{ (char *)"MultiLayer_getChildren", _wrap_MultiLayer_getChildren, METH_VARARGS, (char *)"\n"
"MultiLayer_getChildren(MultiLayer self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > MultiLayer::getChildren() const finaloverride\n"
+ "std::vector< const INode * > MultiLayer::getChildren() const final override\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -123913,7 +123871,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"OffSpecSimulation_clone", _wrap_OffSpecSimulation_clone, METH_VARARGS, (char *)"\n"
"OffSpecSimulation_clone(OffSpecSimulation self) -> OffSpecSimulation\n"
"\n"
- "OffSpecSimulation* OffSpecSimulation::clone() const \n"
+ "OffSpecSimulation* OffSpecSimulation::clone() const\n"
"\n"
""},
{ (char *)"OffSpecSimulation_accept", _wrap_OffSpecSimulation_accept, METH_VARARGS, (char *)"\n"
@@ -123989,7 +123947,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IntensityData_clone", _wrap_IntensityData_clone, METH_VARARGS, (char *)"\n"
"IntensityData_clone(IntensityData self) -> IntensityData\n"
"\n"
- "OutputData< T > * OutputData< T >::clone() const \n"
+ "OutputData< T > * OutputData< T >::clone() const\n"
"\n"
""},
{ (char *)"IntensityData_copyFrom", _wrap_IntensityData_copyFrom, METH_VARARGS, (char *)"\n"
@@ -124001,7 +123959,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"IntensityData_meanValues", _wrap_IntensityData_meanValues, METH_VARARGS, (char *)"\n"
"IntensityData_meanValues(IntensityData self) -> IntensityData\n"
"\n"
- "OutputData< double > * OutputData< T >::meanValues() const \n"
+ "OutputData< double > * OutputData< T >::meanValues() const\n"
"\n"
""},
{ (char *)"IntensityData_addAxis", _wrap_IntensityData_addAxis, METH_VARARGS, (char *)"\n"
@@ -124364,19 +124322,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParameterDistribution_getLimits", _wrap_ParameterDistribution_getLimits, METH_VARARGS, (char *)"\n"
"ParameterDistribution_getLimits(ParameterDistribution self) -> RealLimits\n"
"\n"
- "RealLimits ParameterDistribution::getLimits() const \n"
+ "RealLimits ParameterDistribution::getLimits() const\n"
"\n"
""},
{ (char *)"ParameterDistribution_getMinValue", _wrap_ParameterDistribution_getMinValue, METH_VARARGS, (char *)"\n"
"ParameterDistribution_getMinValue(ParameterDistribution self) -> double\n"
"\n"
- "double ParameterDistribution::getMinValue() const \n"
+ "double ParameterDistribution::getMinValue() const\n"
"\n"
""},
{ (char *)"ParameterDistribution_getMaxValue", _wrap_ParameterDistribution_getMaxValue, METH_VARARGS, (char *)"\n"
"ParameterDistribution_getMaxValue(ParameterDistribution self) -> double\n"
"\n"
- "double ParameterDistribution::getMaxValue() const \n"
+ "double ParameterDistribution::getMaxValue() const\n"
"\n"
""},
{ (char *)"ParameterDistribution_swigregister", ParameterDistribution_swigregister, METH_VARARGS, NULL},
@@ -124496,7 +124454,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParameterPool_parameterNames", _wrap_ParameterPool_parameterNames, METH_VARARGS, (char *)"\n"
"ParameterPool_parameterNames(ParameterPool self) -> vector_string_t\n"
"\n"
- "std::vector< std::string > ParameterPool::parameterNames() const \n"
+ "std::vector< std::string > ParameterPool::parameterNames() const\n"
"\n"
""},
{ (char *)"ParameterPool_removeParameter", _wrap_ParameterPool_removeParameter, METH_VARARGS, (char *)"\n"
@@ -124603,7 +124561,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Particle_clone", _wrap_Particle_clone, METH_VARARGS, (char *)"\n"
"Particle_clone(Particle self) -> Particle\n"
"\n"
- "Particle * Particle::clone() const overridefinal\n"
+ "Particle * Particle::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -124611,7 +124569,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Particle_accept", _wrap_Particle_accept, METH_VARARGS, (char *)"\n"
"Particle_accept(Particle self, INodeVisitor visitor)\n"
"\n"
- "void Particle::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void Particle::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -124619,7 +124577,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Particle_createSlicedParticle", _wrap_Particle_createSlicedParticle, METH_VARARGS, (char *)"\n"
"Particle_createSlicedParticle(Particle self, ZLimits limits) -> SlicedParticle\n"
"\n"
- "SlicedParticle Particle::createSlicedParticle(ZLimits limits) const overridefinal\n"
+ "SlicedParticle Particle::createSlicedParticle(ZLimits limits) const override final\n"
"\n"
"Create a sliced form factor for this particle. \n"
"\n"
@@ -124633,7 +124591,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Particle_material", _wrap_Particle_material, METH_VARARGS, (char *)"\n"
"Particle_material(Particle self) -> Material\n"
"\n"
- "const Material* Particle::material() const overridefinal\n"
+ "const Material* Particle::material() const override final\n"
"\n"
"Returns nullptr, unless overwritten to return a specific material. \n"
"\n"
@@ -124647,7 +124605,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Particle_getChildren", _wrap_Particle_getChildren, METH_VARARGS, (char *)"\n"
"Particle_getChildren(Particle self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > Particle::getChildren() const overridefinal\n"
+ "std::vector< const INode * > Particle::getChildren() const override final\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -124670,7 +124628,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleComposition_clone", _wrap_ParticleComposition_clone, METH_VARARGS, (char *)"\n"
"ParticleComposition_clone(ParticleComposition self) -> ParticleComposition\n"
"\n"
- "ParticleComposition * ParticleComposition::clone() const overridefinal\n"
+ "ParticleComposition * ParticleComposition::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -124678,7 +124636,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleComposition_accept", _wrap_ParticleComposition_accept, METH_VARARGS, (char *)"\n"
"ParticleComposition_accept(ParticleComposition self, INodeVisitor visitor)\n"
"\n"
- "void ParticleComposition::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void ParticleComposition::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -124686,7 +124644,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleComposition_createFormFactor", _wrap_ParticleComposition_createFormFactor, METH_VARARGS, (char *)"\n"
"ParticleComposition_createFormFactor(ParticleComposition self) -> IFormFactor\n"
"\n"
- "IFormFactor * ParticleComposition::createFormFactor() const overridefinal\n"
+ "IFormFactor * ParticleComposition::createFormFactor() const override final\n"
"\n"
"Create a form factor for this particle. \n"
"\n"
@@ -124715,7 +124673,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleComposition_getChildren", _wrap_ParticleComposition_getChildren, METH_VARARGS, (char *)"\n"
"ParticleComposition_getChildren(ParticleComposition self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > ParticleComposition::getChildren() const overridefinal\n"
+ "std::vector< const INode * > ParticleComposition::getChildren() const override final\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -124723,7 +124681,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleComposition_decompose", _wrap_ParticleComposition_decompose, METH_VARARGS, (char *)"\n"
"ParticleComposition_decompose(ParticleComposition self) -> SafePointerVector< IParticle >\n"
"\n"
- "SafePointerVector< IParticle > ParticleComposition::decompose() const overridefinal\n"
+ "SafePointerVector< IParticle > ParticleComposition::decompose() const override final\n"
"\n"
"Decompose in constituent IParticle objects. \n"
"\n"
@@ -124731,7 +124689,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleComposition_bottomTopZ", _wrap_ParticleComposition_bottomTopZ, METH_VARARGS, (char *)"\n"
"ParticleComposition_bottomTopZ(ParticleComposition self) -> ParticleLimits\n"
"\n"
- "ParticleLimits ParticleComposition::bottomTopZ() const overridefinal\n"
+ "ParticleLimits ParticleComposition::bottomTopZ() const override final\n"
"\n"
"Top and bottom z-coordinate. \n"
"\n"
@@ -124753,7 +124711,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleCoreShell_clone", _wrap_ParticleCoreShell_clone, METH_VARARGS, (char *)"\n"
"ParticleCoreShell_clone(ParticleCoreShell self) -> ParticleCoreShell\n"
"\n"
- "ParticleCoreShell * ParticleCoreShell::clone() const overridefinal\n"
+ "ParticleCoreShell * ParticleCoreShell::clone() const override final\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -124761,7 +124719,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleCoreShell_accept", _wrap_ParticleCoreShell_accept, METH_VARARGS, (char *)"\n"
"ParticleCoreShell_accept(ParticleCoreShell self, INodeVisitor visitor)\n"
"\n"
- "void ParticleCoreShell::accept(INodeVisitor *visitor) const overridefinal\n"
+ "void ParticleCoreShell::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -124769,7 +124727,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleCoreShell_createSlicedParticle", _wrap_ParticleCoreShell_createSlicedParticle, METH_VARARGS, (char *)"\n"
"ParticleCoreShell_createSlicedParticle(ParticleCoreShell self, ZLimits limits) -> SlicedParticle\n"
"\n"
- "SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const overridefinal\n"
+ "SlicedParticle ParticleCoreShell::createSlicedParticle(ZLimits limits) const override final\n"
"\n"
"Create a sliced form factor for this particle. \n"
"\n"
@@ -124777,19 +124735,19 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleCoreShell_coreParticle", _wrap_ParticleCoreShell_coreParticle, METH_VARARGS, (char *)"\n"
"ParticleCoreShell_coreParticle(ParticleCoreShell self) -> Particle\n"
"\n"
- "const Particle * ParticleCoreShell::coreParticle() const \n"
+ "const Particle * ParticleCoreShell::coreParticle() const\n"
"\n"
""},
{ (char *)"ParticleCoreShell_shellParticle", _wrap_ParticleCoreShell_shellParticle, METH_VARARGS, (char *)"\n"
"ParticleCoreShell_shellParticle(ParticleCoreShell self) -> Particle\n"
"\n"
- "const Particle * ParticleCoreShell::shellParticle() const \n"
+ "const Particle * ParticleCoreShell::shellParticle() const\n"
"\n"
""},
{ (char *)"ParticleCoreShell_getChildren", _wrap_ParticleCoreShell_getChildren, METH_VARARGS, (char *)"\n"
"ParticleCoreShell_getChildren(ParticleCoreShell self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > ParticleCoreShell::getChildren() const overridefinal\n"
+ "std::vector< const INode * > ParticleCoreShell::getChildren() const override final\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -124804,7 +124762,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleDistribution_clone", _wrap_ParticleDistribution_clone, METH_VARARGS, (char *)"\n"
"ParticleDistribution_clone(ParticleDistribution self) -> ParticleDistribution\n"
"\n"
- "ParticleDistribution * ParticleDistribution::clone() const finaloverride\n"
+ "ParticleDistribution * ParticleDistribution::clone() const final override\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -124812,7 +124770,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleDistribution_accept", _wrap_ParticleDistribution_accept, METH_VARARGS, (char *)"\n"
"ParticleDistribution_accept(ParticleDistribution self, INodeVisitor visitor)\n"
"\n"
- "void ParticleDistribution::accept(INodeVisitor *visitor) const finaloverride\n"
+ "void ParticleDistribution::accept(INodeVisitor *visitor) const final override\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -124820,7 +124778,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleDistribution_translate", _wrap_ParticleDistribution_translate, METH_VARARGS, (char *)"\n"
"ParticleDistribution_translate(ParticleDistribution self, kvector_t translation)\n"
"\n"
- "void ParticleDistribution::translate(kvector_t translation) finaloverride\n"
+ "void ParticleDistribution::translate(kvector_t translation) final override\n"
"\n"
"Translates the particle with the given vector. \n"
"\n"
@@ -124854,7 +124812,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleDistribution_getChildren", _wrap_ParticleDistribution_getChildren, METH_VARARGS, (char *)"\n"
"ParticleDistribution_getChildren(ParticleDistribution self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > ParticleDistribution::getChildren() const finaloverride\n"
+ "std::vector< const INode * > ParticleDistribution::getChildren() const final override\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -124878,7 +124836,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleLayout_clone", _wrap_ParticleLayout_clone, METH_VARARGS, (char *)"\n"
"ParticleLayout_clone(ParticleLayout self) -> ParticleLayout\n"
"\n"
- "ParticleLayout * ParticleLayout::clone() const finaloverride\n"
+ "ParticleLayout * ParticleLayout::clone() const final override\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
@@ -124886,13 +124844,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleLayout_cloneWithOffset", _wrap_ParticleLayout_cloneWithOffset, METH_VARARGS, (char *)"\n"
"ParticleLayout_cloneWithOffset(ParticleLayout self, double offset) -> ParticleLayout\n"
"\n"
- "ParticleLayout * ParticleLayout::cloneWithOffset(double offset) const finaloverride\n"
+ "ParticleLayout * ParticleLayout::cloneWithOffset(double offset) const final override\n"
"\n"
""},
{ (char *)"ParticleLayout_accept", _wrap_ParticleLayout_accept, METH_VARARGS, (char *)"\n"
"ParticleLayout_accept(ParticleLayout self, INodeVisitor visitor)\n"
"\n"
- "void ParticleLayout::accept(INodeVisitor *visitor) const finaloverride\n"
+ "void ParticleLayout::accept(INodeVisitor *visitor) const final override\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -124926,7 +124884,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleLayout_particles", _wrap_ParticleLayout_particles, METH_VARARGS, (char *)"\n"
"ParticleLayout_particles(ParticleLayout self) -> SafePointerVector< IParticle const >\n"
"\n"
- "SafePointerVector< const IParticle > ParticleLayout::particles() const finaloverride\n"
+ "SafePointerVector< const IParticle > ParticleLayout::particles() const final override\n"
"\n"
"Returns information on all particles (type and abundance) and generates new particles if an IAbstractParticle denotes a collection \n"
"\n"
@@ -124934,7 +124892,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleLayout_getTotalAbundance", _wrap_ParticleLayout_getTotalAbundance, METH_VARARGS, (char *)"\n"
"ParticleLayout_getTotalAbundance(ParticleLayout self) -> double\n"
"\n"
- "double ParticleLayout::getTotalAbundance() const finaloverride\n"
+ "double ParticleLayout::getTotalAbundance() const final override\n"
"\n"
"Get total abundance of all particles. \n"
"\n"
@@ -124950,7 +124908,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleLayout_totalParticleSurfaceDensity", _wrap_ParticleLayout_totalParticleSurfaceDensity, METH_VARARGS, (char *)"\n"
"ParticleLayout_totalParticleSurfaceDensity(ParticleLayout self) -> double\n"
"\n"
- "double ParticleLayout::totalParticleSurfaceDensity() const finaloverride\n"
+ "double ParticleLayout::totalParticleSurfaceDensity() const final override\n"
"\n"
"Returns surface density of all particles. \n"
"\n"
@@ -124958,7 +124916,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleLayout_setTotalParticleSurfaceDensity", _wrap_ParticleLayout_setTotalParticleSurfaceDensity, METH_VARARGS, (char *)"\n"
"ParticleLayout_setTotalParticleSurfaceDensity(ParticleLayout self, double particle_density)\n"
"\n"
- "void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) finaloverride\n"
+ "void ParticleLayout::setTotalParticleSurfaceDensity(double particle_density) final override\n"
"\n"
"Sets total particle surface density. particle_density: number of particles per square nanometer \n"
"\n"
@@ -124966,7 +124924,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ParticleLayout_getChildren", _wrap_ParticleLayout_getChildren, METH_VARARGS, (char *)"\n"
"ParticleLayout_getChildren(ParticleLayout self) -> swig_dummy_type_const_inode_vector\n"
"\n"
- "std::vector< const INode * > ParticleLayout::getChildren() const finaloverride\n"
+ "std::vector< const INode * > ParticleLayout::getChildren() const final override\n"
"\n"
"Returns a vector of children (const). \n"
"\n"
@@ -124987,7 +124945,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PoissonNoiseBackground_clone", _wrap_PoissonNoiseBackground_clone, METH_VARARGS, (char *)"\n"
"PoissonNoiseBackground_clone(PoissonNoiseBackground self) -> PoissonNoiseBackground\n"
"\n"
- "PoissonNoiseBackground * PoissonNoiseBackground::clone() const overridefinal\n"
+ "PoissonNoiseBackground * PoissonNoiseBackground::clone() const override final\n"
"\n"
""},
{ (char *)"PoissonNoiseBackground_accept", _wrap_PoissonNoiseBackground_accept, METH_VARARGS, (char *)"\n"
@@ -125001,7 +124959,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PoissonNoiseBackground_addBackGround", _wrap_PoissonNoiseBackground_addBackGround, METH_VARARGS, (char *)"\n"
"PoissonNoiseBackground_addBackGround(PoissonNoiseBackground self, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator start, std::vector< SimulationElement,std::allocator< SimulationElement > >::iterator end)\n"
"\n"
- "void PoissonNoiseBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const overridefinal\n"
+ "void PoissonNoiseBackground::addBackGround(std::vector< SimulationElement >::iterator start, std::vector< SimulationElement >::iterator end) const override final\n"
"\n"
""},
{ (char *)"PoissonNoiseBackground_swigregister", PoissonNoiseBackground_swigregister, METH_VARARGS, NULL},
@@ -125022,7 +124980,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Polygon_clone", _wrap_Polygon_clone, METH_VARARGS, (char *)"\n"
"Polygon_clone(Polygon self) -> Polygon\n"
"\n"
- "virtual Polygon* Polygon::clone() const \n"
+ "virtual Polygon* Polygon::clone() const\n"
"\n"
""},
{ (char *)"Polygon_contains", _wrap_Polygon_contains, METH_VARARGS, (char *)"\n"
@@ -125037,13 +124995,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Polygon_getArea", _wrap_Polygon_getArea, METH_VARARGS, (char *)"\n"
"Polygon_getArea(Polygon self) -> double\n"
"\n"
- "double Polygon::getArea() const \n"
+ "double Polygon::getArea() const\n"
"\n"
""},
{ (char *)"Polygon_getPoints", _wrap_Polygon_getPoints, METH_VARARGS, (char *)"\n"
"Polygon_getPoints(Polygon self, vdouble1d_t xpos, vdouble1d_t ypos)\n"
"\n"
- "void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const \n"
+ "void Polygon::getPoints(std::vector< double > &xpos, std::vector< double > &ypos) const\n"
"\n"
""},
{ (char *)"Polygon_swigregister", Polygon_swigregister, METH_VARARGS, NULL},
@@ -125061,7 +125019,7 @@ static PyMethodDef SwigMethods[] = {
"clone(std::string const & new_name) -> RealParameter\n"
"RealParameter_clone(RealParameter self) -> RealParameter\n"
"\n"
- "RealParameter * RealParameter::clone(const std::string &new_name=\"\") const \n"
+ "RealParameter * RealParameter::clone(const std::string &new_name=\"\") const\n"
"\n"
""},
{ (char *)"RealParameter_setValue", _wrap_RealParameter_setValue, METH_VARARGS, (char *)"\n"
@@ -125089,7 +125047,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RealParameter_limits", _wrap_RealParameter_limits, METH_VARARGS, (char *)"\n"
"RealParameter_limits(RealParameter self) -> RealLimits\n"
"\n"
- "RealLimits RealParameter::limits() const \n"
+ "RealLimits RealParameter::limits() const\n"
"\n"
""},
{ (char *)"RealParameter_setLimited", _wrap_RealParameter_setLimited, METH_VARARGS, (char *)"\n"
@@ -125119,7 +125077,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RealParameter_unit", _wrap_RealParameter_unit, METH_VARARGS, (char *)"\n"
"RealParameter_unit(RealParameter self) -> std::string\n"
"\n"
- "std::string RealParameter::unit() const \n"
+ "std::string RealParameter::unit() const\n"
"\n"
""},
{ (char *)"delete_RealParameter", _wrap_delete_RealParameter, METH_VARARGS, (char *)"delete_RealParameter(RealParameter self)"},
@@ -125148,7 +125106,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Rectangle_clone", _wrap_Rectangle_clone, METH_VARARGS, (char *)"\n"
"Rectangle_clone(Rectangle self) -> Rectangle\n"
"\n"
- "Rectangle* Rectangle::clone() const \n"
+ "Rectangle* Rectangle::clone() const\n"
"\n"
""},
{ (char *)"Rectangle_contains", _wrap_Rectangle_contains, METH_VARARGS, (char *)"\n"
@@ -125163,31 +125121,31 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Rectangle_getArea", _wrap_Rectangle_getArea, METH_VARARGS, (char *)"\n"
"Rectangle_getArea(Rectangle self) -> double\n"
"\n"
- "double Rectangle::getArea() const \n"
+ "double Rectangle::getArea() const\n"
"\n"
""},
{ (char *)"Rectangle_getXlow", _wrap_Rectangle_getXlow, METH_VARARGS, (char *)"\n"
"Rectangle_getXlow(Rectangle self) -> double\n"
"\n"
- "double Rectangle::getXlow() const \n"
+ "double Rectangle::getXlow() const\n"
"\n"
""},
{ (char *)"Rectangle_getYlow", _wrap_Rectangle_getYlow, METH_VARARGS, (char *)"\n"
"Rectangle_getYlow(Rectangle self) -> double\n"
"\n"
- "double Rectangle::getYlow() const \n"
+ "double Rectangle::getYlow() const\n"
"\n"
""},
{ (char *)"Rectangle_getXup", _wrap_Rectangle_getXup, METH_VARARGS, (char *)"\n"
"Rectangle_getXup(Rectangle self) -> double\n"
"\n"
- "double Rectangle::getXup() const \n"
+ "double Rectangle::getXup() const\n"
"\n"
""},
{ (char *)"Rectangle_getYup", _wrap_Rectangle_getYup, METH_VARARGS, (char *)"\n"
"Rectangle_getYup(Rectangle self) -> double\n"
"\n"
- "double Rectangle::getYup() const \n"
+ "double Rectangle::getYup() const\n"
"\n"
""},
{ (char *)"delete_Rectangle", _wrap_delete_Rectangle, METH_VARARGS, (char *)"delete_Rectangle(Rectangle self)"},
@@ -125231,7 +125189,7 @@ static PyMethodDef SwigMethods[] = {
"setPosition(kvector_t normal_to_detector, double u0, double v0, kvector_t direction)\n"
"RectangularDetector_setPosition(RectangularDetector self, kvector_t normal_to_detector, double u0, double v0)\n"
"\n"
- "void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0,-1.0, 0.0))\n"
+ "void RectangularDetector::setPosition(const kvector_t normal_to_detector, double u0, double v0, const kvector_t direction=kvector_t(0.0, -1.0, 0.0))\n"
"\n"
""},
{ (char *)"RectangularDetector_setPerpendicularToSampleX", _wrap_RectangularDetector_setPerpendicularToSampleX, METH_VARARGS, (char *)"\n"
@@ -125263,73 +125221,73 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RectangularDetector_getWidth", _wrap_RectangularDetector_getWidth, METH_VARARGS, (char *)"\n"
"RectangularDetector_getWidth(RectangularDetector self) -> double\n"
"\n"
- "double RectangularDetector::getWidth() const \n"
+ "double RectangularDetector::getWidth() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getHeight", _wrap_RectangularDetector_getHeight, METH_VARARGS, (char *)"\n"
"RectangularDetector_getHeight(RectangularDetector self) -> double\n"
"\n"
- "double RectangularDetector::getHeight() const \n"
+ "double RectangularDetector::getHeight() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getNbinsX", _wrap_RectangularDetector_getNbinsX, METH_VARARGS, (char *)"\n"
"RectangularDetector_getNbinsX(RectangularDetector self) -> size_t\n"
"\n"
- "size_t RectangularDetector::getNbinsX() const \n"
+ "size_t RectangularDetector::getNbinsX() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getNbinsY", _wrap_RectangularDetector_getNbinsY, METH_VARARGS, (char *)"\n"
"RectangularDetector_getNbinsY(RectangularDetector self) -> size_t\n"
"\n"
- "size_t RectangularDetector::getNbinsY() const \n"
+ "size_t RectangularDetector::getNbinsY() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getNormalVector", _wrap_RectangularDetector_getNormalVector, METH_VARARGS, (char *)"\n"
"RectangularDetector_getNormalVector(RectangularDetector self) -> kvector_t\n"
"\n"
- "kvector_t RectangularDetector::getNormalVector() const \n"
+ "kvector_t RectangularDetector::getNormalVector() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getU0", _wrap_RectangularDetector_getU0, METH_VARARGS, (char *)"\n"
"RectangularDetector_getU0(RectangularDetector self) -> double\n"
"\n"
- "double RectangularDetector::getU0() const \n"
+ "double RectangularDetector::getU0() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getV0", _wrap_RectangularDetector_getV0, METH_VARARGS, (char *)"\n"
"RectangularDetector_getV0(RectangularDetector self) -> double\n"
"\n"
- "double RectangularDetector::getV0() const \n"
+ "double RectangularDetector::getV0() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getDirectionVector", _wrap_RectangularDetector_getDirectionVector, METH_VARARGS, (char *)"\n"
"RectangularDetector_getDirectionVector(RectangularDetector self) -> kvector_t\n"
"\n"
- "kvector_t RectangularDetector::getDirectionVector() const \n"
+ "kvector_t RectangularDetector::getDirectionVector() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getDistance", _wrap_RectangularDetector_getDistance, METH_VARARGS, (char *)"\n"
"RectangularDetector_getDistance(RectangularDetector self) -> double\n"
"\n"
- "double RectangularDetector::getDistance() const \n"
+ "double RectangularDetector::getDistance() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getDirectBeamU0", _wrap_RectangularDetector_getDirectBeamU0, METH_VARARGS, (char *)"\n"
"RectangularDetector_getDirectBeamU0(RectangularDetector self) -> double\n"
"\n"
- "double RectangularDetector::getDirectBeamU0() const \n"
+ "double RectangularDetector::getDirectBeamU0() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getDirectBeamV0", _wrap_RectangularDetector_getDirectBeamV0, METH_VARARGS, (char *)"\n"
"RectangularDetector_getDirectBeamV0(RectangularDetector self) -> double\n"
"\n"
- "double RectangularDetector::getDirectBeamV0() const \n"
+ "double RectangularDetector::getDirectBeamV0() const\n"
"\n"
""},
{ (char *)"RectangularDetector_getDetectorArrangment", _wrap_RectangularDetector_getDetectorArrangment, METH_VARARGS, (char *)"\n"
"RectangularDetector_getDetectorArrangment(RectangularDetector self) -> RectangularDetector::EDetectorArrangement\n"
"\n"
- "RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const \n"
+ "RectangularDetector::EDetectorArrangement RectangularDetector::getDetectorArrangment() const\n"
"\n"
""},
{ (char *)"RectangularDetector_validAxesUnits", _wrap_RectangularDetector_validAxesUnits, METH_VARARGS, (char *)"\n"
@@ -125401,13 +125359,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ResolutionFunction2DGaussian_evaluateCDF", _wrap_ResolutionFunction2DGaussian_evaluateCDF, METH_VARARGS, (char *)"\n"
"ResolutionFunction2DGaussian_evaluateCDF(ResolutionFunction2DGaussian self, double x, double y) -> double\n"
"\n"
- "double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const \n"
+ "double ResolutionFunction2DGaussian::evaluateCDF(double x, double y) const\n"
"\n"
""},
{ (char *)"ResolutionFunction2DGaussian_clone", _wrap_ResolutionFunction2DGaussian_clone, METH_VARARGS, (char *)"\n"
"ResolutionFunction2DGaussian_clone(ResolutionFunction2DGaussian self) -> ResolutionFunction2DGaussian\n"
"\n"
- "ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const \n"
+ "ResolutionFunction2DGaussian* ResolutionFunction2DGaussian::clone() const\n"
"\n"
""},
{ (char *)"ResolutionFunction2DGaussian_accept", _wrap_ResolutionFunction2DGaussian_accept, METH_VARARGS, (char *)"\n"
@@ -125421,13 +125379,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ResolutionFunction2DGaussian_getSigmaX", _wrap_ResolutionFunction2DGaussian_getSigmaX, METH_VARARGS, (char *)"\n"
"ResolutionFunction2DGaussian_getSigmaX(ResolutionFunction2DGaussian self) -> double\n"
"\n"
- "double ResolutionFunction2DGaussian::getSigmaX() const \n"
+ "double ResolutionFunction2DGaussian::getSigmaX() const\n"
"\n"
""},
{ (char *)"ResolutionFunction2DGaussian_getSigmaY", _wrap_ResolutionFunction2DGaussian_getSigmaY, METH_VARARGS, (char *)"\n"
"ResolutionFunction2DGaussian_getSigmaY(ResolutionFunction2DGaussian self) -> double\n"
"\n"
- "double ResolutionFunction2DGaussian::getSigmaY() const \n"
+ "double ResolutionFunction2DGaussian::getSigmaY() const\n"
"\n"
""},
{ (char *)"delete_ResolutionFunction2DGaussian", _wrap_delete_ResolutionFunction2DGaussian, METH_VARARGS, (char *)"delete_ResolutionFunction2DGaussian(ResolutionFunction2DGaussian self)"},
@@ -125443,7 +125401,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"delete_SpecularSimulation", _wrap_delete_SpecularSimulation, METH_VARARGS, (char *)"\n"
"delete_SpecularSimulation(SpecularSimulation self)\n"
"\n"
- "virtual SpecularSimulation::~SpecularSimulation() override=default\n"
+ "SpecularSimulation::~SpecularSimulation()\n"
"\n"
""},
{ (char *)"SpecularSimulation_clone", _wrap_SpecularSimulation_clone, METH_VARARGS, (char *)"\n"
@@ -125460,18 +125418,10 @@ static PyMethodDef SwigMethods[] = {
"Put into a clean state for running a simulation. \n"
"\n"
""},
- { (char *)"SpecularSimulation_runSimulation", _wrap_SpecularSimulation_runSimulation, METH_VARARGS, (char *)"\n"
- "SpecularSimulation_runSimulation(SpecularSimulation self)\n"
- "\n"
- "void SpecularSimulation::runSimulation() override\n"
- "\n"
- "Run a simulation, possibly averaged over parameter distributions. \n"
- "\n"
- ""},
{ (char *)"SpecularSimulation_accept", _wrap_SpecularSimulation_accept, METH_VARARGS, (char *)"\n"
"SpecularSimulation_accept(SpecularSimulation self, INodeVisitor visitor)\n"
"\n"
- "virtual void SpecularSimulation::accept(INodeVisitor *visitor) const overridefinal\n"
+ "virtual void SpecularSimulation::accept(INodeVisitor *visitor) const override final\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
@@ -125505,7 +125455,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
"OutputData< double > * SpecularSimulation::getDetectorIntensity(AxesUnits units_type=AxesUnits::DEFAULT) const override\n"
"\n"
- "Returns reflectivity values $Reflectivity = \\\\|R\\\\|^2$ from the upper layer in the form of OutputData<double>. \n"
+ "Returns detector count values in the form of OutputData<double>. Detector counts are proportional to $Reflectivity = |R|^2$ from the upper layer. \n"
"\n"
""},
{ (char *)"SpecularSimulation_reflectivity", _wrap_SpecularSimulation_reflectivity, METH_VARARGS, (char *)"\n"
@@ -125611,13 +125561,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SampleBuilderFactoryTemp_begin", _wrap_SampleBuilderFactoryTemp_begin, METH_VARARGS, (char *)"\n"
"SampleBuilderFactoryTemp_begin(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator\n"
"\n"
- "const_iterator IFactory< Key, AbstractProduct >::begin() const \n"
+ "const_iterator IFactory< Key, AbstractProduct >::begin() const\n"
"\n"
""},
{ (char *)"SampleBuilderFactoryTemp_end", _wrap_SampleBuilderFactoryTemp_end, METH_VARARGS, (char *)"\n"
"SampleBuilderFactoryTemp_end(SampleBuilderFactoryTemp self) -> IFactory< std::string,IMultiLayerBuilder >::const_iterator\n"
"\n"
- "const_iterator IFactory< Key, AbstractProduct >::end() const \n"
+ "const_iterator IFactory< Key, AbstractProduct >::end() const\n"
"\n"
""},
{ (char *)"SampleBuilderFactoryTemp_swigregister", SampleBuilderFactoryTemp_swigregister, METH_VARARGS, NULL},
@@ -125683,13 +125633,13 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"SimulationFactoryTemp_begin", _wrap_SimulationFactoryTemp_begin, METH_VARARGS, (char *)"\n"
"SimulationFactoryTemp_begin(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator\n"
"\n"
- "const_iterator IFactory< Key, AbstractProduct >::begin() const \n"
+ "const_iterator IFactory< Key, AbstractProduct >::begin() const\n"
"\n"
""},
{ (char *)"SimulationFactoryTemp_end", _wrap_SimulationFactoryTemp_end, METH_VARARGS, (char *)"\n"
"SimulationFactoryTemp_end(SimulationFactoryTemp self) -> IFactory< std::string,Simulation >::const_iterator\n"
"\n"
- "const_iterator IFactory< Key, AbstractProduct >::end() const \n"
+ "const_iterator IFactory< Key, AbstractProduct >::end() const\n"
"\n"
""},
{ (char *)"SimulationFactoryTemp_swigregister", SimulationFactoryTemp_swigregister, METH_VARARGS, NULL},