diff --git a/Core/Export/ExportToPython.h b/Core/Export/ExportToPython.h
index 62d24c140daceb2f78b1e87df3ad5fd0d6e0c785..e800c86b6cad264acd47087a253d7ed23fe3d3a7 100644
--- a/Core/Export/ExportToPython.h
+++ b/Core/Export/ExportToPython.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef PYGENVISITOR_H
-#define PYGENVISITOR_H
+#ifndef EXPORTTOPYTHON_H
+#define EXPORTTOPYTHON_H
#include "ISampleVisitor.h" // inheriting from
#include <string>
@@ -64,4 +64,4 @@ private:
std::ostringstream& result) const;
};
-#endif // PYGENVISITOR_H
+#endif // EXPORTTOPYTHON_H
diff --git a/Core/Export/PythonFormatting.h b/Core/Export/PythonFormatting.h
index 419293ef3e608d59720e19834d5317d803e1deb2..12694b842ad86414c63aab29dfcec450bbeeb38e 100644
--- a/Core/Export/PythonFormatting.h
+++ b/Core/Export/PythonFormatting.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef PYGENTOOLS_H
-#define PYGENTOOLS_H
+#ifndef PYTHONFORMATTING_H
+#define PYTHONFORMATTING_H
#include "Vectors3D.h"
#include <string>
@@ -47,4 +47,4 @@ namespace PythonFormatting {
std::string argumentList(const IParameterized* ip);
}
-#endif // PYGENTOOLS_H
+#endif // PYTHONFORMATTING_H
diff --git a/Core/Parametrization/DimensionedParameters.h b/Core/Parametrization/DimensionedParameters.h
index e32344be19436dc0ca0c55ae19d52ae4922b9b38..84f5d48723a5d2c6e17a3bc56da1b6f9b75d8eb2 100644
--- a/Core/Parametrization/DimensionedParameters.h
+++ b/Core/Parametrization/DimensionedParameters.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef DIMPAR_H
-#define DIMPAR_H
+#ifndef DIMENSIONEDPARAMETERS_H
+#define DIMENSIONEDPARAMETERS_H
#include "RealParameter.h" // inheriting from
@@ -63,4 +63,4 @@ public:
std::string unit() const final { return ""; }
};
-#endif // DIMPAR_H
+#endif // DIMENSIONEDPARAMETERS_H
diff --git a/Core/Parametrization/RealParameter.h b/Core/Parametrization/RealParameter.h
index 42fdd74fb1c81fc0cf90f52c45fc9601962e4458..fa8b959c3edb3b91f4119724060ebcd16daa1a1a 100644
--- a/Core/Parametrization/RealParameter.h
+++ b/Core/Parametrization/RealParameter.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef REALPARAMETERWRAPPER_H
-#define REALPARAMETERWRAPPER_H
+#ifndef REALPARAMETER_H
+#define REALPARAMETER_H
#include "INamed.h" // inheriting from
#include "AttLimits.h"
@@ -69,4 +69,4 @@ protected:
std::string fullName(); //!< For use in error messages
};
-#endif // REALPARAMETERWRAPPER_H
+#endif // REALPARAMETER_H
diff --git a/Fit/Minimizer/TrivialMinimizer.h b/Fit/Minimizer/TrivialMinimizer.h
index 615f688a0ed6872c6c2be2cf6f252f33472cf235..6c2941b7d26c34e6a46654459d7f45db788c2a64 100644
--- a/Fit/Minimizer/TrivialMinimizer.h
+++ b/Fit/Minimizer/TrivialMinimizer.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef MINIMIZERTEST_H
-#define MINIMIZERTEST_H
+#ifndef TRIVIALMINIMIZER_H
+#define TRIVIALMINIMIZER_H
#include "IMinimizer.h" // inheriting from
#include "FitSuiteParameters.h"
@@ -60,4 +60,4 @@ class BA_CORE_API_ TrivialMinimizer : public IMinimizer
function_chi2_t m_fcn;
};
-#endif // MINIMIZERTEST_H
+#endif // TRIVIALMINIMIZER_H
diff --git a/Fit/Utils/Logger.h b/Fit/Utils/Logger.h
index ee955f7a4466febb968dc17a836dca14550c7c71..7f31ed4c102f4787f9871e0853967bfbda41a0e7 100644
--- a/Fit/Utils/Logger.h
+++ b/Fit/Utils/Logger.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#ifndef MESSAGESERVICE_H
-#define MESSAGESERVICE_H
+#ifndef LOGGER_H
+#define LOGGER_H
#include <iomanip>
#include <sstream>
@@ -71,6 +71,6 @@ else MSG::Logger(level)
-#endif // MESSAGESERVICE_H
+#endif // LOGGER_H
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.h b/GUI/coregui/mainwindow/tooltipdatabase.h
index 17a267df1e7a9a299d1dad684ea7fbc2e78f3e9f..233b889e02e8a415cf891369f6b68a709003d110 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.h
+++ b/GUI/coregui/mainwindow/tooltipdatabase.h
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#ifndef TOOLTIP_DATABASE
-#define TOOLTIP_DATABASE
+#ifndef TOOLTIPDATABASE_H
+#define TOOLTIPDATABASE_H
#include <QObject>
@@ -56,7 +56,4 @@ private:
static QMap<QString, QString > m_tagToToolTip;
};
-
-
-#endif
-
+#endif // TOOLTIPDATABASE_H
diff --git a/GUI/main/appoptions.h b/GUI/main/appoptions.h
index dbd05279e61527a46428463041c2e806951fe58a..caacbc6bf1ccac92bf77b012b58e7e119bc4aa3d 100644
--- a/GUI/main/appoptions.h
+++ b/GUI/main/appoptions.h
@@ -70,4 +70,4 @@ private:
-#endif
+#endif // APPOPTIONS_H
diff --git a/GUI/main/stacktracesetup.h b/GUI/main/stacktracesetup.h
index 255653034e9a3b6e6f656c18973c99cc46e4b7fd..355c2979c2231575a3254508ed004dab210dc4d0 100644
--- a/GUI/main/stacktracesetup.h
+++ b/GUI/main/stacktracesetup.h
@@ -8,4 +8,4 @@ public:
};
-#endif
+#endif // STACKTRACESETUP_H
diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i
index 1b95a1d0fe2f1e6e2e2c09706bfbae7000a0d6e0..55e3e172fc1abb7b25aad9ebdacbf1feaac6a7a4 100644
--- a/auto/Wrap/doxygen_core.i
+++ b/auto/Wrap/doxygen_core.i
@@ -1494,6 +1494,31 @@ Returns true if area defined by two bins is inside or on border of ellipse. More
";
+// File: classExportToPython.xml
+%feature("docstring") ExportToPython "";
+
+%feature("docstring") ExportToPython::ExportToPython "ExportToPython::ExportToPython(const MultiLayer &multilayer)
+";
+
+%feature("docstring") ExportToPython::~ExportToPython "ExportToPython::~ExportToPython()
+";
+
+%feature("docstring") ExportToPython::writePyScript "std::string ExportToPython::writePyScript(const GISASSimulation *simulation, const std::string &output_filename)
+";
+
+%feature("docstring") ExportToPython::definePreamble "std::string ExportToPython::definePreamble() const
+";
+
+%feature("docstring") ExportToPython::defineGetSimulation "std::string ExportToPython::defineGetSimulation(const GISASSimulation *simulation) const
+";
+
+%feature("docstring") ExportToPython::defineGetSample "std::string ExportToPython::defineGetSample() const
+";
+
+%feature("docstring") ExportToPython::defineMaterials "std::string ExportToPython::defineMaterials() const
+";
+
+
// File: classExceptions_1_1FileIsBadException.xml
%feature("docstring") Exceptions::FileIsBadException "";
@@ -4708,7 +4733,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction1DCauchy::~FTDecayFunction1DCauchy "virtual FTDecayFunction1DCauchy::~FTDecayFunction1DCauchy()
";
-%feature("docstring") FTDecayFunction1DCauchy::clone "FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const
+%feature("docstring") FTDecayFunction1DCauchy::clone "virtual FTDecayFunction1DCauchy* FTDecayFunction1DCauchy::clone() const
";
%feature("docstring") FTDecayFunction1DCauchy::evaluate "double FTDecayFunction1DCauchy::evaluate(double q) const
@@ -4729,7 +4754,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction1DGauss::~FTDecayFunction1DGauss "virtual FTDecayFunction1DGauss::~FTDecayFunction1DGauss()
";
-%feature("docstring") FTDecayFunction1DGauss::clone "FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const
+%feature("docstring") FTDecayFunction1DGauss::clone "virtual FTDecayFunction1DGauss* FTDecayFunction1DGauss::clone() const
";
%feature("docstring") FTDecayFunction1DGauss::evaluate "double FTDecayFunction1DGauss::evaluate(double q) const
@@ -4750,7 +4775,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction1DTriangle::~FTDecayFunction1DTriangle "virtual FTDecayFunction1DTriangle::~FTDecayFunction1DTriangle()
";
-%feature("docstring") FTDecayFunction1DTriangle::clone "FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const
+%feature("docstring") FTDecayFunction1DTriangle::clone "virtual FTDecayFunction1DTriangle* FTDecayFunction1DTriangle::clone() const
";
%feature("docstring") FTDecayFunction1DTriangle::evaluate "double FTDecayFunction1DTriangle::evaluate(double q) const
@@ -4771,7 +4796,7 @@ C++ includes: FTDecayFunctions.h
%feature("docstring") FTDecayFunction1DVoigt::~FTDecayFunction1DVoigt "virtual FTDecayFunction1DVoigt::~FTDecayFunction1DVoigt()
";
-%feature("docstring") FTDecayFunction1DVoigt::clone "FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const
+%feature("docstring") FTDecayFunction1DVoigt::clone "virtual FTDecayFunction1DVoigt* FTDecayFunction1DVoigt::clone() const
";
%feature("docstring") FTDecayFunction1DVoigt::evaluate "double FTDecayFunction1DVoigt::evaluate(double q) const
@@ -4789,13 +4814,13 @@ C++ includes: FTDecayFunctions.h
C++ includes: FTDecayFunctions.h
";
-%feature("docstring") FTDecayFunction2DCauchy::FTDecayFunction2DCauchy "FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y)
+%feature("docstring") FTDecayFunction2DCauchy::FTDecayFunction2DCauchy "FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDecayFunction2DCauchy::~FTDecayFunction2DCauchy "virtual FTDecayFunction2DCauchy::~FTDecayFunction2DCauchy()
";
-%feature("docstring") FTDecayFunction2DCauchy::clone "FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const
+%feature("docstring") FTDecayFunction2DCauchy::clone "virtual FTDecayFunction2DCauchy* FTDecayFunction2DCauchy::clone() const
";
%feature("docstring") FTDecayFunction2DCauchy::evaluate "double FTDecayFunction2DCauchy::evaluate(double qx, double qy) const
@@ -4812,13 +4837,13 @@ evaluate Fourier transformed decay function for q in X,Y coordinates
C++ includes: FTDecayFunctions.h
";
-%feature("docstring") FTDecayFunction2DGauss::FTDecayFunction2DGauss "FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y)
+%feature("docstring") FTDecayFunction2DGauss::FTDecayFunction2DGauss "FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDecayFunction2DGauss::~FTDecayFunction2DGauss "virtual FTDecayFunction2DGauss::~FTDecayFunction2DGauss()
";
-%feature("docstring") FTDecayFunction2DGauss::clone "FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const
+%feature("docstring") FTDecayFunction2DGauss::clone "virtual FTDecayFunction2DGauss* FTDecayFunction2DGauss::clone() const
";
%feature("docstring") FTDecayFunction2DGauss::evaluate "double FTDecayFunction2DGauss::evaluate(double qx, double qy) const
@@ -4835,13 +4860,13 @@ evaluate Fourier transformed decay function for q in X,Y coordinates
C++ includes: FTDecayFunctions.h
";
-%feature("docstring") FTDecayFunction2DVoigt::FTDecayFunction2DVoigt "FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta)
+%feature("docstring") FTDecayFunction2DVoigt::FTDecayFunction2DVoigt "FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDecayFunction2DVoigt::~FTDecayFunction2DVoigt "virtual FTDecayFunction2DVoigt::~FTDecayFunction2DVoigt()
";
-%feature("docstring") FTDecayFunction2DVoigt::clone "FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const
+%feature("docstring") FTDecayFunction2DVoigt::clone "virtual FTDecayFunction2DVoigt* FTDecayFunction2DVoigt::clone() const
";
%feature("docstring") FTDecayFunction2DVoigt::evaluate "double FTDecayFunction2DVoigt::evaluate(double qx, double qy) const
@@ -4856,9 +4881,9 @@ evaluate Fourier transformed decay function for q in X,Y coordinates
// File: classFTDistribution1DCauchy.xml
%feature("docstring") FTDistribution1DCauchy "
-1 dimensional Cauchy distribution in Fourier space. Corresponds to a normalized exp(-|x|) in real space
+1 dimensional Cauchy distribution in Fourier space. Corresponds to a normalized exp(-|x|) in real space.
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions1D.h
";
%feature("docstring") FTDistribution1DCauchy::FTDistribution1DCauchy "FTDistribution1DCauchy::FTDistribution1DCauchy(double omega)
@@ -4877,9 +4902,9 @@ C++ includes: FTDistributions.h
// File: classFTDistribution1DCosine.xml
%feature("docstring") FTDistribution1DCosine "
-1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1+cos(pi*x/omega) if |x|<omega (and 0 otherwise) in real space
+1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1+cos(pi*x/omega) if |x|<omega (and 0 otherwise) in real space.
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions1D.h
";
%feature("docstring") FTDistribution1DCosine::FTDistribution1DCosine "FTDistribution1DCosine::FTDistribution1DCosine(double omega)
@@ -4898,9 +4923,9 @@ C++ includes: FTDistributions.h
// File: classFTDistribution1DGate.xml
%feature("docstring") FTDistribution1DGate "
-1 dimensional Gate distribution in Fourier space. Corresponds to a normalized constant if |x|<omega (and 0 otherwise) in real space
+1 dimensional Gate distribution in Fourier space. Corresponds to a normalized constant if |x|<omega (and 0 otherwise) in real space.
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions1D.h
";
%feature("docstring") FTDistribution1DGate::FTDistribution1DGate "FTDistribution1DGate::FTDistribution1DGate(double omega)
@@ -4919,9 +4944,9 @@ C++ includes: FTDistributions.h
// File: classFTDistribution1DGauss.xml
%feature("docstring") FTDistribution1DGauss "
-1 dimensional Gauss distribution in Fourier space. Corresponds to a normalized exp(-x^2) in real space
+1 dimensional Gauss distribution in Fourier space. Corresponds to a normalized exp(-x^2) in real space.
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions1D.h
";
%feature("docstring") FTDistribution1DGauss::FTDistribution1DGauss "FTDistribution1DGauss::FTDistribution1DGauss(double omega)
@@ -4940,9 +4965,9 @@ C++ includes: FTDistributions.h
// File: classFTDistribution1DTriangle.xml
%feature("docstring") FTDistribution1DTriangle "
-1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1-|x|/omega if |x|<omega (and 0 otherwise) in real space
+1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1-|x|/omega if |x|<omega (and 0 otherwise) in real space.
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions1D.h
";
%feature("docstring") FTDistribution1DTriangle::FTDistribution1DTriangle "FTDistribution1DTriangle::FTDistribution1DTriangle(double omega)
@@ -4963,7 +4988,7 @@ C++ includes: FTDistributions.h
1 dimensional Voigt distribution in Fourier space. Corresponds to eta*Gauss + (1-eta)*Cauchy
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions1D.h
";
%feature("docstring") FTDistribution1DVoigt::FTDistribution1DVoigt "FTDistribution1DVoigt::FTDistribution1DVoigt(double omega, double eta)
@@ -4987,16 +5012,16 @@ C++ includes: FTDistributions.h
2 dimensional Cauchy distribution in Fourier space. Corresponds to a normalized exp(-r) in real space with $r=\\\\sqrt{(\\\\frac{x}{\\\\omega_x})^2 + (\\\\frac{y}{\\\\omega_y})^2}$
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions2D.h
";
-%feature("docstring") FTDistribution2DCauchy::FTDistribution2DCauchy "FTDistribution2DCauchy::FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y)
+%feature("docstring") FTDistribution2DCauchy::FTDistribution2DCauchy "FTDistribution2DCauchy::FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDistribution2DCauchy::~FTDistribution2DCauchy "virtual FTDistribution2DCauchy::~FTDistribution2DCauchy()
";
-%feature("docstring") FTDistribution2DCauchy::clone "FTDistribution2DCauchy * FTDistribution2DCauchy::clone() const
+%feature("docstring") FTDistribution2DCauchy::clone "FTDistribution2DCauchy* FTDistribution2DCauchy::clone() const final
";
%feature("docstring") FTDistribution2DCauchy::evaluate "double FTDistribution2DCauchy::evaluate(double qx, double qy) const
@@ -5010,16 +5035,16 @@ evaluate Fourier transformed distribution for q in X,Y coordinates the original
2 dimensional cone distribution in Fourier space. Corresponds to 1-r if r<1 (and 0 otherwise) in real space with $r=\\\\sqrt{(\\\\frac{x}{\\\\omega_x})^2 + (\\\\frac{y}{\\\\omega_y})^2}$
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions2D.h
";
-%feature("docstring") FTDistribution2DCone::FTDistribution2DCone "FTDistribution2DCone::FTDistribution2DCone(double coherence_length_x, double coherence_length_y)
+%feature("docstring") FTDistribution2DCone::FTDistribution2DCone "FTDistribution2DCone::FTDistribution2DCone(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDistribution2DCone::~FTDistribution2DCone "virtual FTDistribution2DCone::~FTDistribution2DCone()
";
-%feature("docstring") FTDistribution2DCone::clone "FTDistribution2DCone * FTDistribution2DCone::clone() const
+%feature("docstring") FTDistribution2DCone::clone "FTDistribution2DCone* FTDistribution2DCone::clone() const final
";
%feature("docstring") FTDistribution2DCone::evaluate "double FTDistribution2DCone::evaluate(double qx, double qy) const
@@ -5033,16 +5058,16 @@ evaluate Fourier transformed distribution for q in X,Y coordinates the original
2 dimensional gate distribution in Fourier space Corresponds to normalized constant if r<1 (and 0 otherwise) in real space. with $r=\\\\sqrt{(\\\\frac{x}{\\\\omega_x})^2 + (\\\\frac{y}{\\\\omega_y})^2}$
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions2D.h
";
-%feature("docstring") FTDistribution2DGate::FTDistribution2DGate "FTDistribution2DGate::FTDistribution2DGate(double coherence_length_x, double coherence_length_y)
+%feature("docstring") FTDistribution2DGate::FTDistribution2DGate "FTDistribution2DGate::FTDistribution2DGate(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDistribution2DGate::~FTDistribution2DGate "virtual FTDistribution2DGate::~FTDistribution2DGate()
";
-%feature("docstring") FTDistribution2DGate::clone "FTDistribution2DGate * FTDistribution2DGate::clone() const
+%feature("docstring") FTDistribution2DGate::clone "FTDistribution2DGate* FTDistribution2DGate::clone() const final
";
%feature("docstring") FTDistribution2DGate::evaluate "double FTDistribution2DGate::evaluate(double qx, double qy) const
@@ -5056,16 +5081,16 @@ evaluate Fourier transformed distribution for q in X,Y coordinates the original
2 dimensional Gauss distribution in Fourier space. Corresponds to normalized exp(-r^2/2) in real space with $r=\\\\sqrt{(\\\\frac{x}{\\\\omega_x})^2 + (\\\\frac{y}{\\\\omega_y})^2}$
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions2D.h
";
-%feature("docstring") FTDistribution2DGauss::FTDistribution2DGauss "FTDistribution2DGauss::FTDistribution2DGauss(double coherence_length_x, double coherence_length_y)
+%feature("docstring") FTDistribution2DGauss::FTDistribution2DGauss "FTDistribution2DGauss::FTDistribution2DGauss(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDistribution2DGauss::~FTDistribution2DGauss "virtual FTDistribution2DGauss::~FTDistribution2DGauss()
";
-%feature("docstring") FTDistribution2DGauss::clone "FTDistribution2DGauss * FTDistribution2DGauss::clone() const
+%feature("docstring") FTDistribution2DGauss::clone "FTDistribution2DGauss* FTDistribution2DGauss::clone() const final
";
%feature("docstring") FTDistribution2DGauss::evaluate "double FTDistribution2DGauss::evaluate(double qx, double qy) const
@@ -5079,16 +5104,16 @@ evaluate Fourier transformed distribution for q in X,Y coordinates the original
2 dimensional Voigt distribution in Fourier space. Corresponds to eta*Gauss + (1-eta)*Cauchy
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions2D.h
";
-%feature("docstring") FTDistribution2DVoigt::FTDistribution2DVoigt "FTDistribution2DVoigt::FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta)
+%feature("docstring") FTDistribution2DVoigt::FTDistribution2DVoigt "FTDistribution2DVoigt::FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") FTDistribution2DVoigt::~FTDistribution2DVoigt "virtual FTDistribution2DVoigt::~FTDistribution2DVoigt()
";
-%feature("docstring") FTDistribution2DVoigt::clone "FTDistribution2DVoigt * FTDistribution2DVoigt::clone() const
+%feature("docstring") FTDistribution2DVoigt::clone "FTDistribution2DVoigt* FTDistribution2DVoigt::clone() const final
";
%feature("docstring") FTDistribution2DVoigt::evaluate "double FTDistribution2DVoigt::evaluate(double qx, double qy) const
@@ -6487,7 +6512,7 @@ Interface for 2 dimensional decay function in reciprocal space.
C++ includes: FTDecayFunctions.h
";
-%feature("docstring") IFTDecayFunction2D::IFTDecayFunction2D "IFTDecayFunction2D::IFTDecayFunction2D(double decay_length_x, double decay_length_y)
+%feature("docstring") IFTDecayFunction2D::IFTDecayFunction2D "IFTDecayFunction2D::IFTDecayFunction2D(double decay_length_x, double decay_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") IFTDecayFunction2D::~IFTDecayFunction2D "virtual IFTDecayFunction2D::~IFTDecayFunction2D()
@@ -6537,7 +6562,7 @@ transform back to a*, b* basis:
Interface for 1 dimensional distributions in Fourier space.
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions1D.h
";
%feature("docstring") IFTDistribution1D::IFTDistribution1D "IFTDistribution1D::IFTDistribution1D(double omega)
@@ -6564,10 +6589,10 @@ C++ includes: FTDistributions.h
Interface for 2 dimensional distributions in Fourier space.
-C++ includes: FTDistributions.h
+C++ includes: FTDistributions2D.h
";
-%feature("docstring") IFTDistribution2D::IFTDistribution2D "IFTDistribution2D::IFTDistribution2D(double coherence_length_x, double coherence_length_y)
+%feature("docstring") IFTDistribution2D::IFTDistribution2D "IFTDistribution2D::IFTDistribution2D(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
";
%feature("docstring") IFTDistribution2D::~IFTDistribution2D "virtual IFTDistribution2D::~IFTDistribution2D()
@@ -7795,7 +7820,7 @@ C++ includes: InterferenceFunctionRadialParaCrystal.h
Returns a clone of this ISample object.
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::accept "void InterferenceFunctionRadialParaCrystal::accept(ISampleVisitor *visitor) const
+%feature("docstring") InterferenceFunctionRadialParaCrystal::accept "void InterferenceFunctionRadialParaCrystal::accept(ISampleVisitor *visitor) const final
Calls ISampleVisitor::visit.
";
@@ -7805,24 +7830,18 @@ Calls ISampleVisitor::visit.
Returns textual representation of *this and its descendants.
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::setDomainSize "void InterferenceFunctionRadialParaCrystal::setDomainSize(double size)
-
-Sets size of coherence domain.
+%feature("docstring") InterferenceFunctionRadialParaCrystal::setKappa "void InterferenceFunctionRadialParaCrystal::setKappa(double kappa)
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::getDomainSize "double InterferenceFunctionRadialParaCrystal::getDomainSize() const
+%feature("docstring") InterferenceFunctionRadialParaCrystal::getKappa "virtual double InterferenceFunctionRadialParaCrystal::getKappa() const
-Returns size of coherence domain.
+Retrieves the size-distance coupling constant (default 0.0)
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::setKappa "void InterferenceFunctionRadialParaCrystal::setKappa(double kappa)
-
-Sets size-spacing coupling parameter.
+%feature("docstring") InterferenceFunctionRadialParaCrystal::setDomainSize "void InterferenceFunctionRadialParaCrystal::setDomainSize(double size)
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::getKappa "virtual double InterferenceFunctionRadialParaCrystal::getKappa() const
-
-Gets size-spacing coupling parameter.
+%feature("docstring") InterferenceFunctionRadialParaCrystal::getDomainSize "double InterferenceFunctionRadialParaCrystal::getDomainSize() const
";
%feature("docstring") InterferenceFunctionRadialParaCrystal::evaluate "double InterferenceFunctionRadialParaCrystal::evaluate(const kvector_t q) const
@@ -7834,13 +7853,9 @@ Evaluates the interference function for a given wavevector transfer (only the re
";
%feature("docstring") InterferenceFunctionRadialParaCrystal::setProbabilityDistribution "void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(const IFTDistribution1D &pdf)
-
-Sets the Fourier transformed probability distribution of the nearest particle.
";
-%feature("docstring") InterferenceFunctionRadialParaCrystal::getProbabilityDistribution "const IFTDistribution1D * InterferenceFunctionRadialParaCrystal::getProbabilityDistribution() const
-
-Gets the Fourier transformed probability distribution of the nearest particle.
+%feature("docstring") InterferenceFunctionRadialParaCrystal::getProbabilityDistribution "const IFTDistribution1D* InterferenceFunctionRadialParaCrystal::getProbabilityDistribution() const
";
%feature("docstring") InterferenceFunctionRadialParaCrystal::getPeakDistance "double InterferenceFunctionRadialParaCrystal::getPeakDistance() const
@@ -11453,31 +11468,6 @@ finalize report to the simulation
";
-// File: classExportToPython.xml
-%feature("docstring") ExportToPython "";
-
-%feature("docstring") ExportToPython::ExportToPython "ExportToPython::ExportToPython(const MultiLayer &multilayer)
-";
-
-%feature("docstring") ExportToPython::~ExportToPython "ExportToPython::~ExportToPython()
-";
-
-%feature("docstring") ExportToPython::writePyScript "std::string ExportToPython::writePyScript(const GISASSimulation *simulation, const std::string &output_filename)
-";
-
-%feature("docstring") ExportToPython::definePreamble "std::string ExportToPython::definePreamble() const
-";
-
-%feature("docstring") ExportToPython::defineGetSimulation "std::string ExportToPython::defineGetSimulation(const GISASSimulation *simulation) const
-";
-
-%feature("docstring") ExportToPython::defineGetSample "std::string ExportToPython::defineGetSample() const
-";
-
-%feature("docstring") ExportToPython::defineMaterials "std::string ExportToPython::defineMaterials() const
-";
-
-
// File: classRadialParaCrystalBuilder.xml
%feature("docstring") RadialParaCrystalBuilder "
@@ -13393,13 +13383,13 @@ C++ includes: WavevectorInfo.h
// File: classMathFunctions_1_1Convolve_1_1Workspace.xml
-// File: namespace_0D291.xml
+// File: namespace_0D293.xml
-// File: namespace_0D364.xml
+// File: namespace_0D366.xml
-// File: namespace_0D430.xml
+// File: namespace_0D432.xml
// File: namespaceboost_1_1geometry.xml
@@ -13848,10 +13838,16 @@ enables exception throw in the case of NaN, Inf
// File: FTDecayFunctions_8h.xml
-// File: FTDistributions_8cpp.xml
+// File: FTDistributions1D_8cpp.xml
+
+
+// File: FTDistributions1D_8h.xml
+
+// File: FTDistributions2D_8cpp.xml
-// File: FTDistributions_8h.xml
+
+// File: FTDistributions2D_8h.xml
// File: IInterferenceFunction_8cpp.xml
@@ -13996,16 +13992,16 @@ global helper function for comparison of axes
// File: VariableBinAxis_8h.xml
-// File: PythonFormatting_8cpp.xml
+// File: ExportToPython_8cpp.xml
-// File: PythonFormatting_8h.xml
+// File: ExportToPython_8h.xml
-// File: ExportToPython_8cpp.xml
+// File: PythonFormatting_8cpp.xml
-// File: ExportToPython_8h.xml
+// File: PythonFormatting_8h.xml
// File: SampleLabelHandler_8cpp.xml
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 7e2147f615f671823869b86938755133dfeb76f9..cd801ac7f4d8e4b45d979752cc8389d535befb0a 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -8399,7 +8399,7 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DCauchy self) -> FTDecayFunction1DCauchy
- FTDecayFunction1DCauchy * FTDecayFunction1DCauchy::clone() const
+ virtual FTDecayFunction1DCauchy* FTDecayFunction1DCauchy::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DCauchy_clone(self)
@@ -8455,7 +8455,7 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DGauss self) -> FTDecayFunction1DGauss
- FTDecayFunction1DGauss * FTDecayFunction1DGauss::clone() const
+ virtual FTDecayFunction1DGauss* FTDecayFunction1DGauss::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DGauss_clone(self)
@@ -8511,7 +8511,7 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DTriangle self) -> FTDecayFunction1DTriangle
- FTDecayFunction1DTriangle * FTDecayFunction1DTriangle::clone() const
+ virtual FTDecayFunction1DTriangle* FTDecayFunction1DTriangle::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DTriangle_clone(self)
@@ -8567,7 +8567,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
"""
clone(FTDecayFunction1DVoigt self) -> FTDecayFunction1DVoigt
- FTDecayFunction1DVoigt * FTDecayFunction1DVoigt::clone() const
+ virtual FTDecayFunction1DVoigt* FTDecayFunction1DVoigt::clone() const
"""
return _libBornAgainCore.FTDecayFunction1DVoigt_clone(self)
@@ -8740,7 +8740,7 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
__init__(FTDecayFunction2DCauchy self, double decay_length_x, double decay_length_y, double gamma=0) -> FTDecayFunction2DCauchy
__init__(FTDecayFunction2DCauchy self, double decay_length_x, double decay_length_y) -> FTDecayFunction2DCauchy
- FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y)
+ FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDecayFunction2DCauchy(*args)
@@ -8755,7 +8755,7 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
"""
clone(FTDecayFunction2DCauchy self) -> FTDecayFunction2DCauchy
- FTDecayFunction2DCauchy * FTDecayFunction2DCauchy::clone() const
+ virtual FTDecayFunction2DCauchy* FTDecayFunction2DCauchy::clone() const
"""
return _libBornAgainCore.FTDecayFunction2DCauchy_clone(self)
@@ -8800,7 +8800,7 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
__init__(FTDecayFunction2DGauss self, double decay_length_x, double decay_length_y, double gamma=0) -> FTDecayFunction2DGauss
__init__(FTDecayFunction2DGauss self, double decay_length_x, double decay_length_y) -> FTDecayFunction2DGauss
- FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y)
+ FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDecayFunction2DGauss(*args)
@@ -8815,7 +8815,7 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
"""
clone(FTDecayFunction2DGauss self) -> FTDecayFunction2DGauss
- FTDecayFunction2DGauss * FTDecayFunction2DGauss::clone() const
+ virtual FTDecayFunction2DGauss* FTDecayFunction2DGauss::clone() const
"""
return _libBornAgainCore.FTDecayFunction2DGauss_clone(self)
@@ -8860,7 +8860,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
__init__(FTDecayFunction2DVoigt self, double decay_length_x, double decay_length_y, double eta, double gamma=0) -> FTDecayFunction2DVoigt
__init__(FTDecayFunction2DVoigt self, double decay_length_x, double decay_length_y, double eta) -> FTDecayFunction2DVoigt
- FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta)
+ FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDecayFunction2DVoigt(*args)
@@ -8875,7 +8875,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
"""
clone(FTDecayFunction2DVoigt self) -> FTDecayFunction2DVoigt
- FTDecayFunction2DVoigt * FTDecayFunction2DVoigt::clone() const
+ virtual FTDecayFunction2DVoigt* FTDecayFunction2DVoigt::clone() const
"""
return _libBornAgainCore.FTDecayFunction2DVoigt_clone(self)
@@ -8911,7 +8911,7 @@ class IFTDistribution1D(IParameterized):
Interface for 1 dimensional distributions in Fourier space.
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions1D.h
"""
__swig_setmethods__ = {}
@@ -8975,9 +8975,9 @@ class FTDistribution1DCauchy(IFTDistribution1D):
"""
- 1 dimensional Cauchy distribution in Fourier space. Corresponds to a normalized exp(-|x|) in real space
+ 1 dimensional Cauchy distribution in Fourier space. Corresponds to a normalized exp(-|x|) in real space.
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions1D.h
"""
__swig_setmethods__ = {}
@@ -9031,9 +9031,9 @@ class FTDistribution1DGauss(IFTDistribution1D):
"""
- 1 dimensional Gauss distribution in Fourier space. Corresponds to a normalized exp(-x^2) in real space
+ 1 dimensional Gauss distribution in Fourier space. Corresponds to a normalized exp(-x^2) in real space.
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions1D.h
"""
__swig_setmethods__ = {}
@@ -9087,9 +9087,9 @@ class FTDistribution1DGate(IFTDistribution1D):
"""
- 1 dimensional Gate distribution in Fourier space. Corresponds to a normalized constant if |x|<omega (and 0 otherwise) in real space
+ 1 dimensional Gate distribution in Fourier space. Corresponds to a normalized constant if |x|<omega (and 0 otherwise) in real space.
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions1D.h
"""
__swig_setmethods__ = {}
@@ -9143,9 +9143,9 @@ class FTDistribution1DTriangle(IFTDistribution1D):
"""
- 1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1-|x|/omega if |x|<omega (and 0 otherwise) in real space
+ 1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1-|x|/omega if |x|<omega (and 0 otherwise) in real space.
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions1D.h
"""
__swig_setmethods__ = {}
@@ -9199,9 +9199,9 @@ class FTDistribution1DCosine(IFTDistribution1D):
"""
- 1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1+cos(pi*x/omega) if |x|<omega (and 0 otherwise) in real space
+ 1 dimensional triangle distribution in Fourier space. Corresponds to a normalized 1+cos(pi*x/omega) if |x|<omega (and 0 otherwise) in real space.
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions1D.h
"""
__swig_setmethods__ = {}
@@ -9257,7 +9257,7 @@ class FTDistribution1DVoigt(IFTDistribution1D):
1 dimensional Voigt distribution in Fourier space. Corresponds to eta*Gauss + (1-eta)*Cauchy
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions1D.h
"""
__swig_setmethods__ = {}
@@ -9323,7 +9323,7 @@ class IFTDistribution2D(IParameterized):
Interface for 2 dimensional distributions in Fourier space.
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions2D.h
"""
__swig_setmethods__ = {}
@@ -9421,7 +9421,7 @@ class FTDistribution2DCauchy(IFTDistribution2D):
2 dimensional Cauchy distribution in Fourier space. Corresponds to a normalized exp(-r) in real space with $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions2D.h
"""
__swig_setmethods__ = {}
@@ -9440,7 +9440,7 @@ class FTDistribution2DCauchy(IFTDistribution2D):
__init__(FTDistribution2DCauchy self, double coherence_length_x, double coherence_length_y, double gamma=0) -> FTDistribution2DCauchy
__init__(FTDistribution2DCauchy self, double coherence_length_x, double coherence_length_y) -> FTDistribution2DCauchy
- FTDistribution2DCauchy::FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y)
+ FTDistribution2DCauchy::FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDistribution2DCauchy(*args)
@@ -9455,7 +9455,7 @@ class FTDistribution2DCauchy(IFTDistribution2D):
"""
clone(FTDistribution2DCauchy self) -> FTDistribution2DCauchy
- FTDistribution2DCauchy * FTDistribution2DCauchy::clone() const
+ FTDistribution2DCauchy* FTDistribution2DCauchy::clone() const final
"""
return _libBornAgainCore.FTDistribution2DCauchy_clone(self)
@@ -9481,7 +9481,7 @@ class FTDistribution2DGauss(IFTDistribution2D):
2 dimensional Gauss distribution in Fourier space. Corresponds to normalized exp(-r^2/2) in real space with $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions2D.h
"""
__swig_setmethods__ = {}
@@ -9500,7 +9500,7 @@ class FTDistribution2DGauss(IFTDistribution2D):
__init__(FTDistribution2DGauss self, double coherence_length_x, double coherence_length_y, double gamma=0) -> FTDistribution2DGauss
__init__(FTDistribution2DGauss self, double coherence_length_x, double coherence_length_y) -> FTDistribution2DGauss
- FTDistribution2DGauss::FTDistribution2DGauss(double coherence_length_x, double coherence_length_y)
+ FTDistribution2DGauss::FTDistribution2DGauss(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDistribution2DGauss(*args)
@@ -9515,7 +9515,7 @@ class FTDistribution2DGauss(IFTDistribution2D):
"""
clone(FTDistribution2DGauss self) -> FTDistribution2DGauss
- FTDistribution2DGauss * FTDistribution2DGauss::clone() const
+ FTDistribution2DGauss* FTDistribution2DGauss::clone() const final
"""
return _libBornAgainCore.FTDistribution2DGauss_clone(self)
@@ -9541,7 +9541,7 @@ class FTDistribution2DGate(IFTDistribution2D):
2 dimensional gate distribution in Fourier space Corresponds to normalized constant if r<1 (and 0 otherwise) in real space. with $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions2D.h
"""
__swig_setmethods__ = {}
@@ -9560,7 +9560,7 @@ class FTDistribution2DGate(IFTDistribution2D):
__init__(FTDistribution2DGate self, double coherence_length_x, double coherence_length_y, double gamma=0) -> FTDistribution2DGate
__init__(FTDistribution2DGate self, double coherence_length_x, double coherence_length_y) -> FTDistribution2DGate
- FTDistribution2DGate::FTDistribution2DGate(double coherence_length_x, double coherence_length_y)
+ FTDistribution2DGate::FTDistribution2DGate(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDistribution2DGate(*args)
@@ -9575,7 +9575,7 @@ class FTDistribution2DGate(IFTDistribution2D):
"""
clone(FTDistribution2DGate self) -> FTDistribution2DGate
- FTDistribution2DGate * FTDistribution2DGate::clone() const
+ FTDistribution2DGate* FTDistribution2DGate::clone() const final
"""
return _libBornAgainCore.FTDistribution2DGate_clone(self)
@@ -9601,7 +9601,7 @@ class FTDistribution2DCone(IFTDistribution2D):
2 dimensional cone distribution in Fourier space. Corresponds to 1-r if r<1 (and 0 otherwise) in real space with $r=\\sqrt{(\\frac{x}{\\omega_x})^2 + (\\frac{y}{\\omega_y})^2}$
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions2D.h
"""
__swig_setmethods__ = {}
@@ -9620,7 +9620,7 @@ class FTDistribution2DCone(IFTDistribution2D):
__init__(FTDistribution2DCone self, double coherence_length_x, double coherence_length_y, double gamma=0) -> FTDistribution2DCone
__init__(FTDistribution2DCone self, double coherence_length_x, double coherence_length_y) -> FTDistribution2DCone
- FTDistribution2DCone::FTDistribution2DCone(double coherence_length_x, double coherence_length_y)
+ FTDistribution2DCone::FTDistribution2DCone(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDistribution2DCone(*args)
@@ -9635,7 +9635,7 @@ class FTDistribution2DCone(IFTDistribution2D):
"""
clone(FTDistribution2DCone self) -> FTDistribution2DCone
- FTDistribution2DCone * FTDistribution2DCone::clone() const
+ FTDistribution2DCone* FTDistribution2DCone::clone() const final
"""
return _libBornAgainCore.FTDistribution2DCone_clone(self)
@@ -9661,7 +9661,7 @@ class FTDistribution2DVoigt(IFTDistribution2D):
2 dimensional Voigt distribution in Fourier space. Corresponds to eta*Gauss + (1-eta)*Cauchy
- C++ includes: FTDistributions.h
+ C++ includes: FTDistributions2D.h
"""
__swig_setmethods__ = {}
@@ -9680,7 +9680,7 @@ class FTDistribution2DVoigt(IFTDistribution2D):
__init__(FTDistribution2DVoigt self, double coherence_length_x, double coherence_length_y, double eta, double gamma=0) -> FTDistribution2DVoigt
__init__(FTDistribution2DVoigt self, double coherence_length_x, double coherence_length_y, double eta) -> FTDistribution2DVoigt
- FTDistribution2DVoigt::FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta)
+ FTDistribution2DVoigt::FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta, double gamma=0, double delta=Units::PID2)
"""
this = _libBornAgainCore.new_FTDistribution2DVoigt(*args)
@@ -9695,7 +9695,7 @@ class FTDistribution2DVoigt(IFTDistribution2D):
"""
clone(FTDistribution2DVoigt self) -> FTDistribution2DVoigt
- FTDistribution2DVoigt * FTDistribution2DVoigt::clone() const
+ FTDistribution2DVoigt* FTDistribution2DVoigt::clone() const final
"""
return _libBornAgainCore.FTDistribution2DVoigt_clone(self)
@@ -18890,7 +18890,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
"""
accept(InterferenceFunctionRadialParaCrystal self, ISampleVisitor visitor)
- void InterferenceFunctionRadialParaCrystal::accept(ISampleVisitor *visitor) const
+ void InterferenceFunctionRadialParaCrystal::accept(ISampleVisitor *visitor) const final
Calls ISampleVisitor::visit.
@@ -18917,8 +18917,6 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
void InterferenceFunctionRadialParaCrystal::setKappa(double kappa)
- Sets size-spacing coupling parameter.
-
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_setKappa(self, kappa)
@@ -18929,7 +18927,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
virtual double InterferenceFunctionRadialParaCrystal::getKappa() const
- Gets size-spacing coupling parameter.
+ Retrieves the size-distance coupling constant (default 0.0)
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_getKappa(self)
@@ -18941,8 +18939,6 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
void InterferenceFunctionRadialParaCrystal::setDomainSize(double size)
- Sets size of coherence domain.
-
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_setDomainSize(self, size)
@@ -18951,9 +18947,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
"""
getDomainSize(InterferenceFunctionRadialParaCrystal self) -> double
- double InterferenceFunctionRadialParaCrystal::getDomainSize() const
-
- Returns size of coherence domain.
+ double InterferenceFunctionRadialParaCrystal::getDomainSize() const
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_getDomainSize(self)
@@ -18987,8 +18981,6 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(const IFTDistribution1D &pdf)
- Sets the Fourier transformed probability distribution of the nearest particle.
-
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_setProbabilityDistribution(self, pdf)
@@ -18997,9 +18989,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction):
"""
getProbabilityDistribution(InterferenceFunctionRadialParaCrystal self) -> IFTDistribution1D
- const IFTDistribution1D * InterferenceFunctionRadialParaCrystal::getProbabilityDistribution() const
-
- Gets the Fourier transformed probability distribution of the nearest particle.
+ const IFTDistribution1D* InterferenceFunctionRadialParaCrystal::getProbabilityDistribution() const
"""
return _libBornAgainCore.InterferenceFunctionRadialParaCrystal_getProbabilityDistribution(self)
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 1c51bbf71b674e005db0fc56b1d9a3ff8f87dbc6..603fed03e1e3d06b78edac3d95728f958b5d8dc1 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -104743,7 +104743,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"
+ "virtual FTDecayFunction1DCauchy* FTDecayFunction1DCauchy::clone() const \n"
"\n"
""},
{ (char *)"FTDecayFunction1DCauchy_evaluate", _wrap_FTDecayFunction1DCauchy_evaluate, METH_VARARGS, (char *)"\n"
@@ -104768,7 +104768,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"
+ "virtual FTDecayFunction1DGauss* FTDecayFunction1DGauss::clone() const \n"
"\n"
""},
{ (char *)"FTDecayFunction1DGauss_evaluate", _wrap_FTDecayFunction1DGauss_evaluate, METH_VARARGS, (char *)"\n"
@@ -104793,7 +104793,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"
+ "virtual FTDecayFunction1DTriangle* FTDecayFunction1DTriangle::clone() const \n"
"\n"
""},
{ (char *)"FTDecayFunction1DTriangle_evaluate", _wrap_FTDecayFunction1DTriangle_evaluate, METH_VARARGS, (char *)"\n"
@@ -104818,7 +104818,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"
+ "virtual FTDecayFunction1DVoigt* FTDecayFunction1DVoigt::clone() const \n"
"\n"
""},
{ (char *)"FTDecayFunction1DVoigt_evaluate", _wrap_FTDecayFunction1DVoigt_evaluate, METH_VARARGS, (char *)"\n"
@@ -104908,7 +104908,7 @@ static PyMethodDef SwigMethods[] = {
"FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0)\n"
"new_FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y) -> FTDecayFunction2DCauchy\n"
"\n"
- "FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y)\n"
+ "FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDecayFunction2DCauchy", _wrap_delete_FTDecayFunction2DCauchy, METH_VARARGS, (char *)"\n"
@@ -104920,7 +104920,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"
+ "virtual FTDecayFunction2DCauchy* FTDecayFunction2DCauchy::clone() const \n"
"\n"
""},
{ (char *)"FTDecayFunction2DCauchy_evaluate", _wrap_FTDecayFunction2DCauchy_evaluate, METH_VARARGS, (char *)"\n"
@@ -104937,7 +104937,7 @@ static PyMethodDef SwigMethods[] = {
"FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0)\n"
"new_FTDecayFunction2DGauss(double decay_length_x, double decay_length_y) -> FTDecayFunction2DGauss\n"
"\n"
- "FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y)\n"
+ "FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDecayFunction2DGauss", _wrap_delete_FTDecayFunction2DGauss, METH_VARARGS, (char *)"\n"
@@ -104949,7 +104949,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"
+ "virtual FTDecayFunction2DGauss* FTDecayFunction2DGauss::clone() const \n"
"\n"
""},
{ (char *)"FTDecayFunction2DGauss_evaluate", _wrap_FTDecayFunction2DGauss_evaluate, METH_VARARGS, (char *)"\n"
@@ -104966,7 +104966,7 @@ static PyMethodDef SwigMethods[] = {
"FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0)\n"
"new_FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta) -> FTDecayFunction2DVoigt\n"
"\n"
- "FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta)\n"
+ "FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDecayFunction2DVoigt", _wrap_delete_FTDecayFunction2DVoigt, METH_VARARGS, (char *)"\n"
@@ -104978,7 +104978,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"
+ "virtual FTDecayFunction2DVoigt* FTDecayFunction2DVoigt::clone() const \n"
"\n"
""},
{ (char *)"FTDecayFunction2DVoigt_evaluate", _wrap_FTDecayFunction2DVoigt_evaluate, METH_VARARGS, (char *)"\n"
@@ -105239,7 +105239,7 @@ static PyMethodDef SwigMethods[] = {
"FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y, double gamma=0)\n"
"new_FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y) -> FTDistribution2DCauchy\n"
"\n"
- "FTDistribution2DCauchy::FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y)\n"
+ "FTDistribution2DCauchy::FTDistribution2DCauchy(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDistribution2DCauchy", _wrap_delete_FTDistribution2DCauchy, METH_VARARGS, (char *)"\n"
@@ -105251,7 +105251,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDistribution2DCauchy_clone", _wrap_FTDistribution2DCauchy_clone, METH_VARARGS, (char *)"\n"
"FTDistribution2DCauchy_clone(FTDistribution2DCauchy self) -> FTDistribution2DCauchy\n"
"\n"
- "FTDistribution2DCauchy * FTDistribution2DCauchy::clone() const \n"
+ "FTDistribution2DCauchy* FTDistribution2DCauchy::clone() const final\n"
"\n"
""},
{ (char *)"FTDistribution2DCauchy_evaluate", _wrap_FTDistribution2DCauchy_evaluate, METH_VARARGS, (char *)"\n"
@@ -105268,7 +105268,7 @@ static PyMethodDef SwigMethods[] = {
"FTDistribution2DGauss(double coherence_length_x, double coherence_length_y, double gamma=0)\n"
"new_FTDistribution2DGauss(double coherence_length_x, double coherence_length_y) -> FTDistribution2DGauss\n"
"\n"
- "FTDistribution2DGauss::FTDistribution2DGauss(double coherence_length_x, double coherence_length_y)\n"
+ "FTDistribution2DGauss::FTDistribution2DGauss(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDistribution2DGauss", _wrap_delete_FTDistribution2DGauss, METH_VARARGS, (char *)"\n"
@@ -105280,7 +105280,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDistribution2DGauss_clone", _wrap_FTDistribution2DGauss_clone, METH_VARARGS, (char *)"\n"
"FTDistribution2DGauss_clone(FTDistribution2DGauss self) -> FTDistribution2DGauss\n"
"\n"
- "FTDistribution2DGauss * FTDistribution2DGauss::clone() const \n"
+ "FTDistribution2DGauss* FTDistribution2DGauss::clone() const final\n"
"\n"
""},
{ (char *)"FTDistribution2DGauss_evaluate", _wrap_FTDistribution2DGauss_evaluate, METH_VARARGS, (char *)"\n"
@@ -105297,7 +105297,7 @@ static PyMethodDef SwigMethods[] = {
"FTDistribution2DGate(double coherence_length_x, double coherence_length_y, double gamma=0)\n"
"new_FTDistribution2DGate(double coherence_length_x, double coherence_length_y) -> FTDistribution2DGate\n"
"\n"
- "FTDistribution2DGate::FTDistribution2DGate(double coherence_length_x, double coherence_length_y)\n"
+ "FTDistribution2DGate::FTDistribution2DGate(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDistribution2DGate", _wrap_delete_FTDistribution2DGate, METH_VARARGS, (char *)"\n"
@@ -105309,7 +105309,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDistribution2DGate_clone", _wrap_FTDistribution2DGate_clone, METH_VARARGS, (char *)"\n"
"FTDistribution2DGate_clone(FTDistribution2DGate self) -> FTDistribution2DGate\n"
"\n"
- "FTDistribution2DGate * FTDistribution2DGate::clone() const \n"
+ "FTDistribution2DGate* FTDistribution2DGate::clone() const final\n"
"\n"
""},
{ (char *)"FTDistribution2DGate_evaluate", _wrap_FTDistribution2DGate_evaluate, METH_VARARGS, (char *)"\n"
@@ -105326,7 +105326,7 @@ static PyMethodDef SwigMethods[] = {
"FTDistribution2DCone(double coherence_length_x, double coherence_length_y, double gamma=0)\n"
"new_FTDistribution2DCone(double coherence_length_x, double coherence_length_y) -> FTDistribution2DCone\n"
"\n"
- "FTDistribution2DCone::FTDistribution2DCone(double coherence_length_x, double coherence_length_y)\n"
+ "FTDistribution2DCone::FTDistribution2DCone(double coherence_length_x, double coherence_length_y, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDistribution2DCone", _wrap_delete_FTDistribution2DCone, METH_VARARGS, (char *)"\n"
@@ -105338,7 +105338,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDistribution2DCone_clone", _wrap_FTDistribution2DCone_clone, METH_VARARGS, (char *)"\n"
"FTDistribution2DCone_clone(FTDistribution2DCone self) -> FTDistribution2DCone\n"
"\n"
- "FTDistribution2DCone * FTDistribution2DCone::clone() const \n"
+ "FTDistribution2DCone* FTDistribution2DCone::clone() const final\n"
"\n"
""},
{ (char *)"FTDistribution2DCone_evaluate", _wrap_FTDistribution2DCone_evaluate, METH_VARARGS, (char *)"\n"
@@ -105355,7 +105355,7 @@ static PyMethodDef SwigMethods[] = {
"FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta, double gamma=0)\n"
"new_FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta) -> FTDistribution2DVoigt\n"
"\n"
- "FTDistribution2DVoigt::FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta)\n"
+ "FTDistribution2DVoigt::FTDistribution2DVoigt(double coherence_length_x, double coherence_length_y, double eta, double gamma=0, double delta=Units::PID2)\n"
"\n"
""},
{ (char *)"delete_FTDistribution2DVoigt", _wrap_delete_FTDistribution2DVoigt, METH_VARARGS, (char *)"\n"
@@ -105367,7 +105367,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FTDistribution2DVoigt_clone", _wrap_FTDistribution2DVoigt_clone, METH_VARARGS, (char *)"\n"
"FTDistribution2DVoigt_clone(FTDistribution2DVoigt self) -> FTDistribution2DVoigt\n"
"\n"
- "FTDistribution2DVoigt * FTDistribution2DVoigt::clone() const \n"
+ "FTDistribution2DVoigt* FTDistribution2DVoigt::clone() const final\n"
"\n"
""},
{ (char *)"FTDistribution2DVoigt_evaluate", _wrap_FTDistribution2DVoigt_evaluate, METH_VARARGS, (char *)"\n"
@@ -110485,7 +110485,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"InterferenceFunctionRadialParaCrystal_accept", _wrap_InterferenceFunctionRadialParaCrystal_accept, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_accept(InterferenceFunctionRadialParaCrystal self, ISampleVisitor visitor)\n"
"\n"
- "void InterferenceFunctionRadialParaCrystal::accept(ISampleVisitor *visitor) const\n"
+ "void InterferenceFunctionRadialParaCrystal::accept(ISampleVisitor *visitor) const final\n"
"\n"
"Calls ISampleVisitor::visit. \n"
"\n"
@@ -110504,15 +110504,13 @@ static PyMethodDef SwigMethods[] = {
"\n"
"void InterferenceFunctionRadialParaCrystal::setKappa(double kappa)\n"
"\n"
- "Sets size-spacing coupling parameter. \n"
- "\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_getKappa", _wrap_InterferenceFunctionRadialParaCrystal_getKappa, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_getKappa(InterferenceFunctionRadialParaCrystal self) -> double\n"
"\n"
"virtual double InterferenceFunctionRadialParaCrystal::getKappa() const\n"
"\n"
- "Gets size-spacing coupling parameter. \n"
+ "Retrieves the size-distance coupling constant (default 0.0) \n"
"\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_setDomainSize", _wrap_InterferenceFunctionRadialParaCrystal_setDomainSize, METH_VARARGS, (char *)"\n"
@@ -110520,15 +110518,11 @@ static PyMethodDef SwigMethods[] = {
"\n"
"void InterferenceFunctionRadialParaCrystal::setDomainSize(double size)\n"
"\n"
- "Sets size of coherence domain. \n"
- "\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_getDomainSize", _wrap_InterferenceFunctionRadialParaCrystal_getDomainSize, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_getDomainSize(InterferenceFunctionRadialParaCrystal self) -> double\n"
"\n"
- "double InterferenceFunctionRadialParaCrystal::getDomainSize() const\n"
- "\n"
- "Returns size of coherence domain. \n"
+ "double InterferenceFunctionRadialParaCrystal::getDomainSize() const \n"
"\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_evaluate", _wrap_InterferenceFunctionRadialParaCrystal_evaluate, METH_VARARGS, (char *)"\n"
@@ -110550,15 +110544,11 @@ static PyMethodDef SwigMethods[] = {
"\n"
"void InterferenceFunctionRadialParaCrystal::setProbabilityDistribution(const IFTDistribution1D &pdf)\n"
"\n"
- "Sets the Fourier transformed probability distribution of the nearest particle. \n"
- "\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_getProbabilityDistribution", _wrap_InterferenceFunctionRadialParaCrystal_getProbabilityDistribution, METH_VARARGS, (char *)"\n"
"InterferenceFunctionRadialParaCrystal_getProbabilityDistribution(InterferenceFunctionRadialParaCrystal self) -> IFTDistribution1D\n"
"\n"
- "const IFTDistribution1D * InterferenceFunctionRadialParaCrystal::getProbabilityDistribution() const\n"
- "\n"
- "Gets the Fourier transformed probability distribution of the nearest particle. \n"
+ "const IFTDistribution1D* InterferenceFunctionRadialParaCrystal::getProbabilityDistribution() const \n"
"\n"
""},
{ (char *)"InterferenceFunctionRadialParaCrystal_getPeakDistance", _wrap_InterferenceFunctionRadialParaCrystal_getPeakDistance, METH_VARARGS, (char *)"\n"