diff --git a/CHANGELOG b/CHANGELOG
index 350682568c429d2722c3399d7ccd2de2abca372e..584757f1aa3eaa488f76857fd5fcb25868e6b81f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ BornAgain-1.17.99, work in progress
5) Removed default argument values from node constructors
6) Swap order of arguments gamma and eta in 2D decay and distribution Voigt functions
7) FormFactorSphereLogNormalRadius is now positioned at center, not at bottom
+ 8) Ripple1 and Ripple2 form factors renamed to CosineRipple and SawtoothRipple
> Changes in build configuration:
1) Python2 no longer supported
2) OpenGL can no longer be deselected
@@ -16,6 +17,7 @@ BornAgain-1.17.99, work in progress
1) Unit tests now under CTest control, no longer enforced during compilation
2) Uniform handling of assertions
3) Success of test_nonXMLDataInDir was dependent on test execution order
+ 4) Parameter registration now centralized in INode class
BornAgain-1.17.0, released 2020.06.16
> API changes:
diff --git a/Core/Aggregate/IInterferenceFunction.cpp b/Core/Aggregate/IInterferenceFunction.cpp
index 4e31f7ed11c5486a0de32a48312e8d2ef891ae65..ad8bc3cab94e1b78b3f3d1cf4c286c08dca40df1 100644
--- a/Core/Aggregate/IInterferenceFunction.cpp
+++ b/Core/Aggregate/IInterferenceFunction.cpp
@@ -29,8 +29,6 @@ IInterferenceFunction::IInterferenceFunction(double position_var) : m_position_v
registerParameter("PositionVariance", &m_position_var).setUnit("nm^2").setNonnegative();
}
-IInterferenceFunction::~IInterferenceFunction() = default;
-
// Default implementation of evaluate assumes no inner structure
// It is only to be overriden in case of the presence of such inner structure. See for example
// InterferenceFunction2DSuperLattice for such a case.
diff --git a/Core/Aggregate/IInterferenceFunction.h b/Core/Aggregate/IInterferenceFunction.h
index 2657a08b7d88ae27f8a4354914a554f226a804d0..a18434af14283ba9fafb42a9fb90498a79ec8e20 100644
--- a/Core/Aggregate/IInterferenceFunction.h
+++ b/Core/Aggregate/IInterferenceFunction.h
@@ -26,7 +26,6 @@ class BA_CORE_API_ IInterferenceFunction : public ISample
public:
IInterferenceFunction(const NodeMeta& meta, const std::vector<double>& PValues);
IInterferenceFunction(double position_var);
- virtual ~IInterferenceFunction();
virtual IInterferenceFunction* clone() const = 0;
@@ -51,13 +50,13 @@ public:
double DWfactor(kvector_t q) const;
protected:
+ double m_position_var;
+
//! Calculates the structure factor in the absence of extra inner structure
double iff_no_inner(const kvector_t q, double outer_iff) const;
//! Calculates the structure factor without Debye-Waller factor
virtual double iff_without_dw(const kvector_t q) const = 0;
-
- double m_position_var;
};
#endif // BORNAGAIN_CORE_AGGREGATE_IINTERFERENCEFUNCTION_H
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.cpp b/Core/Aggregate/InterferenceFunction2DLattice.cpp
index 6877abaef1034e3103368caaee87e8e4c6cfd743..1c16d41a6f0b05a1d8b31914ea99def7c5563113 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction2DLattice.cpp
@@ -16,6 +16,7 @@
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/Integrator.h"
#include <algorithm>
namespace
@@ -123,8 +124,8 @@ double InterferenceFunction2DLattice::iff_without_dw(const kvector_t q) const
m_qy = q.y();
if (!m_integrate_xi)
return interferenceForXi(m_lattice->rotationAngle());
- return m_integrator.integrate([&](double xi) -> double { return interferenceForXi(xi); }, 0.0,
- M_TWOPI)
+ return RealIntegrator().integrate([&](double xi) -> double { return interferenceForXi(xi); },
+ 0.0, M_TWOPI)
/ M_TWOPI;
}
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.h b/Core/Aggregate/InterferenceFunction2DLattice.h
index a86dd8c6cdcff69b8fe54bff1120d2759d22db62..b6c9cbdf57653edba4ccbaae84438e1368589dc7 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.h
+++ b/Core/Aggregate/InterferenceFunction2DLattice.h
@@ -19,7 +19,6 @@
#include "Core/Correlations/FTDecay1D.h"
#include "Core/Correlations/FTDecay2D.h"
#include "Core/Lattice/Lattice2D.h"
-#include "Core/Tools/Integrator.h"
//! Interference function of a 2D lattice.
//! @ingroup interference
@@ -82,7 +81,6 @@ private:
int m_na, m_nb; //!< determines the number of reciprocal lattice points to use
mutable double m_qx;
mutable double m_qy;
- mutable RealIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
index ce1c267879abbdc0b9e6f48a99cf0f129b64bae1..fd46adaea828dc188c27a03476b08a1ba043ee87 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
@@ -17,6 +17,7 @@
#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/ParameterPool.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/Integrator.h"
#include <limits>
InterferenceFunction2DParaCrystal::InterferenceFunction2DParaCrystal(const Lattice2D& lattice,
@@ -100,8 +101,8 @@ double InterferenceFunction2DParaCrystal::iff_without_dw(const kvector_t q) cons
m_qy = q.y();
if (!m_integrate_xi)
return interferenceForXi(m_lattice->rotationAngle());
- return m_integrator.integrate([&](double xi) -> double { return interferenceForXi(xi); }, 0.0,
- M_TWOPI)
+ return RealIntegrator().integrate([&](double xi) -> double { return interferenceForXi(xi); },
+ 0.0, M_TWOPI)
/ M_TWOPI;
}
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.h b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
index 5739bb0f7b0574a1e33b41ba4cf288c00f5ae845..ce7cf10f7a6a6a012c3a0281add15901045fb33c 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
@@ -19,7 +19,6 @@
#include "Core/Basics/Complex.h"
#include "Core/Correlations/FTDistributions2D.h"
#include "Core/Lattice/Lattice2D.h"
-#include "Core/Tools/Integrator.h"
#include <memory>
class IFTDistribution2D;
@@ -91,7 +90,6 @@ private:
double m_domain_sizes[2]; //!< Coherence domain sizes
mutable double m_qx;
mutable double m_qy;
- mutable RealIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DPARACRYSTAL_H
diff --git a/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp b/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp
index 8a94239dc686236ac3dd910fd681bc47f651b365..b925b1753ad06cc17ffef299c41085137e96494b 100644
--- a/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction2DSuperLattice.cpp
@@ -17,6 +17,7 @@
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
@@ -95,8 +96,8 @@ double InterferenceFunction2DSuperLattice::evaluate(const kvector_t q, double ou
m_qy = q.y();
if (!m_integrate_xi)
return interferenceForXi(mP_lattice->rotationAngle());
- return m_integrator.integrate([&](double xi) -> double { return interferenceForXi(xi); }, 0.0,
- M_TWOPI)
+ return RealIntegrator().integrate([&](double xi) -> double { return interferenceForXi(xi); },
+ 0.0, M_TWOPI)
/ M_TWOPI;
}
diff --git a/Core/Aggregate/InterferenceFunction2DSuperLattice.h b/Core/Aggregate/InterferenceFunction2DSuperLattice.h
index 85b4b102c672165007e8f6427056e124e98fa252..aadaceb843ecb22e370ebdef67cdb5d5ff175798 100644
--- a/Core/Aggregate/InterferenceFunction2DSuperLattice.h
+++ b/Core/Aggregate/InterferenceFunction2DSuperLattice.h
@@ -17,7 +17,6 @@
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Lattice/Lattice2D.h"
-#include "Core/Tools/Integrator.h"
//! Interference function of a 2D superlattice with a configurable interference function for
//! each lattice site.
@@ -68,7 +67,6 @@ private:
mutable double m_qx;
mutable double m_qy;
mutable double m_xi;
- mutable RealIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTION2DSUPERLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp b/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp
index 095b3e3c832b0971e31ca1a841d118b04dac9243..d68a86f7d7cf4456e5849858fd733b0cb269b7b2 100644
--- a/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunctionFinite2DLattice.cpp
@@ -16,6 +16,7 @@
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
@@ -114,8 +115,8 @@ double InterferenceFunctionFinite2DLattice::iff_without_dw(const kvector_t q) co
m_qy = q.y();
if (!m_integrate_xi)
return interferenceForXi(mP_lattice->rotationAngle());
- return m_integrator.integrate([&](double xi) -> double { return interferenceForXi(xi); }, 0.0,
- M_TWOPI)
+ return RealIntegrator().integrate([&](double xi) -> double { return interferenceForXi(xi); },
+ 0.0, M_TWOPI)
/ M_TWOPI;
}
diff --git a/Core/Aggregate/InterferenceFunctionFinite2DLattice.h b/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
index 2563802c67f63263bba7d41f0a3d0a6491b0788c..dcae005653b816202c29d158b3be07bb3b91b41b 100644
--- a/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
+++ b/Core/Aggregate/InterferenceFunctionFinite2DLattice.h
@@ -17,7 +17,6 @@
#include "Core/Aggregate/IInterferenceFunction.h"
#include "Core/Lattice/Lattice2D.h"
-#include "Core/Tools/Integrator.h"
//! Interference function of a finite 2D lattice.
//! @ingroup interference
@@ -63,7 +62,6 @@ private:
unsigned m_N_1, m_N_2; //!< Size of the finite lattice in lattice units
mutable double m_qx;
mutable double m_qy;
- mutable RealIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONFINITE2DLATTICE_H
diff --git a/Core/Aggregate/InterferenceFunctionHardDisk.cpp b/Core/Aggregate/InterferenceFunctionHardDisk.cpp
index fc1f769dcde0ab876eeb557032453d0ac95fc475..56948d53d45590707f63f7b486140400b31199d8 100644
--- a/Core/Aggregate/InterferenceFunctionHardDisk.cpp
+++ b/Core/Aggregate/InterferenceFunctionHardDisk.cpp
@@ -14,6 +14,7 @@
#include "Core/Aggregate/InterferenceFunctionHardDisk.h"
#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include <cmath>
@@ -69,7 +70,7 @@ double InterferenceFunctionHardDisk::iff_without_dw(const kvector_t q) const
m_s2 = S2(m_packing);
double c_q =
2.0 * M_PI
- * m_integrator.integrate([&](double x) -> double { return integrand(x); }, 0.0, 1.0);
+ * RealIntegrator().integrate([&](double x) -> double { return integrand(x); }, 0.0, 1.0);
double rho = 4.0 * m_packing / M_PI;
return 1.0 / (1.0 - rho * c_q);
}
diff --git a/Core/Aggregate/InterferenceFunctionHardDisk.h b/Core/Aggregate/InterferenceFunctionHardDisk.h
index 3845affa62eaa900c23695297a2b178e177aeda0..18c5b38dddc54ac822adbec1750ebb91237285f7 100644
--- a/Core/Aggregate/InterferenceFunctionHardDisk.h
+++ b/Core/Aggregate/InterferenceFunctionHardDisk.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
#include "Core/Aggregate/IInterferenceFunction.h"
-#include "Core/Tools/Integrator.h"
//! Percus-Yevick hard disk interference function.
//!
@@ -49,7 +48,6 @@ private:
double m_density;
mutable double m_q, m_c_zero, m_s2, m_packing;
- mutable RealIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_AGGREGATE_INTERFERENCEFUNCTIONHARDDISK_H
diff --git a/Core/Beam/FootprintGauss.cpp b/Core/Beam/FootprintGauss.cpp
index 4b68695fee88ea6d2c2733bd18ce4d8202d303f0..55f740224f1849e1d791d87dd7b2a30a202f983e 100644
--- a/Core/Beam/FootprintGauss.cpp
+++ b/Core/Beam/FootprintGauss.cpp
@@ -17,9 +17,14 @@
#include "Core/Tools/MathFunctions.h"
#include "Core/Tools/PyFmt.h"
-FootprintGauss::FootprintGauss(double width_ratio) : IFootprintFactor(width_ratio)
+FootprintGauss::FootprintGauss(const std::vector<double> P)
+ : IFootprintFactor({"FootprintGauss", "class_tooltip", {}}, P)
+{
+}
+
+FootprintGauss::FootprintGauss(double width_ratio)
+ : FootprintGauss(std::vector<double>{width_ratio})
{
- setName("FootprintGauss");
}
FootprintGauss* FootprintGauss::clone() const
diff --git a/Core/Beam/FootprintGauss.h b/Core/Beam/FootprintGauss.h
index 6269eb195172bbe39cb43f4b7a4814a9e65dd377..95ff547961fc4fb924eba7ca2db5f3857131a8c8 100644
--- a/Core/Beam/FootprintGauss.h
+++ b/Core/Beam/FootprintGauss.h
@@ -25,6 +25,7 @@
class BA_CORE_API_ FootprintGauss : public IFootprintFactor
{
public:
+ FootprintGauss(const std::vector<double> P);
FootprintGauss(double width_ratio);
void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
diff --git a/Core/Beam/FootprintSquare.cpp b/Core/Beam/FootprintSquare.cpp
index d49208f24a78863173fe12b6e92b563704a32d4c..5a6d6999321f2143dff6b19fe27306d3dfb5b241 100644
--- a/Core/Beam/FootprintSquare.cpp
+++ b/Core/Beam/FootprintSquare.cpp
@@ -18,9 +18,14 @@
#include <algorithm>
#include <stdexcept>
-FootprintSquare::FootprintSquare(double width_ratio) : IFootprintFactor(width_ratio)
+FootprintSquare::FootprintSquare(const std::vector<double> P)
+ : IFootprintFactor({"FootprintSquare", "class_tooltip", {}}, P)
+{
+}
+
+FootprintSquare::FootprintSquare(double width_ratio)
+ : FootprintSquare(std::vector<double>{width_ratio})
{
- setName("FootprintSquare");
}
FootprintSquare* FootprintSquare::clone() const
diff --git a/Core/Beam/FootprintSquare.h b/Core/Beam/FootprintSquare.h
index dfd2012de8108bae4f62ad332255934834924ae9..18af9212806f72272a22f77acef9b7f91c93b9c3 100644
--- a/Core/Beam/FootprintSquare.h
+++ b/Core/Beam/FootprintSquare.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FootprintSquare : public IFootprintFactor
{
public:
+ FootprintSquare(const std::vector<double> P);
FootprintSquare(double width_ratio);
void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
diff --git a/Core/Beam/IFootprintFactor.cpp b/Core/Beam/IFootprintFactor.cpp
index 1393de32831b302f524c390d284097b181de41a1..8236e7a0002bce9f8a8e117aa6f6d6e1b0dbff45 100644
--- a/Core/Beam/IFootprintFactor.cpp
+++ b/Core/Beam/IFootprintFactor.cpp
@@ -13,20 +13,18 @@
// ************************************************************************** //
#include "Core/Beam/IFootprintFactor.h"
-#include "Core/Parametrization/RealParameter.h"
#include <stdexcept>
IFootprintFactor::IFootprintFactor(const NodeMeta& meta, const std::vector<double>& PValues)
- : INode(meta, PValues)
+ : INode(nodeMetaUnion(
+ {{"BeamToSampleWidthRatio", "", "ratio of beam width to sample width", 0, INF, 1.}},
+ meta),
+ PValues),
+ m_width_ratio(m_P[0])
{
-}
-
-IFootprintFactor::IFootprintFactor(double width_ratio) : m_width_ratio(width_ratio)
-{
- if (m_width_ratio < 0.0)
+ if (m_P[0] < 0.0)
throw std::runtime_error(
- "Error in IFootprintFactor::IFootprintFactor: width ratio is negative");
- registerParameter("BeamToSampleWidthRatio", &m_width_ratio).setNonnegative();
+ "Error in IFootprintFactor::setWidthRatio: width ratio is negative");
}
IFootprintFactor::~IFootprintFactor() = default;
@@ -36,5 +34,5 @@ void IFootprintFactor::setWidthRatio(double width_ratio)
if (width_ratio < 0.0)
throw std::runtime_error(
"Error in IFootprintFactor::setWidthRatio: width ratio is negative");
- m_width_ratio = width_ratio;
+ m_P[0] = width_ratio;
}
diff --git a/Core/Beam/IFootprintFactor.h b/Core/Beam/IFootprintFactor.h
index 3496ba7f7bb29ad802632b6a1216db31d7a1d531..b8acab2c1699b58ee03d9ae3b56f60a4b7834b74 100644
--- a/Core/Beam/IFootprintFactor.h
+++ b/Core/Beam/IFootprintFactor.h
@@ -28,7 +28,6 @@ class BA_CORE_API_ IFootprintFactor : public ICloneable, public INode
{
public:
IFootprintFactor(const NodeMeta& meta, const std::vector<double>& PValues);
- IFootprintFactor(double width_ratio);
IFootprintFactor() = delete;
virtual ~IFootprintFactor();
@@ -44,7 +43,7 @@ public:
virtual std::string print() const = 0;
protected:
- double m_width_ratio; //! Beam to sample width ratio
+ const double& m_width_ratio; //! Beam to sample width ratio
private:
void initialize();
diff --git a/Core/Computation/ConstantBackground.cpp b/Core/Computation/ConstantBackground.cpp
index b0078ee5b1acf7437a4f7fdeefc36607625b8595..888b0d3d6ebc761b05ea15d201cb3a6f02d81ec0 100644
--- a/Core/Computation/ConstantBackground.cpp
+++ b/Core/Computation/ConstantBackground.cpp
@@ -13,13 +13,19 @@
// ************************************************************************** //
#include "Core/Computation/ConstantBackground.h"
-#include "Core/Parametrization/RealParameter.h"
+
+ConstantBackground::ConstantBackground(const std::vector<double> P)
+ : IBackground({"ConstantBackground",
+ "class_tooltip",
+ {{"BackgroundValue", "", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_background_value(m_P[0])
+{
+}
ConstantBackground::ConstantBackground(double background_value)
- : m_background_value(background_value)
+ : ConstantBackground(std::vector<double>{background_value})
{
- setName("ConstantBackground");
- registerParameter("BackgroundValue", &m_background_value).setNonnegative();
}
ConstantBackground* ConstantBackground::clone() const
diff --git a/Core/Computation/ConstantBackground.h b/Core/Computation/ConstantBackground.h
index c6a5269ea1c588601476b29c1f1d8e15696dafe3..42359175a65595943f7f31c512672558f9a8c655 100644
--- a/Core/Computation/ConstantBackground.h
+++ b/Core/Computation/ConstantBackground.h
@@ -24,6 +24,7 @@
class BA_CORE_API_ ConstantBackground : public IBackground
{
public:
+ ConstantBackground(const std::vector<double> P);
ConstantBackground(double background_value);
ConstantBackground* clone() const override final;
@@ -35,7 +36,7 @@ public:
double addBackGround(double intensity) const override final;
private:
- double m_background_value;
+ const double& m_background_value;
};
#endif // BORNAGAIN_CORE_COMPUTATION_CONSTANTBACKGROUND_H
diff --git a/Core/Computation/IBackground.cpp b/Core/Computation/IBackground.cpp
index 0c36b8e6288d4e0e89242759de82aff0b34f55b7..cd0e5771c95ee9b503a2b54d70cf18dda2b7f121 100644
--- a/Core/Computation/IBackground.cpp
+++ b/Core/Computation/IBackground.cpp
@@ -14,4 +14,9 @@
#include "Core/Computation/IBackground.h"
+IBackground::IBackground(const NodeMeta& meta, const std::vector<double>& PValues)
+ : INode(meta, PValues)
+{
+}
+
IBackground::~IBackground() = default;
diff --git a/Core/Computation/IBackground.h b/Core/Computation/IBackground.h
index ed6275e6b982d7ef4c7ead94757d8ed9f03b3c81..dad00303b69fc92ad705cdfc970670e3955a8123 100644
--- a/Core/Computation/IBackground.h
+++ b/Core/Computation/IBackground.h
@@ -25,6 +25,7 @@
class BA_CORE_API_ IBackground : public ICloneable, public INode
{
public:
+ IBackground(const NodeMeta& meta, const std::vector<double>& PValues);
virtual ~IBackground();
virtual IBackground* clone() const = 0;
diff --git a/Core/Computation/PoissonNoiseBackground.cpp b/Core/Computation/PoissonNoiseBackground.cpp
index 043b92ea1e9460c37dd259fcd97d70abad965f3b..3d86b2925d9bfb6d799e797c21a1c035bc267723 100644
--- a/Core/Computation/PoissonNoiseBackground.cpp
+++ b/Core/Computation/PoissonNoiseBackground.cpp
@@ -16,12 +16,10 @@
#include "Core/Tools/MathFunctions.h"
PoissonNoiseBackground::PoissonNoiseBackground()
+ : IBackground({"PoissonNoiseBackground", "class_tooltip", {}}, {})
{
- setName("PoissonNoiseBackground");
}
-PoissonNoiseBackground::~PoissonNoiseBackground() = default;
-
PoissonNoiseBackground* PoissonNoiseBackground::clone() const
{
return new PoissonNoiseBackground;
diff --git a/Core/Computation/PoissonNoiseBackground.h b/Core/Computation/PoissonNoiseBackground.h
index c5cbe887172d80b206e55247c76c2700262f8df6..8f96804e3e52a9d22d0508c1f3a40ca7f09939ae 100644
--- a/Core/Computation/PoissonNoiseBackground.h
+++ b/Core/Computation/PoissonNoiseBackground.h
@@ -25,7 +25,6 @@ class BA_CORE_API_ PoissonNoiseBackground : public IBackground
{
public:
PoissonNoiseBackground();
- ~PoissonNoiseBackground();
PoissonNoiseBackground* clone() const override final;
void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
diff --git a/Core/Correlations/FTDecay1D.cpp b/Core/Correlations/FTDecay1D.cpp
index d09a5eab6c7aabc0c4a9ae46bfdfc8da7a8a460b..5ee54fe5d10888c5f389e8e170d39bbc2b44a101 100644
--- a/Core/Correlations/FTDecay1D.cpp
+++ b/Core/Correlations/FTDecay1D.cpp
@@ -14,30 +14,31 @@
#include "Core/Correlations/FTDecay1D.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/ParameterPool.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
#include <algorithm>
-IFTDecayFunction1D::IFTDecayFunction1D(double decay_length) : m_decay_length(decay_length)
+// ************************************************************************** //
+// interface IIFTDecayFunction1D
+// ************************************************************************** //
+
+IFTDecayFunction1D::IFTDecayFunction1D(const NodeMeta& meta, const std::vector<double>& PValues)
+ : INode(nodeMetaUnion({{"DecayLength", "nm", "half width", 0, INF, 1.}}, meta), PValues),
+ m_decay_length(m_P[0])
{
- registerParameter("DecayLength", &m_decay_length);
}
-IFTDecayFunction1D::IFTDecayFunction1D(const NodeMeta& meta, const std::vector<double>& PValues)
- : INode(nodeMetaUnion(
- {
- {"DecayLength", "nm", "Half-width", 0, INF, 1.},
- },
- meta),
- PValues)
+// ************************************************************************** //
+// class FTDecayFunction1DCauchy
+// ************************************************************************** //
+
+FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(const std::vector<double> P)
+ : IFTDecayFunction1D({"FTDecayFunction1DCauchy", "class_tooltip", {}}, P)
{
}
FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(double decay_length)
- : IFTDecayFunction1D(decay_length)
+ : FTDecayFunction1DCauchy(std::vector<double>{decay_length})
{
- setName("FTDecayFunction1DCauchy");
}
FTDecayFunction1DCauchy* FTDecayFunction1DCauchy::clone() const
@@ -51,10 +52,18 @@ double FTDecayFunction1DCauchy::evaluate(double q) const
return m_decay_length * 2.0 / (1.0 + sum_sq);
}
+// ************************************************************************** //
+// class FTDecayFunction1DGauss
+// ************************************************************************** //
+
+FTDecayFunction1DGauss::FTDecayFunction1DGauss(const std::vector<double> P)
+ : IFTDecayFunction1D({"FTDecayFunction1DGauss", "class_tooltip", {}}, P)
+{
+}
+
FTDecayFunction1DGauss::FTDecayFunction1DGauss(double decay_length)
- : IFTDecayFunction1D(decay_length)
+ : FTDecayFunction1DGauss(std::vector<double>{decay_length})
{
- setName("FTDecayFunction1DGauss");
}
FTDecayFunction1DGauss* FTDecayFunction1DGauss::clone() const
@@ -68,10 +77,18 @@ double FTDecayFunction1DGauss::evaluate(double q) const
return m_decay_length * std::sqrt(M_TWOPI) * std::exp(-sum_sq / 2.0);
}
+// ************************************************************************** //
+// class FTDecayFunction1DTriangle
+// ************************************************************************** //
+
+FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(const std::vector<double> P)
+ : IFTDecayFunction1D({"FTDecayFunction1DTriangle", "class_tooltip", {}}, P)
+{
+}
+
FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(double decay_length)
- : IFTDecayFunction1D(decay_length)
+ : FTDecayFunction1DTriangle(std::vector<double>{decay_length})
{
- setName("FTDecayFunction1DTriangle");
}
FTDecayFunction1DTriangle* FTDecayFunction1DTriangle::clone() const
@@ -85,11 +102,21 @@ double FTDecayFunction1DTriangle::evaluate(double q) const
return m_decay_length * sincqw2 * sincqw2;
}
+// ************************************************************************** //
+// class FTDecayFunction1DVoigt
+// ************************************************************************** //
+
+FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(const std::vector<double> P)
+ : IFTDecayFunction1D(
+ {"FTDecayFunction1DVoigt", "class_tooltip", {{"Eta", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_eta(m_P[0])
+{
+}
+
FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(double decay_length, double eta)
- : IFTDecayFunction1D(decay_length), m_eta(eta)
+ : FTDecayFunction1DVoigt(std::vector<double>{decay_length, eta})
{
- setName("FTDecayFunction1DVoigt");
- registerParameter("Eta", &m_eta);
}
FTDecayFunction1DVoigt* FTDecayFunction1DVoigt::clone() const
diff --git a/Core/Correlations/FTDecay1D.h b/Core/Correlations/FTDecay1D.h
index e2bb139292b5ae880e9576b4f73d6d1d408917f1..977f31d385a36865891b9b1b612766e8700c272b 100644
--- a/Core/Correlations/FTDecay1D.h
+++ b/Core/Correlations/FTDecay1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
#include "Core/Basics/ICloneable.h"
#include "Core/Basics/MathConstants.h"
@@ -27,9 +27,6 @@
class BA_CORE_API_ IFTDecayFunction1D : public ICloneable, public INode
{
public:
- //! Constructor of one-dimensional decay function.
- //! @param decay_length: half-width of the distribution in nanometers
- IFTDecayFunction1D(double decay_length);
IFTDecayFunction1D(const NodeMeta& meta, const std::vector<double>& PValues);
virtual IFTDecayFunction1D* clone() const = 0;
@@ -37,7 +34,7 @@ public:
double decayLength() const { return m_decay_length; }
protected:
- double m_decay_length;
+ const double& m_decay_length;
};
//! One-dimensional Cauchy decay function in reciprocal space;
@@ -46,6 +43,7 @@ protected:
class BA_CORE_API_ FTDecayFunction1DCauchy : public IFTDecayFunction1D
{
public:
+ FTDecayFunction1DCauchy(const std::vector<double> P);
FTDecayFunction1DCauchy(double decay_length);
FTDecayFunction1DCauchy* clone() const;
@@ -59,6 +57,7 @@ public:
class BA_CORE_API_ FTDecayFunction1DGauss : public IFTDecayFunction1D
{
public:
+ FTDecayFunction1DGauss(const std::vector<double> P);
FTDecayFunction1DGauss(double decay_length);
FTDecayFunction1DGauss* clone() const;
@@ -72,6 +71,7 @@ public:
class BA_CORE_API_ FTDecayFunction1DTriangle : public IFTDecayFunction1D
{
public:
+ FTDecayFunction1DTriangle(const std::vector<double> P);
FTDecayFunction1DTriangle(double decay_length);
FTDecayFunction1DTriangle* clone() const;
@@ -88,6 +88,7 @@ public:
//! Constructor of pseudo-Voigt decay function.
//! @param decay_length: half-width of the distribution in nanometers
//! @param eta: parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)
+ FTDecayFunction1DVoigt(const std::vector<double> P);
FTDecayFunction1DVoigt(double decay_length, double eta);
FTDecayFunction1DVoigt* clone() const;
@@ -96,7 +97,7 @@ public:
double eEta() const { return m_eta; }
private:
- double m_eta;
+ const double& m_eta;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDECAY1D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY1D_H
diff --git a/Core/Correlations/FTDecay2D.cpp b/Core/Correlations/FTDecay2D.cpp
index 4582f9523b412e9856ce4c4c1b9ca9f606c371c3..912746b825b52a54c8591ad316d50b8d05979ad3 100644
--- a/Core/Correlations/FTDecay2D.cpp
+++ b/Core/Correlations/FTDecay2D.cpp
@@ -14,23 +14,12 @@
#include "Core/Correlations/FTDecay2D.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/ParameterPool.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
#include <algorithm>
-//! Constructor of two-dimensional decay function in reciprocal space.
-//! @param decay_length_x: the decay length in nanometers along x-axis of the distribution
-//! @param decay_length_y: the decay length in nanometers along y-axis of the distribution
-//! @param gamma: distribution orientation with respect to the corresponding lattice vector
-//! in radians
-IFTDecayFunction2D::IFTDecayFunction2D(double decay_length_x, double decay_length_y, double gamma)
- : m_decay_length_x(decay_length_x), m_decay_length_y(decay_length_y), m_gamma(gamma)
-{
- registerParameter("DecayLengthX", &m_decay_length_x).setUnit("nm").setNonnegative();
- registerParameter("DecayLengthY", &m_decay_length_y).setUnit("nm").setNonnegative();
- registerParameter("Gamma", &m_gamma).setUnit("rad").setLimited(-M_PI_2, M_PI_2);
-}
+// ************************************************************************** //
+// interface IIFTDecayFunction1D
+// ************************************************************************** //
IFTDecayFunction2D::IFTDecayFunction2D(const NodeMeta& meta, const std::vector<double>& PValues)
: INode(nodeMetaUnion({{"DecayLengthX", "nm", "Half-width along x axis", 0, INF, 1.},
@@ -38,7 +27,8 @@ IFTDecayFunction2D::IFTDecayFunction2D(const NodeMeta& meta, const std::vector<d
{"Gamma", "rad", "orientation with respect to the first lattice vector",
-M_PI_2, +M_PI_2, 0}},
meta),
- PValues)
+ PValues),
+ m_decay_length_x(m_P[0]), m_decay_length_y(m_P[1]), m_gamma(m_P[2])
{
}
@@ -64,11 +54,19 @@ std::pair<double, double> IFTDecayFunction2D::transformToRecLatticeCoordinates(d
return {qa, qb};
}
+// ************************************************************************** //
+// class FTDecayFunction2DCauchy
+// ************************************************************************** //
+
+FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(const std::vector<double> P)
+ : IFTDecayFunction2D({"FTDecayFunction2DCauchy", "class_tooltip", {}}, P)
+{
+}
+
FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y,
double gamma)
- : IFTDecayFunction2D(decay_length_x, decay_length_y, gamma)
+ : FTDecayFunction2DCauchy(std::vector<double>{decay_length_x, decay_length_y, gamma})
{
- setName("FTDecayFunction2DCauchy");
}
FTDecayFunction2DCauchy* FTDecayFunction2DCauchy::clone() const
@@ -83,11 +81,19 @@ double FTDecayFunction2DCauchy::evaluate(double qx, double qy) const
return M_TWOPI * m_decay_length_x * m_decay_length_y * std::pow(1.0 + sum_sq, -1.5);
}
+// ************************************************************************** //
+// class FTDecayFunction2DGauss
+// ************************************************************************** //
+
+FTDecayFunction2DGauss::FTDecayFunction2DGauss(const std::vector<double> P)
+ : IFTDecayFunction2D({"FTDecayFunction2DGauss", "class_tooltip", {}}, P)
+{
+}
+
FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y,
double gamma)
- : IFTDecayFunction2D(decay_length_x, decay_length_y, gamma)
+ : FTDecayFunction2DGauss(std::vector<double>{decay_length_x, decay_length_y, gamma})
{
- setName("FTDecayFunction2DGauss");
}
FTDecayFunction2DGauss* FTDecayFunction2DGauss::clone() const
@@ -102,18 +108,28 @@ double FTDecayFunction2DGauss::evaluate(double qx, double qy) const
return M_TWOPI * m_decay_length_x * m_decay_length_y * std::exp(-sum_sq / 2.0);
}
+// ************************************************************************** //
+// class FTDecayFunction2DVoigt
+// ************************************************************************** //
+
//! Constructor of two-dimensional pseudo-Voigt decay function in reciprocal space.
//! @param decay_length_x: the decay length in nanometers along x-axis of the distribution
//! @param decay_length_y: the decay length in nanometers along y-axis of the distribution
//! @param eta: parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)
//! @param gamma: distribution orientation with respect to the first lattice vector in radians
+FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(const std::vector<double> P)
+ : IFTDecayFunction2D(
+ {"FTDecayFunction2DVoigt", "class_tooltip", {{"Eta", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_eta(m_P[0])
+{
+}
+
FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y,
double gamma, double eta)
- : IFTDecayFunction2D(decay_length_x, decay_length_y, gamma), m_eta(eta)
+ : FTDecayFunction2DVoigt(std::vector<double>{decay_length_x, decay_length_y, gamma, eta})
{
- setName("FTDecayFunction2DVoigt");
- registerParameter("Eta", &m_eta);
}
FTDecayFunction2DVoigt* FTDecayFunction2DVoigt::clone() const
diff --git a/Core/Correlations/FTDecay2D.h b/Core/Correlations/FTDecay2D.h
index 3d819af75dbbaa1a4dce46ab4067dd76269f8c0b..a7c1cd57f911aafaa9a93c647b74292595f481cc 100644
--- a/Core/Correlations/FTDecay2D.h
+++ b/Core/Correlations/FTDecay2D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
#include "Core/Basics/ICloneable.h"
#include "Core/Basics/MathConstants.h"
@@ -25,22 +25,16 @@
class BA_CORE_API_ IFTDecayFunction2D : public ICloneable, public INode
{
public:
- IFTDecayFunction2D(double decay_length_x, double decay_length_y, double gamma);
IFTDecayFunction2D(const NodeMeta& meta, const std::vector<double>& PValues);
virtual IFTDecayFunction2D* clone() const = 0;
- //! set angle between first lattice vector and X-axis of distribution (both in direct space)
- void setGamma(double gamma) { m_gamma = gamma; }
-
- //! get angle between first lattice vector and X-axis of distribution (both in direct space)
- double gamma() const { return m_gamma; }
-
//! get decay length in distribution's X-direction
double decayLengthX() const { return m_decay_length_x; }
-
//! get decay length in distribution's Y-direction
double decayLengthY() const { return m_decay_length_y; }
+ //! get angle between first lattice vector and X-axis of distribution (both in direct space)
+ double gamma() const { return m_gamma; }
//! evaluate Fourier transformed decay function for q in X,Y coordinates
virtual double evaluate(double qx, double qy) const = 0;
@@ -50,9 +44,9 @@ public:
double b, double alpha) const;
protected:
- double m_decay_length_x;
- double m_decay_length_y;
- double m_gamma;
+ const double& m_decay_length_x;
+ const double& m_decay_length_y;
+ const double& m_gamma;
private:
//! transform reciprocal coordinate system of this decay function to the reciprocal
@@ -68,6 +62,7 @@ private:
class BA_CORE_API_ FTDecayFunction2DCauchy : public IFTDecayFunction2D
{
public:
+ FTDecayFunction2DCauchy(const std::vector<double> P);
FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma);
FTDecayFunction2DCauchy* clone() const;
@@ -82,6 +77,7 @@ public:
class BA_CORE_API_ FTDecayFunction2DGauss : public IFTDecayFunction2D
{
public:
+ FTDecayFunction2DGauss(const std::vector<double> P);
FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma);
FTDecayFunction2DGauss* clone() const;
@@ -95,6 +91,7 @@ public:
class BA_CORE_API_ FTDecayFunction2DVoigt : public IFTDecayFunction2D
{
public:
+ FTDecayFunction2DVoigt(const std::vector<double> P);
FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double gamma, double eta);
FTDecayFunction2DVoigt* clone() const;
@@ -103,7 +100,7 @@ public:
double eta() const { return m_eta; }
protected:
- double m_eta;
+ const double& m_eta;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDECAY2D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDECAY2D_H
diff --git a/Core/Correlations/FTDistributions1D.cpp b/Core/Correlations/FTDistributions1D.cpp
index ff748bdef096ed75ed44aa8e37477072ef92af0f..bfc4d918a58530b663fc6ab222003a098a413d6e 100644
--- a/Core/Correlations/FTDistributions1D.cpp
+++ b/Core/Correlations/FTDistributions1D.cpp
@@ -15,8 +15,6 @@
#include "Core/Correlations/FTDistributions1D.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/ParameterPool.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
@@ -25,19 +23,28 @@ namespace
const double CosineDistributionFactor = 1.0 / 3.0 - 2.0 / M_PI / M_PI;
}
-IFTDistribution1D::IFTDistribution1D(double omega) : m_omega(omega)
+// ************************************************************************** //
+// interface IFTDistribution1D
+// ************************************************************************** //
+
+IFTDistribution1D::IFTDistribution1D(const NodeMeta& meta, const std::vector<double>& PValues)
+ : INode(nodeMetaUnion({{"Omega", "nm", "Half-width", 0, INF, 1.}}, meta), PValues),
+ m_omega(m_P[0])
{
- registerParameter("Omega", &m_omega);
}
-IFTDistribution1D::IFTDistribution1D(const NodeMeta& meta, const std::vector<double>& PValues)
- : INode(nodeMetaUnion({{"Omega", "nm", "Half-width", 0, INF, 1.}}, meta), PValues)
+// ************************************************************************** //
+// class FTDistribution1DCauchy
+// ************************************************************************** //
+
+FTDistribution1DCauchy::FTDistribution1DCauchy(const std::vector<double> P)
+ : IFTDistribution1D({"FTDistribution1DCauchy", "class_tooltip", {}}, P)
{
}
-FTDistribution1DCauchy::FTDistribution1DCauchy(double omega) : IFTDistribution1D(omega)
+FTDistribution1DCauchy::FTDistribution1DCauchy(double omega)
+ : FTDistribution1DCauchy(std::vector<double>{omega})
{
- setName("FTDistribution1DCauchy");
}
FTDistribution1DCauchy* FTDistribution1DCauchy::clone() const
@@ -61,9 +68,18 @@ std::unique_ptr<IDistribution1DSampler> FTDistribution1DCauchy::createSampler()
return std::make_unique<Distribution1DCauchySampler>(1 / m_omega);
}
-FTDistribution1DGauss::FTDistribution1DGauss(double omega) : IFTDistribution1D(omega)
+// ************************************************************************** //
+// class FTDistribution1DGauss
+// ************************************************************************** //
+
+FTDistribution1DGauss::FTDistribution1DGauss(const std::vector<double> P)
+ : IFTDistribution1D({"FTDistribution1DGauss", "class_tooltip", {}}, P)
+{
+}
+
+FTDistribution1DGauss::FTDistribution1DGauss(double omega)
+ : FTDistribution1DGauss(std::vector<double>{omega})
{
- setName("FTDistribution1DGauss");
}
FTDistribution1DGauss* FTDistribution1DGauss::clone() const
@@ -87,9 +103,18 @@ std::unique_ptr<IDistribution1DSampler> FTDistribution1DGauss::createSampler() c
return std::make_unique<Distribution1DGaussSampler>(0.0, m_omega);
}
-FTDistribution1DGate::FTDistribution1DGate(double omega) : IFTDistribution1D(omega)
+// ************************************************************************** //
+// class FTDistribution1DGate
+// ************************************************************************** //
+
+FTDistribution1DGate::FTDistribution1DGate(const std::vector<double> P)
+ : IFTDistribution1D({"FTDistribution1DGate", "class_tooltip", {}}, P)
+{
+}
+
+FTDistribution1DGate::FTDistribution1DGate(double omega)
+ : FTDistribution1DGate(std::vector<double>{omega})
{
- setName("FTDistribution1DGate");
}
FTDistribution1DGate* FTDistribution1DGate::clone() const
@@ -112,9 +137,18 @@ std::unique_ptr<IDistribution1DSampler> FTDistribution1DGate::createSampler() co
return std::make_unique<Distribution1DGateSampler>(-m_omega, m_omega);
}
-FTDistribution1DTriangle::FTDistribution1DTriangle(double omega) : IFTDistribution1D(omega)
+// ************************************************************************** //
+// class FTDistribution1DTriangle
+// ************************************************************************** //
+
+FTDistribution1DTriangle::FTDistribution1DTriangle(const std::vector<double> P)
+ : IFTDistribution1D({"FTDistribution1DTriangle", "class_tooltip", {}}, P)
+{
+}
+
+FTDistribution1DTriangle::FTDistribution1DTriangle(double omega)
+ : FTDistribution1DTriangle(std::vector<double>{omega})
{
- setName("FTDistribution1DTriangle");
}
FTDistribution1DTriangle* FTDistribution1DTriangle::clone() const
@@ -138,9 +172,18 @@ std::unique_ptr<IDistribution1DSampler> FTDistribution1DTriangle::createSampler(
return std::make_unique<Distribution1DTriangleSampler>(m_omega);
}
-FTDistribution1DCosine::FTDistribution1DCosine(double omega) : IFTDistribution1D(omega)
+// ************************************************************************** //
+// class FTDistribution1DCosine
+// ************************************************************************** //
+
+FTDistribution1DCosine::FTDistribution1DCosine(const std::vector<double> P)
+ : IFTDistribution1D({"FTDistribution1DCosine", "class_tooltip", {}}, P)
+{
+}
+
+FTDistribution1DCosine::FTDistribution1DCosine(double omega)
+ : FTDistribution1DCosine(std::vector<double>{omega})
{
- setName("FTDistribution1DCosine");
}
FTDistribution1DCosine* FTDistribution1DCosine::clone() const
@@ -166,11 +209,21 @@ std::unique_ptr<IDistribution1DSampler> FTDistribution1DCosine::createSampler()
return std::make_unique<Distribution1DCosineSampler>(m_omega);
}
+// ************************************************************************** //
+// class FTDistribution1DVoigt
+// ************************************************************************** //
+
+FTDistribution1DVoigt::FTDistribution1DVoigt(const std::vector<double> P)
+ : IFTDistribution1D(
+ {"FTDistribution1DVoigt", "class_tooltip", {{"Eta", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_eta(m_P[1])
+{
+}
+
FTDistribution1DVoigt::FTDistribution1DVoigt(double omega, double eta)
- : IFTDistribution1D(omega), m_eta(eta)
+ : FTDistribution1DVoigt(std::vector<double>{omega, eta})
{
- setName("FTDistribution1DVoigt");
- registerParameter("Eta", &m_eta);
}
FTDistribution1DVoigt* FTDistribution1DVoigt::clone() const
diff --git a/Core/Correlations/FTDistributions1D.h b/Core/Correlations/FTDistributions1D.h
index 479eba9cabfef339575a061fa37508408ad6d242..85987b95377ca266c17f2c1ac9922c8a114cfd79 100644
--- a/Core/Correlations/FTDistributions1D.h
+++ b/Core/Correlations/FTDistributions1D.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
#include "Core/Basics/ICloneable.h"
#include "Core/Correlations/IDistribution1DSampler.h"
@@ -26,9 +26,6 @@
class BA_CORE_API_ IFTDistribution1D : public ICloneable, public INode
{
public:
- //! Constructor of one-dimensional probability distribution.
- //! @param omega: half-width of the distribution in nanometers
- IFTDistribution1D(double omega);
IFTDistribution1D(const NodeMeta& meta, const std::vector<double>& PValues);
virtual IFTDistribution1D* clone() const = 0;
@@ -37,7 +34,6 @@ public:
//! is a decay function starting at evaluate(0)=1.
virtual double evaluate(double q) const = 0;
- void setOmega(double omega) { m_omega = omega; }
double omega() const { return m_omega; }
//! Returns the negative of the second order derivative in q space around q=0
@@ -48,7 +44,7 @@ public:
#endif
protected:
- double m_omega;
+ const double& m_omega;
};
//! Exponential IFTDistribution1D exp(-|omega*x|);
@@ -58,6 +54,7 @@ protected:
class BA_CORE_API_ FTDistribution1DCauchy : public IFTDistribution1D
{
public:
+ FTDistribution1DCauchy(const std::vector<double> P);
FTDistribution1DCauchy(double omega);
FTDistribution1DCauchy* clone() const override final;
@@ -77,6 +74,7 @@ public:
class BA_CORE_API_ FTDistribution1DGauss : public IFTDistribution1D
{
public:
+ FTDistribution1DGauss(const std::vector<double> P);
FTDistribution1DGauss(double omega);
FTDistribution1DGauss* clone() const override final;
@@ -96,6 +94,7 @@ public:
class BA_CORE_API_ FTDistribution1DGate : public IFTDistribution1D
{
public:
+ FTDistribution1DGate(const std::vector<double> P);
FTDistribution1DGate(double omega);
FTDistribution1DGate* clone() const override final;
@@ -115,6 +114,7 @@ public:
class BA_CORE_API_ FTDistribution1DTriangle : public IFTDistribution1D
{
public:
+ FTDistribution1DTriangle(const std::vector<double> P);
FTDistribution1DTriangle(double omega);
FTDistribution1DTriangle* clone() const override final;
@@ -135,6 +135,7 @@ public:
class BA_CORE_API_ FTDistribution1DCosine : public IFTDistribution1D
{
public:
+ FTDistribution1DCosine(const std::vector<double> P);
FTDistribution1DCosine(double omega);
FTDistribution1DCosine* clone() const override final;
@@ -158,6 +159,7 @@ public:
//! Constructor of one-dimensional pseudo-Voigt probability distribution.
//! @param omega: half-width of the distribution in nanometers
//! @param eta: parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)
+ FTDistribution1DVoigt(const std::vector<double> P);
FTDistribution1DVoigt(double omega, double eta);
FTDistribution1DVoigt* clone() const override final;
@@ -171,7 +173,7 @@ public:
#endif
protected:
- double m_eta;
+ const double& m_eta;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS1D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS1D_H
diff --git a/Core/Correlations/FTDistributions2D.cpp b/Core/Correlations/FTDistributions2D.cpp
index 9461e81bab956c044cb8248431b359ba4138f536..8f0b8d942c2e75501cdbd1c7103df766858c9649 100644
--- a/Core/Correlations/FTDistributions2D.cpp
+++ b/Core/Correlations/FTDistributions2D.cpp
@@ -16,25 +16,15 @@
#include "Core/Basics/Algorithms.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/ParameterPool.h"
-#include "Core/Parametrization/RealParameter.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
using algo::concat;
-//! Constructor of two-dimensional probability distribution.
-//! @param omega_x: half-width of the distribution along its x-axis in nanometers
-//! @param omega_y: half-width of the distribution along its y-axis in nanometers
-//! @param gamma: angle in direct space between first lattice vector and x-axis of the distribution
-
-IFTDistribution2D::IFTDistribution2D(double omega_x, double omega_y, double gamma)
- : m_omega_x(omega_x), m_omega_y(omega_y), m_gamma(gamma)
-{
- registerParameter("OmegaX", &m_omega_x).setUnit("nm").setNonnegative();
- registerParameter("OmegaY", &m_omega_y).setUnit("nm").setNonnegative();
- registerParameter("Gamma", &m_gamma).setUnit("rad").setLimited(-M_PI_2, M_PI_2);
-}
+// ************************************************************************** //
+// interface IFTDistribution1D
+// ************************************************************************** //
IFTDistribution2D::IFTDistribution2D(const NodeMeta& meta, const std::vector<double>& PValues)
: INode(nodeMetaUnion({{"OmegaX", "nm", "Half-width along x axis", 0, INF, 1.},
@@ -43,7 +33,8 @@ IFTDistribution2D::IFTDistribution2D(const NodeMeta& meta, const std::vector<dou
"direct-space orientation with respect to the first lattice vector",
-M_PI_2, +M_PI_2, 0}},
meta),
- PValues)
+ PValues),
+ m_omega_x(m_P[0]), m_omega_y(m_P[1]), m_gamma(m_P[2])
{
}
@@ -52,10 +43,18 @@ double IFTDistribution2D::sumsq(double qx, double qy) const
return qx * qx * m_omega_x * m_omega_x + qy * qy * m_omega_y * m_omega_y;
}
+// ************************************************************************** //
+// class FTDistribution2DCauchy
+// ************************************************************************** //
+
+FTDistribution2DCauchy::FTDistribution2DCauchy(const std::vector<double> P)
+ : IFTDistribution2D({"FTDistribution2DCauchy", "class_tooltip", {}}, P)
+{
+}
+
FTDistribution2DCauchy::FTDistribution2DCauchy(double omega_x, double omega_y, double gamma)
- : IFTDistribution2D(omega_x, omega_y, gamma)
+ : FTDistribution2DCauchy(std::vector<double>{omega_x, omega_y, gamma})
{
- setName("FTDistribution2DCauchy");
}
FTDistribution2DCauchy* FTDistribution2DCauchy::clone() const
@@ -73,10 +72,18 @@ std::unique_ptr<IDistribution2DSampler> FTDistribution2DCauchy::createSampler()
return std::make_unique<Distribution2DCauchySampler>(m_omega_x, m_omega_y);
}
+// ************************************************************************** //
+// class FTDistribution2DGauss
+// ************************************************************************** //
+
+FTDistribution2DGauss::FTDistribution2DGauss(const std::vector<double> P)
+ : IFTDistribution2D({"FTDistribution2DGauss", "class_tooltip", {}}, P)
+{
+}
+
FTDistribution2DGauss::FTDistribution2DGauss(double omega_x, double omega_y, double gamma)
- : IFTDistribution2D(omega_x, omega_y, gamma)
+ : FTDistribution2DGauss(std::vector<double>{omega_x, omega_y, gamma})
{
- setName("FTDistribution2DGauss");
}
FTDistribution2DGauss* FTDistribution2DGauss::clone() const
@@ -94,10 +101,18 @@ std::unique_ptr<IDistribution2DSampler> FTDistribution2DGauss::createSampler() c
return std::make_unique<Distribution2DGaussSampler>(m_omega_x, m_omega_y);
}
+// ************************************************************************** //
+// class FTDistribution2DGate
+// ************************************************************************** //
+
+FTDistribution2DGate::FTDistribution2DGate(const std::vector<double> P)
+ : IFTDistribution2D({"FTDistribution2DGate", "class_tooltip", {}}, P)
+{
+}
+
FTDistribution2DGate::FTDistribution2DGate(double omega_x, double omega_y, double gamma)
- : IFTDistribution2D(omega_x, omega_y, gamma)
+ : FTDistribution2DGate(std::vector<double>{omega_x, omega_y, gamma})
{
- setName("FTDistribution2DGate");
}
FTDistribution2DGate* FTDistribution2DGate::clone() const
@@ -116,10 +131,18 @@ std::unique_ptr<IDistribution2DSampler> FTDistribution2DGate::createSampler() co
return std::make_unique<Distribution2DGateSampler>(m_omega_x, m_omega_y);
}
+// ************************************************************************** //
+// class FTDistribution2DCone
+// ************************************************************************** //
+
+FTDistribution2DCone::FTDistribution2DCone(const std::vector<double> P)
+ : IFTDistribution2D({"FTDistribution2DCone", "class_tooltip", {}}, P)
+{
+}
+
FTDistribution2DCone::FTDistribution2DCone(double omega_x, double omega_y, double gamma)
- : IFTDistribution2D(omega_x, omega_y, gamma)
+ : FTDistribution2DCone(std::vector<double>{omega_x, omega_y, gamma})
{
- setName("FTDistribution2DCone");
}
FTDistribution2DCone* FTDistribution2DCone::clone() const
@@ -133,7 +156,7 @@ double FTDistribution2DCone::evaluate(double qx, double qy) const
if (scaled_q < std::numeric_limits<double>::epsilon())
return 1.0 - 3.0 * scaled_q * scaled_q / 40.0;
// second part of the integrand: \f$u^2\cdot J_0(u)\f$
- double integral = m_integrator.integrate(
+ double integral = RealIntegrator().integrate(
[](double x) -> double { return x * x * MathFunctions::Bessel_J0(x); }, 0.0, scaled_q);
return 6.0 * (MathFunctions::Bessel_J1c(scaled_q) - integral / scaled_q / scaled_q / scaled_q);
}
@@ -143,6 +166,10 @@ std::unique_ptr<IDistribution2DSampler> FTDistribution2DCone::createSampler() co
return std::make_unique<Distribution2DConeSampler>(m_omega_x, m_omega_y);
}
+// ************************************************************************** //
+// class FTDistribution2DVoigt
+// ************************************************************************** //
+
//! Constructor of two-dimensional pseudo-Voigt probability distribution.
//! @param omega_x: half-width of the distribution along its x-axis in nanometers
//! @param omega_y: half-width of the distribution along its y-axis in nanometers
@@ -150,12 +177,18 @@ std::unique_ptr<IDistribution2DSampler> FTDistribution2DCone::createSampler() co
//! @param gamma: angle in direct space between first lattice vector and x-axis
//! of the distribution in radians
+FTDistribution2DVoigt::FTDistribution2DVoigt(const std::vector<double> P)
+ : IFTDistribution2D(
+ {"FTDistribution2DVoigt", "class_tooltip", {{"Eta", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_eta(m_P[3])
+{
+}
+
FTDistribution2DVoigt::FTDistribution2DVoigt(double omega_x, double omega_y, double gamma,
double eta)
- : IFTDistribution2D(omega_x, omega_y, gamma), m_eta(eta)
+ : FTDistribution2DVoigt(std::vector<double>{omega_x, omega_y, gamma, eta})
{
- setName("FTDistribution2DVoigt");
- registerParameter("Eta", &m_eta);
}
FTDistribution2DVoigt* FTDistribution2DVoigt::clone() const
diff --git a/Core/Correlations/FTDistributions2D.h b/Core/Correlations/FTDistributions2D.h
index a284f2f813fcc5d4f3ef17d3b42145b928e1fdde..3e782e12f42fcae44e8096c9009e2ab33bfa1b78 100644
--- a/Core/Correlations/FTDistributions2D.h
+++ b/Core/Correlations/FTDistributions2D.h
@@ -12,14 +12,13 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
-#define BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
+#define BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
#include "Core/Basics/ICloneable.h"
#include "Core/Basics/MathConstants.h"
#include "Core/Correlations/IDistribution2DSampler.h"
#include "Core/Parametrization/INode.h"
-#include "Core/Tools/Integrator.h"
//! Interface for two-dimensional distributions in Fourier space.
//! @ingroup distribution_internal
@@ -27,20 +26,17 @@
class BA_CORE_API_ IFTDistribution2D : public ICloneable, public INode
{
public:
- IFTDistribution2D(double omega_x, double omega_y, double gamma);
IFTDistribution2D(const NodeMeta& meta, const std::vector<double>& PValues);
IFTDistribution2D* clone() const = 0;
- void setGamma(double gamma) { m_gamma = gamma; }
+ double omegaX() const { return m_omega_x; }
+ double omegaY() const { return m_omega_y; }
double gamma() const { return m_gamma; }
//! Angle in direct space between X- and Y-axis of distribution.
double delta() const { return M_PI_2; }
- double omegaX() const { return m_omega_x; }
- double omegaY() const { return m_omega_y; }
-
//! 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
@@ -53,10 +49,9 @@ public:
protected:
double sumsq(double qx, double qy) const;
- double m_omega_x; //!< Half-width of the distribution along its x-axis in nanometers.
- double m_omega_y; //!< Half-width of the distribution along its y-axis in nanometers.
- //! Angle in direct space between first lattice vector and X-axis of distribution.
- double m_gamma;
+ const double& m_omega_x;
+ const double& m_omega_y;
+ const double& m_gamma;
};
//! Two-dimensional Cauchy distribution in Fourier space;
@@ -67,6 +62,7 @@ protected:
class BA_CORE_API_ FTDistribution2DCauchy : public IFTDistribution2D
{
public:
+ FTDistribution2DCauchy(const std::vector<double> P);
FTDistribution2DCauchy(double omega_x, double omega_y, double gamma);
FTDistribution2DCauchy* clone() const final;
@@ -85,6 +81,7 @@ public:
class BA_CORE_API_ FTDistribution2DGauss : public IFTDistribution2D
{
public:
+ FTDistribution2DGauss(const std::vector<double> P);
FTDistribution2DGauss(double omega_x, double omega_y, double gamma);
FTDistribution2DGauss* clone() const final;
@@ -103,6 +100,7 @@ public:
class BA_CORE_API_ FTDistribution2DGate : public IFTDistribution2D
{
public:
+ FTDistribution2DGate(const std::vector<double> P);
FTDistribution2DGate(double omega_x, double omega_y, double gamma);
FTDistribution2DGate* clone() const final;
@@ -121,6 +119,7 @@ public:
class BA_CORE_API_ FTDistribution2DCone : public IFTDistribution2D
{
public:
+ FTDistribution2DCone(const std::vector<double> P);
FTDistribution2DCone(double omega_x, double omega_y, double gamma);
FTDistribution2DCone* clone() const final;
@@ -129,9 +128,6 @@ public:
#ifndef SWIG
std::unique_ptr<IDistribution2DSampler> createSampler() const final;
#endif
-
-private:
- mutable RealIntegrator m_integrator;
};
//! Two-dimensional Voigt distribution in Fourier space;
@@ -141,6 +137,7 @@ private:
class BA_CORE_API_ FTDistribution2DVoigt : public IFTDistribution2D
{
public:
+ FTDistribution2DVoigt(const std::vector<double> P);
FTDistribution2DVoigt(double omega_x, double omega_y, double gamma, double eta);
FTDistribution2DVoigt* clone() const final;
@@ -152,7 +149,7 @@ public:
#endif
protected:
- double m_eta;
+ const double& m_eta;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_FTDISTRIBUTIONS2D_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_FTDISTRIBUTIONS2D_H
diff --git a/Core/Correlations/IDistribution1DSampler.h b/Core/Correlations/IDistribution1DSampler.h
index 8ec301b8c18a24bab900a56407e5c1a19e713885..db8ca13d39ac8de5f4ee696147e9c48cd2761e48 100644
--- a/Core/Correlations/IDistribution1DSampler.h
+++ b/Core/Correlations/IDistribution1DSampler.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
-#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
#include "Wrap/WinDllMacros.h"
@@ -76,4 +76,4 @@ private:
double m_omega;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION1DSAMPLER_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
diff --git a/Core/Correlations/IDistribution2DSampler.h b/Core/Correlations/IDistribution2DSampler.h
index c47f538393607e7fe8c4da70533ca828622f9133..6415d938c5b375d92b59474d814806de39f68ae7 100644
--- a/Core/Correlations/IDistribution2DSampler.h
+++ b/Core/Correlations/IDistribution2DSampler.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
-#define BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#define BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
#include "Wrap/WinDllMacros.h"
#include <utility>
@@ -79,4 +79,4 @@ private:
double m_omega_x, m_omega_y;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_IDISTRIBUTION2DSAMPLER_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
diff --git a/Core/Correlations/ILayout.h b/Core/Correlations/ILayout.h
index 9f236f1a2416137ca50e9604097aa777d7293867..2f5c0adf9cbfe814561a6246bfdd85331fd43ba2 100644
--- a/Core/Correlations/ILayout.h
+++ b/Core/Correlations/ILayout.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
-#define BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
+#define BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
#include "Core/Scattering/ISample.h"
#include "Core/Tools/SafePointerVector.h"
@@ -63,4 +63,4 @@ protected:
double m_weight;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_ILAYOUT_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_ILAYOUT_H
diff --git a/Core/Correlations/IPeakShape.cpp b/Core/Correlations/IPeakShape.cpp
index 2104274ebd7794a5fc3992f7061326d0655b2bff..c52543b98faa520ef278b591a42819053021c90e 100644
--- a/Core/Correlations/IPeakShape.cpp
+++ b/Core/Correlations/IPeakShape.cpp
@@ -14,8 +14,8 @@
#include "Core/Correlations/IPeakShape.h"
#include "Core/Basics/MathConstants.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
-
#include <limits>
namespace
@@ -76,7 +76,7 @@ double Cauchy3D(double q2, double domainsize)
} // namespace
// ************************************************************************** //
-// class IPeakShape
+// interface IPeakShape
// ************************************************************************** //
IPeakShape::IPeakShape(const NodeMeta& meta, const std::vector<double>& PValues)
@@ -252,8 +252,8 @@ double MisesFisherGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_
m_theta = std::acos(q.unit().dot(m_zenith));
double pre_1 = FisherPrefactor(m_kappa_1);
double pre_2 = MisesPrefactor(m_kappa_2);
- double integral =
- m_integrator.integrate([&](double phi) -> double { return integrand(phi); }, 0.0, M_TWOPI);
+ double integral = RealIntegrator().integrate(
+ [&](double phi) -> double { return integrand(phi); }, 0.0, M_TWOPI);
return m_max_intensity * radial_part * pre_1 * pre_2 * integral;
}
@@ -300,8 +300,8 @@ double MisesGaussPeakShape::evaluate(const kvector_t q, const kvector_t q_lattic
m_phi = std::acos(q_ortho.unit().dot(m_ux));
m_theta = std::acos(q.unit().dot(m_zenith));
double pre = MisesPrefactor(m_kappa);
- double integral =
- m_integrator.integrate([&](double phi) -> double { return integrand(phi); }, 0.0, M_TWOPI);
+ double integral = RealIntegrator().integrate(
+ [&](double phi) -> double { return integrand(phi); }, 0.0, M_TWOPI);
return m_max_intensity * pre * integral;
}
diff --git a/Core/Correlations/IPeakShape.h b/Core/Correlations/IPeakShape.h
index 0f369626916478b23a9257d1c6626193b9f2ab61..cbbfad4dbc61475cda94924af06f79d5e8041f93 100644
--- a/Core/Correlations/IPeakShape.h
+++ b/Core/Correlations/IPeakShape.h
@@ -12,11 +12,10 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
-#define BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
+#ifndef BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
+#define BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
#include "Core/Scattering/ISample.h"
-#include "Core/Tools/Integrator.h"
#include "Core/Vector/Vectors3D.h"
//! Pure virtual interface class that defines the peak shape of a Bragg peak.
@@ -63,7 +62,7 @@ private:
double m_domainsize;
};
-//! Class that implements an isotropic Lorentzian peak shape of a Bragg peak.
+//! An isotropic Lorentzian peak shape of a Bragg peak.
//!
//! @ingroup samples_internal
@@ -85,7 +84,7 @@ private:
double m_domainsize;
};
-//! Class that implements a peak shape that is Gaussian in the radial direction and
+//! A peak shape that is Gaussian in the radial direction and
//! uses the Mises-Fisher distribution in the angular direction.
//!
//! @ingroup samples_internal
@@ -110,8 +109,8 @@ private:
double m_kappa;
};
-//! Class that implements a peak shape that is Lorentzian in the radial direction and
-//! uses the Mises-Fisher distribution in the angular direction.
+//! A peak shape that is Lorentzian in the radial direction and uses the
+//! Mises-Fisher distribution in the angular direction.
//!
//! @ingroup samples_internal
@@ -135,9 +134,8 @@ private:
double m_kappa;
};
-//! Class that implements a peak shape that is Gaussian in the radial direction and a
-//! convolution of a Mises-Fisher distribution with a Mises distribution on the
-//! two-sphere
+//! A peak shape that is Gaussian in the radial direction and a convolution of a
+//! Mises-Fisher distribution with a Mises distribution on the two-sphere.
//!
//! @ingroup samples_internal
@@ -157,18 +155,17 @@ public:
bool angularDisorder() const override { return true; }
private:
- double integrand(double phi) const;
double m_max_intensity;
double m_radial_size;
kvector_t m_zenith;
double m_kappa_1, m_kappa_2;
+
+ double integrand(double phi) const;
mutable double m_theta, m_phi;
mutable kvector_t m_ux, m_uy, m_up;
- mutable RealIntegrator m_integrator;
};
-//! Class that implements a peak shape that is a convolution of a Mises-Fisher distribution
-//! with a 3d Gaussian
+//! A peak shape that is a convolution of a Mises-Fisher distribution with a 3d Gaussian.
//!
//! @ingroup samples_internal
@@ -187,14 +184,14 @@ public:
bool angularDisorder() const override { return true; }
private:
- double integrand(double phi) const;
double m_max_intensity;
double m_radial_size;
kvector_t m_zenith;
double m_kappa;
+
+ double integrand(double phi) const;
mutable double m_theta, m_phi, m_qr;
mutable kvector_t m_ux, m_uy, m_p;
- mutable RealIntegrator m_integrator;
};
-#endif // BORNAGAIN_CORE_AGGREGATE_IPEAKSHAPE_H
+#endif // BORNAGAIN_CORE_CORRELATIONS_IPEAKSHAPE_H
diff --git a/Core/Detector/RectangularDetector.cpp b/Core/Detector/RectangularDetector.cpp
index 40b0cee3e397f9feff156fc0684a594a46e7fd39..e26d4e8292e89a7d348d38c70eb9ce1048059ed3 100644
--- a/Core/Detector/RectangularDetector.cpp
+++ b/Core/Detector/RectangularDetector.cpp
@@ -17,6 +17,7 @@
#include "Core/Basics/Units.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/IDetectorResolution.h"
+#include "Core/Detector/RectangularPixel.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/SimulationElement/SimulationElement.h"
@@ -292,61 +293,3 @@ void RectangularDetector::initUandV(double alpha_i)
m_v0 = m_dbeam_v0 + m_distance * std::tan(2 * alpha_i) * vz;
}
}
-
-RectangularPixel::RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height)
- : m_corner_pos(std::move(corner_pos)), m_width(std::move(width)), m_height(std::move(height))
-{
- m_normal = m_width.cross(m_height);
- auto solid_angle_value = calculateSolidAngle();
- m_solid_angle = solid_angle_value <= 0.0 ? 1.0 : solid_angle_value;
-}
-
-RectangularPixel* RectangularPixel::clone() const
-{
- return new RectangularPixel(m_corner_pos, m_width, m_height);
-}
-
-RectangularPixel* RectangularPixel::createZeroSizePixel(double x, double y) const
-{
- kvector_t position = m_corner_pos + x * m_width + y * m_height;
- kvector_t null_vector;
- return new RectangularPixel(position, null_vector, null_vector);
-}
-
-kvector_t RectangularPixel::getK(double x, double y, double wavelength) const
-{
- kvector_t direction = m_corner_pos + x * m_width + y * m_height;
- double length = M_TWOPI / wavelength;
- return normalizeLength(direction, length);
-}
-
-kvector_t RectangularPixel::getPosition(double x, double y) const
-{
- return m_corner_pos + x * m_width + y * m_height;
-}
-
-double RectangularPixel::getIntegrationFactor(double x, double y) const
-{
- if (m_solid_angle == 0.0)
- return 1.0;
- kvector_t position = m_corner_pos + x * m_width + y * m_height;
- double length = position.mag();
- return std::abs(position.dot(m_normal)) / std::pow(length, 3) / m_solid_angle;
-}
-
-double RectangularPixel::getSolidAngle() const
-{
- return m_solid_angle;
-}
-
-kvector_t RectangularPixel::normalizeLength(const kvector_t direction, double length) const
-{
- return direction.unit() * length;
-}
-
-double RectangularPixel::calculateSolidAngle() const
-{
- kvector_t position = m_corner_pos + 0.5 * m_width + 0.5 * m_height;
- double length = position.mag();
- return std::abs(position.dot(m_normal)) / std::pow(length, 3);
-}
diff --git a/Core/Detector/RectangularDetector.h b/Core/Detector/RectangularDetector.h
index 1cc68fdfa19bfe94798572307e598dfce726114a..63982126b287922f09f3ca94798710367a14cfdc 100644
--- a/Core/Detector/RectangularDetector.h
+++ b/Core/Detector/RectangularDetector.h
@@ -15,32 +15,10 @@
#ifndef BORNAGAIN_CORE_DETECTOR_RECTANGULARDETECTOR_H
#define BORNAGAIN_CORE_DETECTOR_RECTANGULARDETECTOR_H
-#include "Core/Binning/IPixel.h"
#include "Core/Detector/IDetector2D.h"
-//! A pixel in a RectangularDetector.
-
-class BA_CORE_API_ RectangularPixel : public IPixel
-{
-public:
- RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height);
-
- RectangularPixel* clone() const override;
- RectangularPixel* createZeroSizePixel(double x, double y) const override;
- kvector_t getK(double x, double y, double wavelength) const override;
- kvector_t getPosition(double x, double y) const;
- double getIntegrationFactor(double x, double y) const override;
- double getSolidAngle() const override;
-
-private:
- kvector_t normalizeLength(const kvector_t direction, double length) const;
- double calculateSolidAngle() const;
- kvector_t m_corner_pos;
- kvector_t m_width;
- kvector_t m_height;
- double m_solid_angle;
- kvector_t m_normal;
-};
+class IPixel;
+class RectangularPixel;
//! A flat rectangular detector with axes and resolution function.
//! @ingroup detector
diff --git a/Core/Detector/RectangularPixel.cpp b/Core/Detector/RectangularPixel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6814b69113e76372945818788f1e88056f8a0408
--- /dev/null
+++ b/Core/Detector/RectangularPixel.cpp
@@ -0,0 +1,79 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/Detector/RectangularPixel.cpp
+//! @brief Implements class RectangularPixel.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#include "Core/Detector/RectangularPixel.h"
+#include "Core/Basics/MathConstants.h"
+#include "Core/Basics/Units.h"
+#include "Core/Beam/Beam.h"
+#include "Core/Detector/IDetectorResolution.h"
+#include "Core/Detector/RegionOfInterest.h"
+#include "Core/SimulationElement/SimulationElement.h"
+
+RectangularPixel::RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height)
+ : m_corner_pos(std::move(corner_pos)), m_width(std::move(width)), m_height(std::move(height))
+{
+ m_normal = m_width.cross(m_height);
+ auto solid_angle_value = calculateSolidAngle();
+ m_solid_angle = solid_angle_value <= 0.0 ? 1.0 : solid_angle_value;
+}
+
+RectangularPixel* RectangularPixel::clone() const
+{
+ return new RectangularPixel(m_corner_pos, m_width, m_height);
+}
+
+RectangularPixel* RectangularPixel::createZeroSizePixel(double x, double y) const
+{
+ kvector_t position = m_corner_pos + x * m_width + y * m_height;
+ kvector_t null_vector;
+ return new RectangularPixel(position, null_vector, null_vector);
+}
+
+kvector_t RectangularPixel::getK(double x, double y, double wavelength) const
+{
+ kvector_t direction = m_corner_pos + x * m_width + y * m_height;
+ double length = M_TWOPI / wavelength;
+ return normalizeLength(direction, length);
+}
+
+kvector_t RectangularPixel::getPosition(double x, double y) const
+{
+ return m_corner_pos + x * m_width + y * m_height;
+}
+
+double RectangularPixel::getIntegrationFactor(double x, double y) const
+{
+ if (m_solid_angle == 0.0)
+ return 1.0;
+ kvector_t position = m_corner_pos + x * m_width + y * m_height;
+ double length = position.mag();
+ return std::abs(position.dot(m_normal)) / std::pow(length, 3) / m_solid_angle;
+}
+
+double RectangularPixel::getSolidAngle() const
+{
+ return m_solid_angle;
+}
+
+kvector_t RectangularPixel::normalizeLength(const kvector_t direction, double length) const
+{
+ return direction.unit() * length;
+}
+
+double RectangularPixel::calculateSolidAngle() const
+{
+ kvector_t position = m_corner_pos + 0.5 * m_width + 0.5 * m_height;
+ double length = position.mag();
+ return std::abs(position.dot(m_normal)) / std::pow(length, 3);
+}
diff --git a/Core/Detector/RectangularPixel.h b/Core/Detector/RectangularPixel.h
new file mode 100644
index 0000000000000000000000000000000000000000..c9589c7319895fff9d0f80c82865699b4b36bab4
--- /dev/null
+++ b/Core/Detector/RectangularPixel.h
@@ -0,0 +1,44 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/Detector/RectangularPixel.h
+//! @brief Defines class RectangularPixel.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#ifndef BORNAGAIN_CORE_DETECTOR_RECTANGULARPIXEL_H
+#define BORNAGAIN_CORE_DETECTOR_RECTANGULARPIXEL_H
+
+#include "Core/Binning/IPixel.h"
+
+//! A pixel in a RectangularDetector.
+
+class BA_CORE_API_ RectangularPixel : public IPixel
+{
+public:
+ RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height);
+
+ RectangularPixel* clone() const override;
+ RectangularPixel* createZeroSizePixel(double x, double y) const override;
+ kvector_t getK(double x, double y, double wavelength) const override;
+ kvector_t getPosition(double x, double y) const;
+ double getIntegrationFactor(double x, double y) const override;
+ double getSolidAngle() const override;
+
+private:
+ kvector_t normalizeLength(const kvector_t direction, double length) const;
+ double calculateSolidAngle() const;
+ kvector_t m_corner_pos;
+ kvector_t m_width;
+ kvector_t m_height;
+ double m_solid_angle;
+ kvector_t m_normal;
+};
+
+#endif // BORNAGAIN_CORE_DETECTOR_RECTANGULARPIXEL_H
diff --git a/Core/Detector/SphericalDetector.cpp b/Core/Detector/SphericalDetector.cpp
index 4da863e750649f46e932a1a2e7c9e0bc8576ac87..20dcff097a862f39932d2bc86ff351e1209048da 100644
--- a/Core/Detector/SphericalDetector.cpp
+++ b/Core/Detector/SphericalDetector.cpp
@@ -18,6 +18,7 @@
#include "Core/Beam/Beam.h"
#include "Core/Binning/IPixel.h"
#include "Core/Detector/IDetectorResolution.h"
+#include "Core/Detector/SphericalPixel.h"
#include "Core/SimulationElement/SimulationElement.h"
SphericalDetector::SphericalDetector()
@@ -84,45 +85,3 @@ size_t SphericalDetector::getIndexOfSpecular(const Beam& beam) const
return getGlobalIndex(phi_axis.findClosestIndex(phi), alpha_axis.findClosestIndex(alpha));
return totalSize();
}
-
-SphericalPixel::SphericalPixel(const Bin1D& alpha_bin, const Bin1D& phi_bin)
- : m_alpha(alpha_bin.m_lower), m_phi(phi_bin.m_lower), m_dalpha(alpha_bin.getBinSize()),
- m_dphi(phi_bin.getBinSize())
-{
- auto solid_angle_value = std::abs(m_dphi * (std::sin(m_alpha + m_dalpha) - std::sin(m_alpha)));
- m_solid_angle = solid_angle_value <= 0.0 ? 1.0 : solid_angle_value;
-}
-
-SphericalPixel* SphericalPixel::clone() const
-{
- return new SphericalPixel(*this);
-}
-
-SphericalPixel* SphericalPixel::createZeroSizePixel(double x, double y) const
-{
- double phi = m_phi + x * m_dphi;
- double alpha = m_alpha + y * m_dalpha;
- Bin1D alpha_bin(alpha, alpha);
- Bin1D phi_bin(phi, phi);
- return new SphericalPixel(alpha_bin, phi_bin);
-}
-
-kvector_t SphericalPixel::getK(double x, double y, double wavelength) const
-{
- double phi = m_phi + x * m_dphi;
- double alpha = m_alpha + y * m_dalpha;
- return vecOfLambdaAlphaPhi(wavelength, alpha, phi);
-}
-
-double SphericalPixel::getIntegrationFactor(double /* x */, double y) const
-{
- if (m_dalpha == 0.0)
- return 1.0;
- double alpha = m_alpha + y * m_dalpha;
- return std::cos(alpha) * m_dalpha / (std::sin(m_alpha + m_dalpha) - std::sin(m_alpha));
-}
-
-double SphericalPixel::getSolidAngle() const
-{
- return m_solid_angle;
-}
diff --git a/Core/Detector/SphericalDetector.h b/Core/Detector/SphericalDetector.h
index b841bb8fb15fc087b54a3ace77163adc841da252..039ccb0866fbd70e88d0a14ec45d42f0f3229ac5 100644
--- a/Core/Detector/SphericalDetector.h
+++ b/Core/Detector/SphericalDetector.h
@@ -15,27 +15,10 @@
#ifndef BORNAGAIN_CORE_DETECTOR_SPHERICALDETECTOR_H
#define BORNAGAIN_CORE_DETECTOR_SPHERICALDETECTOR_H
-#include "Core/Binning/IPixel.h"
#include "Core/Detector/IDetector2D.h"
-//! A pixel in a SphericalDetector
-
-class BA_CORE_API_ SphericalPixel : public IPixel
-{
-public:
- SphericalPixel(const Bin1D& alpha_bin, const Bin1D& phi_bin);
-
- SphericalPixel* clone() const override;
- SphericalPixel* createZeroSizePixel(double x, double y) const override;
- kvector_t getK(double x, double y, double wavelength) const override;
- double getIntegrationFactor(double x, double y) const override;
- double getSolidAngle() const override;
-
-private:
- double m_alpha, m_phi;
- double m_dalpha, m_dphi;
- double m_solid_angle;
-};
+class IPixel;
+class SphericalPixel;
//! A spherical detector with axes and resolution function.
//! @ingroup detector
diff --git a/Core/Detector/SphericalPixel.cpp b/Core/Detector/SphericalPixel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d4959ad46c090b75d4e055a1ef267156bfaaf796
--- /dev/null
+++ b/Core/Detector/SphericalPixel.cpp
@@ -0,0 +1,58 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/Detector/SphericalPixel.cpp
+//! @brief Implements class SphericalPixel.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#include "Core/Detector/SphericalPixel.h"
+#include "Core/Binning/Bin.h"
+
+SphericalPixel::SphericalPixel(const Bin1D& alpha_bin, const Bin1D& phi_bin)
+ : m_alpha(alpha_bin.m_lower), m_phi(phi_bin.m_lower), m_dalpha(alpha_bin.getBinSize()),
+ m_dphi(phi_bin.getBinSize())
+{
+ auto solid_angle_value = std::abs(m_dphi * (std::sin(m_alpha + m_dalpha) - std::sin(m_alpha)));
+ m_solid_angle = solid_angle_value <= 0.0 ? 1.0 : solid_angle_value;
+}
+
+SphericalPixel* SphericalPixel::clone() const
+{
+ return new SphericalPixel(*this);
+}
+
+SphericalPixel* SphericalPixel::createZeroSizePixel(double x, double y) const
+{
+ double phi = m_phi + x * m_dphi;
+ double alpha = m_alpha + y * m_dalpha;
+ Bin1D alpha_bin(alpha, alpha);
+ Bin1D phi_bin(phi, phi);
+ return new SphericalPixel(alpha_bin, phi_bin);
+}
+
+kvector_t SphericalPixel::getK(double x, double y, double wavelength) const
+{
+ double phi = m_phi + x * m_dphi;
+ double alpha = m_alpha + y * m_dalpha;
+ return vecOfLambdaAlphaPhi(wavelength, alpha, phi);
+}
+
+double SphericalPixel::getIntegrationFactor(double /* x */, double y) const
+{
+ if (m_dalpha == 0.0)
+ return 1.0;
+ double alpha = m_alpha + y * m_dalpha;
+ return std::cos(alpha) * m_dalpha / (std::sin(m_alpha + m_dalpha) - std::sin(m_alpha));
+}
+
+double SphericalPixel::getSolidAngle() const
+{
+ return m_solid_angle;
+}
diff --git a/Core/Detector/SphericalPixel.h b/Core/Detector/SphericalPixel.h
new file mode 100644
index 0000000000000000000000000000000000000000..ff260e224a0274de85dcbddcf7326debd9f03d46
--- /dev/null
+++ b/Core/Detector/SphericalPixel.h
@@ -0,0 +1,41 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/Detector/SphericalPixel.h
+//! @brief Defines class SphericalPixel.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#ifndef BORNAGAIN_CORE_DETECTOR_SPHERICALPIXEL_H
+#define BORNAGAIN_CORE_DETECTOR_SPHERICALPIXEL_H
+
+#include "Core/Binning/IPixel.h"
+
+struct Bin1D;
+
+//! A pixel in a SphericalDetector
+
+class BA_CORE_API_ SphericalPixel : public IPixel
+{
+public:
+ SphericalPixel(const Bin1D& alpha_bin, const Bin1D& phi_bin);
+
+ SphericalPixel* clone() const override;
+ SphericalPixel* createZeroSizePixel(double x, double y) const override;
+ kvector_t getK(double x, double y, double wavelength) const override;
+ double getIntegrationFactor(double x, double y) const override;
+ double getSolidAngle() const override;
+
+private:
+ double m_alpha, m_phi;
+ double m_dalpha, m_dphi;
+ double m_solid_angle;
+};
+
+#endif // BORNAGAIN_CORE_DETECTOR_SPHERICALPIXEL_H
diff --git a/Core/Tools/OrderedMap.h b/Core/Export/OrderedMap.h
similarity index 94%
rename from Core/Tools/OrderedMap.h
rename to Core/Export/OrderedMap.h
index 8926bda95e55b0062fda4f1ea9eb6b4463d625c9..616a930c708e4a1693d08a2df0a67ff0f1cb49bf 100644
--- a/Core/Tools/OrderedMap.h
+++ b/Core/Export/OrderedMap.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/Tools/OrderedMap.h
+//! @file Core/Export/OrderedMap.h
//! @brief Defines class OrderedMap.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
-#define BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
+#ifndef BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
+#define BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
#include "Core/Basics/Assert.h"
#include <iostream>
@@ -108,4 +108,4 @@ private:
list_t m_list;
};
-#endif // BORNAGAIN_CORE_TOOLS_ORDEREDMAP_H
+#endif // BORNAGAIN_CORE_EXPORT_ORDEREDMAP_H
diff --git a/Core/Export/SampleLabelHandler.h b/Core/Export/SampleLabelHandler.h
index 405a24073fc31bd4792f8750f3c2ca1e4153f220..b9fe315be327a2df8ac1074c3b55b2b75d3d0370 100644
--- a/Core/Export/SampleLabelHandler.h
+++ b/Core/Export/SampleLabelHandler.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_CORE_EXPORT_SAMPLELABELHANDLER_H
#include "Core/Basics/Exceptions.h"
-#include "Core/Tools/OrderedMap.h"
+#include "Core/Export/OrderedMap.h"
class Crystal;
class IAbstractParticle;
diff --git a/Core/HardParticle/FormFactorAnisoPyramid.cpp b/Core/HardParticle/FormFactorAnisoPyramid.cpp
index 4f47062504a7dd2e73410544a11275e2ea9a1d53..4b034cf3385fd59e815edd7d8b2581b65f79f754 100644
--- a/Core/HardParticle/FormFactorAnisoPyramid.cpp
+++ b/Core/HardParticle/FormFactorAnisoPyramid.cpp
@@ -15,7 +15,6 @@
#include "Core/HardParticle/FormFactorAnisoPyramid.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorAnisoPyramid::topology = {{{{3, 2, 1, 0}, true},
@@ -31,16 +30,23 @@ const PolyhedralTopology FormFactorAnisoPyramid::topology = {{{{3, 2, 1, 0}, tru
//! @param width: width of the rectangular base in nm
//! @param height: height of pyramid in nm
//! @param alpha: dihedral angle in radians between base and facet
+FormFactorAnisoPyramid::FormFactorAnisoPyramid(const std::vector<double> P)
+ : FormFactorPolyhedron({"AnisoPyramid",
+ "class_tooltip",
+ {{"Length", "nm", "para_tooltip", 0, +INF, 0},
+ {"Width", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"Alpha", "rad", "para_tooltip", 0., M_PI_2, 0}}},
+ P),
+ m_length(m_P[0]), m_width(m_P[1]), m_height(m_P[2]), m_alpha(m_P[3])
+{
+ onChange();
+}
+
FormFactorAnisoPyramid::FormFactorAnisoPyramid(double length, double width, double height,
double alpha)
- : FormFactorPolyhedron(), m_length(length), m_width(width), m_height(height), m_alpha(alpha)
+ : FormFactorAnisoPyramid(std::vector<double>{length, width, height, alpha})
{
- setName("AnisoPyramid");
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Width", &m_width).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("Alpha", &m_alpha).setUnit("rad").setLimited(0., M_PI_2);
- onChange();
}
IFormFactor* FormFactorAnisoPyramid::sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Core/HardParticle/FormFactorAnisoPyramid.h b/Core/HardParticle/FormFactorAnisoPyramid.h
index 5684a97bad51e41141e665b0e9c770c89ce78977..ae85f38501db93818618374f563968e82a44918e 100644
--- a/Core/HardParticle/FormFactorAnisoPyramid.h
+++ b/Core/HardParticle/FormFactorAnisoPyramid.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorAnisoPyramid : public FormFactorPolyhedron
{
public:
+ FormFactorAnisoPyramid(const std::vector<double> P);
FormFactorAnisoPyramid(double length, double width, double height, double alpha);
FormFactorAnisoPyramid* clone() const override final
@@ -45,10 +46,10 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_length;
- double m_width;
- double m_height;
- double m_alpha;
+ const double& m_length;
+ const double& m_width;
+ const double& m_height;
+ const double& m_alpha;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORANISOPYRAMID_H
diff --git a/Core/HardParticle/FormFactorBar.cpp b/Core/HardParticle/FormFactorBar.cpp
index 73f39ff7be684e6c1357d40ce8fa829c92f52f4f..8f3d1906bb60182f2cea0072dea788ba80ee49c7 100644
--- a/Core/HardParticle/FormFactorBar.cpp
+++ b/Core/HardParticle/FormFactorBar.cpp
@@ -19,10 +19,14 @@
// class FormFactorBarGauss
// ************************************************************************** //
+FormFactorBarGauss::FormFactorBarGauss(const std::vector<double> P)
+ : IProfileRectangularRipple({"BarGauss", "class_tooltip", {}}, P)
+{
+}
+
FormFactorBarGauss::FormFactorBarGauss(double length, double width, double height)
- : ProfileBar{length, width, height}
+ : FormFactorBarGauss(std::vector<double>{length, width, height})
{
- setName("BarGauss");
}
FormFactorBarGauss* FormFactorBarGauss::clone() const
@@ -44,10 +48,14 @@ complex_t FormFactorBarGauss::factor_x(complex_t qx) const
// class FormFactorBarLorentz
// ************************************************************************** //
+FormFactorBarLorentz::FormFactorBarLorentz(const std::vector<double> P)
+ : IProfileRectangularRipple({"BarLorentz", "class_tooltip", {}}, P)
+{
+}
+
FormFactorBarLorentz::FormFactorBarLorentz(double length, double width, double height)
- : ProfileBar{length, width, height}
+ : FormFactorBarLorentz(std::vector<double>{length, width, height})
{
- setName("BarLorentz");
}
FormFactorBarLorentz* FormFactorBarLorentz::clone() const
diff --git a/Core/HardParticle/FormFactorBar.h b/Core/HardParticle/FormFactorBar.h
index 70adb8c16629341de2ad94e1a46517389fda98a4..fe3569c5b89a427fdc50ad0eff9281fb53f9fdfd 100644
--- a/Core/HardParticle/FormFactorBar.h
+++ b/Core/HardParticle/FormFactorBar.h
@@ -15,32 +15,34 @@
#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
-#include "Core/HardParticle/ProfileBar.h"
+#include "Core/HardParticle/IProfileRipple.h"
//! The form factor of an elongated bar, with Gaussian profile in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorBarGauss : public ProfileBar
+class BA_CORE_API_ FormFactorBarGauss : public IProfileRectangularRipple
{
public:
+ FormFactorBarGauss(const std::vector<double> P);
FormFactorBarGauss(double length, double width, double height);
- FormFactorBarGauss* clone() const override final;
- void accept(INodeVisitor* visitor) const override final;
+ FormFactorBarGauss* clone() const final;
+ void accept(INodeVisitor* visitor) const final;
private:
- complex_t factor_x(complex_t qx) const override final;
+ complex_t factor_x(complex_t qx) const final;
};
//! The form factor of an elongated, with Lorentz form factor in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorBarLorentz : public ProfileBar
+class BA_CORE_API_ FormFactorBarLorentz : public IProfileRectangularRipple
{
public:
+ FormFactorBarLorentz(const std::vector<double> P);
FormFactorBarLorentz(double length, double width, double height);
- FormFactorBarLorentz* clone() const override final;
- void accept(INodeVisitor* visitor) const override final;
+ FormFactorBarLorentz* clone() const final;
+ void accept(INodeVisitor* visitor) const final;
private:
- complex_t factor_x(complex_t qx) const override final;
+ complex_t factor_x(complex_t qx) const final;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBAR_H
diff --git a/Core/HardParticle/FormFactorBox.cpp b/Core/HardParticle/FormFactorBox.cpp
index 219b4953b0ac4f1c5b1a07d9c29452ad7f74e1db..64bc064a844cf20b8df8cb186d666f8026f0ae6e 100644
--- a/Core/HardParticle/FormFactorBox.cpp
+++ b/Core/HardParticle/FormFactorBox.cpp
@@ -13,23 +13,29 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorBox.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
//! Constructor of a rectangular cuboid.
//! @param length: length of the base in nanometers
//! @param width: width of the base in nanometers
//! @param height: height of the box in nanometers
-FormFactorBox::FormFactorBox(double length, double width, double height)
- : m_length(length), m_width(width), m_height(height)
+FormFactorBox::FormFactorBox(const std::vector<double> P)
+ : FormFactorPolygonalPrism({"Box",
+ "class_tooltip",
+ {{"Length", "nm", "para_tooltip", 0, +INF, 0},
+ {"Width", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_length(m_P[0]), m_width(m_P[1]), m_height(m_P[2])
{
- setName("Box");
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Width", &m_width).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorBox::FormFactorBox(double length, double width, double height)
+ : FormFactorBox(std::vector<double>{length, width, height})
+{
+}
+
complex_t FormFactorBox::evaluate_for_q(cvector_t q) const
{
complex_t qzHdiv2 = m_height / 2 * q.z();
diff --git a/Core/HardParticle/FormFactorBox.h b/Core/HardParticle/FormFactorBox.h
index f3689c207f71bce60452e041d3624003c11bfe9a..99af81279b9eff83663e768f0f8d9bf7ab63f973 100644
--- a/Core/HardParticle/FormFactorBox.h
+++ b/Core/HardParticle/FormFactorBox.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorBox : public FormFactorPolygonalPrism
{
public:
+ FormFactorBox(const std::vector<double> P);
FormFactorBox(double length, double width, double height);
FormFactorBox* clone() const override final
@@ -47,9 +48,9 @@ protected:
double height() const final { return m_height; }
private:
- double m_length;
- double m_width;
- double m_height;
+ const double& m_length;
+ const double& m_width;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORBOX_H
diff --git a/Core/HardParticle/FormFactorCantellatedCube.cpp b/Core/HardParticle/FormFactorCantellatedCube.cpp
index 319e8f82d63be6b28e86e2aeb86f567bc57b81e7..bf88c253ed5f362b7460f9351820c669dc2dff57 100644
--- a/Core/HardParticle/FormFactorCantellatedCube.cpp
+++ b/Core/HardParticle/FormFactorCantellatedCube.cpp
@@ -14,7 +14,6 @@
#include "Core/HardParticle/FormFactorCantellatedCube.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Parametrization/RealParameter.h"
const PolyhedralTopology FormFactorCantellatedCube::topology = {
{
@@ -50,15 +49,22 @@ const PolyhedralTopology FormFactorCantellatedCube::topology = {
//! Constructor of a truncated cube.
//! @param length: length of the full cube's edge in nanometers
//! @param removed_length: removed length from each edge of the cube in nanometers
-FormFactorCantellatedCube::FormFactorCantellatedCube(double length, double removed_length)
- : FormFactorPolyhedron(), m_length(length), m_removed_length(removed_length)
+FormFactorCantellatedCube::FormFactorCantellatedCube(const std::vector<double> P)
+ : FormFactorPolyhedron({"CantellatedCube",
+ "class_tooltip",
+ {{"Length", "nm", "para_tooltip", 0, +INF, 0},
+ {"RemovedLength", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_length(m_P[0]), m_removed_length(m_P[1])
{
- setName("CantellatedCube");
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("RemovedLength", &m_removed_length).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorCantellatedCube::FormFactorCantellatedCube(double length, double removed_length)
+ : FormFactorCantellatedCube(std::vector<double>{length, removed_length})
+{
+}
+
void FormFactorCantellatedCube::onChange()
{
if (m_removed_length > 0.5 * m_length) {
diff --git a/Core/HardParticle/FormFactorCantellatedCube.h b/Core/HardParticle/FormFactorCantellatedCube.h
index 17c6731a7bfe0be7a46ff99bcb61df28707d212a..0737e7992d0bf9db79ae16f9c4ee7260542665ee 100644
--- a/Core/HardParticle/FormFactorCantellatedCube.h
+++ b/Core/HardParticle/FormFactorCantellatedCube.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorCantellatedCube : public FormFactorPolyhedron
{
public:
+ FormFactorCantellatedCube(const std::vector<double> P);
FormFactorCantellatedCube(double length, double removed_length);
FormFactorCantellatedCube* clone() const override final
@@ -39,8 +40,8 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_length;
- double m_removed_length;
+ const double& m_length;
+ const double& m_removed_length;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCANTELLATEDCUBE_H
diff --git a/Core/HardParticle/FormFactorCone.cpp b/Core/HardParticle/FormFactorCone.cpp
index 8616fa9fa098691d22e37f28034949e4ad5594d6..77474e7a463a1197233822159870b0d7cb7aa71f 100644
--- a/Core/HardParticle/FormFactorCone.cpp
+++ b/Core/HardParticle/FormFactorCone.cpp
@@ -15,8 +15,8 @@
#include "Core/HardParticle/FormFactorCone.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/DoubleEllipse.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
@@ -24,10 +24,15 @@
//! @param radius: radius of the base in nanometers
//! @param height: height of the cone in nanometers
//! @param alpha: angle between the base and the side surface in radians
-FormFactorCone::FormFactorCone(double radius, double height, double alpha)
- : m_radius(radius), m_height(height), m_alpha(alpha)
+FormFactorCone::FormFactorCone(const std::vector<double> P)
+ : IFormFactorBorn({"Cone",
+ "class_tooltip",
+ {{"Radius", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"Alpha", "rad", "para_tooltip", 0., M_PI_2, 0}}},
+ P),
+ m_radius(m_P[0]), m_height(m_P[1]), m_alpha(m_P[2])
{
- setName("Cone");
m_cot_alpha = MathFunctions::cot(m_alpha);
if (!std::isfinite(m_cot_alpha) || m_cot_alpha < 0)
throw Exceptions::OutOfBoundsException("pyramid angle alpha out of bounds");
@@ -40,12 +45,14 @@ FormFactorCone::FormFactorCone(double radius, double height, double alpha)
ostr << "Check for 'height <= radius*tan(alpha)' failed.";
throw Exceptions::ClassInitializationException(ostr.str());
}
- registerParameter("Radius", &m_radius).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("Alpha", &m_alpha).setUnit("rad").setLimited(0., M_PI_2);
onChange();
}
+FormFactorCone::FormFactorCone(double radius, double height, double alpha)
+ : FormFactorCone(std::vector<double>{radius, height, alpha})
+{
+}
+
//! Integrand for complex form factor.
complex_t FormFactorCone::Integrand(double Z) const
{
@@ -67,7 +74,7 @@ complex_t FormFactorCone::evaluate_for_q(cvector_t q) const
return M_PI / 3. * (R * R * H + (R * R - R2 * R2) * (apex_height - H));
} else {
complex_t integral =
- m_integrator.integrate([&](double Z) { return Integrand(Z); }, 0., m_height);
+ ComplexIntegrator().integrate([&](double Z) { return Integrand(Z); }, 0., m_height);
return M_TWOPI * integral;
}
}
diff --git a/Core/HardParticle/FormFactorCone.h b/Core/HardParticle/FormFactorCone.h
index b11065dd52e3cd1e7fd672706418d7bfd501c568..ff8b31ada3d2060c0e5caf6553a38d5b625df64c 100644
--- a/Core/HardParticle/FormFactorCone.h
+++ b/Core/HardParticle/FormFactorCone.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
#include "Core/Scattering/IFormFactorBorn.h"
-#include "Core/Tools/Integrator.h"
//! A conical frustum (cone truncated parallel to the base) with circular base.
//! @ingroup hardParticle
@@ -24,6 +23,7 @@
class BA_CORE_API_ FormFactorCone : public IFormFactorBorn
{
public:
+ FormFactorCone(const std::vector<double> P);
FormFactorCone(double radius, double height, double alpha);
FormFactorCone* clone() const override final
@@ -49,12 +49,11 @@ protected:
private:
complex_t Integrand(double Z) const;
- double m_radius;
- double m_height;
- double m_alpha;
+ const double& m_radius;
+ const double& m_height;
+ const double& m_alpha;
double m_cot_alpha;
mutable cvector_t m_q;
- mutable ComplexIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE_H
diff --git a/Core/HardParticle/FormFactorCone6.cpp b/Core/HardParticle/FormFactorCone6.cpp
index 89f53229dc63109823266ae6c1e8d501bca7a062..aeb1c022622cf4a4c450314b485e9db39e03caf4 100644
--- a/Core/HardParticle/FormFactorCone6.cpp
+++ b/Core/HardParticle/FormFactorCone6.cpp
@@ -15,7 +15,6 @@
#include "Core/HardParticle/FormFactorCone6.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorCone6::topology = {{{{5, 4, 3, 2, 1, 0}, true},
@@ -32,16 +31,23 @@ const PolyhedralTopology FormFactorCone6::topology = {{{{5, 4, 3, 2, 1, 0}, true
//! @param base_edge: Edge of the regular hexagonal base in nanometers
//! @param height: height of a truncated pyramid in nanometers
//! @param alpha: dihedral angle in radians between base and facet
-FormFactorCone6::FormFactorCone6(double base_edge, double height, double alpha)
- : FormFactorPolyhedron(), m_base_edge(base_edge), m_height(height), m_alpha(alpha)
+FormFactorCone6::FormFactorCone6(const std::vector<double> P)
+ : FormFactorPolyhedron({"Cone6",
+ "class_tooltip",
+ {{"BaseEdge", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"Alpha", "rad", "para_tooltip", 0., M_PI_2, 0}}},
+ P),
+ m_base_edge(m_P[0]), m_height(m_P[1]), m_alpha(m_P[2])
{
- setName("Cone6");
- registerParameter("BaseEdge", &m_base_edge).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("Alpha", &m_alpha).setUnit("rad").setLimited(0., M_PI_2);
onChange();
}
+FormFactorCone6::FormFactorCone6(double base_edge, double height, double alpha)
+ : FormFactorCone6(std::vector<double>{base_edge, height, alpha})
+{
+}
+
IFormFactor* FormFactorCone6::sliceFormFactor(ZLimits limits, const IRotation& rot,
kvector_t translation) const
{
diff --git a/Core/HardParticle/FormFactorCone6.h b/Core/HardParticle/FormFactorCone6.h
index 9e47288f5e9e13df14cfd4d47afebbc80d82835d..ae9918c5e612ff9ee4bc13d12378003fdeaf47b1 100644
--- a/Core/HardParticle/FormFactorCone6.h
+++ b/Core/HardParticle/FormFactorCone6.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorCone6 : public FormFactorPolyhedron
{
public:
+ FormFactorCone6(const std::vector<double> P);
FormFactorCone6(double base_edge, double height, double alpha);
FormFactorCone6* clone() const override final
@@ -43,9 +44,9 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_base_edge;
- double m_height;
- double m_alpha;
+ const double& m_base_edge;
+ const double& m_height;
+ const double& m_alpha;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCONE6_H
diff --git a/Core/HardParticle/FormFactorCosineRipple.cpp b/Core/HardParticle/FormFactorCosineRipple.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e667bf8fedc1482e26bdd40cc7c173fe63473cd0
--- /dev/null
+++ b/Core/HardParticle/FormFactorCosineRipple.cpp
@@ -0,0 +1,104 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/HardParticle/FormFactorCosineRipple.cpp
+//! @brief Implements classes FormFactorCosineRipple*.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#include "Core/HardParticle/FormFactorCosineRipple.h"
+#include "Core/HardParticle/Ripples.h"
+
+// ************************************************************************** //
+// class FormFactorCosineRippleBox
+// ************************************************************************** //
+
+FormFactorCosineRippleBox::FormFactorCosineRippleBox(const std::vector<double> P)
+ : ICosineRipple({"CosineRippleBox", "class_tooltip", {}}, P)
+{
+}
+
+FormFactorCosineRippleBox::FormFactorCosineRippleBox(double length, double width, double height)
+ : FormFactorCosineRippleBox(std::vector<double>{length, width, height})
+{
+}
+
+FormFactorCosineRippleBox* FormFactorCosineRippleBox::clone() const
+{
+ return new FormFactorCosineRippleBox(m_length, m_width, m_height);
+}
+
+void FormFactorCosineRippleBox::accept(INodeVisitor* visitor) const
+{
+ visitor->visit(this);
+}
+
+complex_t FormFactorCosineRippleBox::factor_x(complex_t qx) const
+{
+ return ripples::factor_x_box(qx, m_length);
+}
+
+// ************************************************************************** //
+// class FormFactorCosineRippleGauss
+// ************************************************************************** //
+
+FormFactorCosineRippleGauss::FormFactorCosineRippleGauss(const std::vector<double> P)
+ : ICosineRipple({"CosineRippleGauss", "class_tooltip", {}}, P)
+{
+}
+
+FormFactorCosineRippleGauss::FormFactorCosineRippleGauss(double length, double width, double height)
+ : FormFactorCosineRippleGauss(std::vector<double>{length, width, height})
+{
+}
+
+FormFactorCosineRippleGauss* FormFactorCosineRippleGauss::clone() const
+{
+ return new FormFactorCosineRippleGauss(m_length, m_width, m_height);
+}
+
+void FormFactorCosineRippleGauss::accept(INodeVisitor* visitor) const
+{
+ visitor->visit(this);
+}
+
+complex_t FormFactorCosineRippleGauss::factor_x(complex_t qx) const
+{
+ return ripples::factor_x_Gauss(qx, m_length);
+}
+
+// ************************************************************************** //
+// class FormFactorCosineRippleLorentz
+// ************************************************************************** //
+
+FormFactorCosineRippleLorentz::FormFactorCosineRippleLorentz(const std::vector<double> P)
+ : ICosineRipple({"CosineRippleLorentz", "class_tooltip", {}}, P)
+{
+}
+
+FormFactorCosineRippleLorentz::FormFactorCosineRippleLorentz(double length, double width,
+ double height)
+ : FormFactorCosineRippleLorentz(std::vector<double>{length, width, height})
+{
+}
+
+FormFactorCosineRippleLorentz* FormFactorCosineRippleLorentz::clone() const
+{
+ return new FormFactorCosineRippleLorentz(m_length, m_width, m_height);
+}
+
+void FormFactorCosineRippleLorentz::accept(INodeVisitor* visitor) const
+{
+ visitor->visit(this);
+}
+
+complex_t FormFactorCosineRippleLorentz::factor_x(complex_t qx) const
+{
+ return ripples::factor_x_Lorentz(qx, m_length);
+}
diff --git a/Core/HardParticle/FormFactorRipple1.h b/Core/HardParticle/FormFactorCosineRipple.h
similarity index 51%
rename from Core/HardParticle/FormFactorRipple1.h
rename to Core/HardParticle/FormFactorCosineRipple.h
index e8944b58a20eca36b88506f2165bedc21a5105d9..863396cc1772fc03d0b78d613b9b9b5d53085961 100644
--- a/Core/HardParticle/FormFactorRipple1.h
+++ b/Core/HardParticle/FormFactorCosineRipple.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/HardParticle/FormFactorRipple1.h
-//! @brief Defines classes FormFactorRipple1*.
+//! @file Core/HardParticle/FormFactorCosineRipple.h
+//! @brief Defines classes FormFactorCosineRipple*.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,18 +12,19 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
-#include "Core/HardParticle/ProfileRipple1.h"
+#include "Core/HardParticle/IProfileRipple.h"
//! The form factor for a cosine ripple, with box profile in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorRipple1Box : public ProfileRipple1
+class BA_CORE_API_ FormFactorCosineRippleBox : public ICosineRipple
{
public:
- FormFactorRipple1Box(double length, double width, double height);
- FormFactorRipple1Box* clone() const override final;
+ FormFactorCosineRippleBox(const std::vector<double> P);
+ FormFactorCosineRippleBox(double length, double width, double height);
+ FormFactorCosineRippleBox* clone() const override final;
void accept(INodeVisitor* visitor) const override final;
private:
@@ -32,11 +33,12 @@ private:
//! The form factor for a cosine ripple, with Gaussian profile in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorRipple1Gauss : public ProfileRipple1
+class BA_CORE_API_ FormFactorCosineRippleGauss : public ICosineRipple
{
public:
- FormFactorRipple1Gauss(double length, double width, double height);
- FormFactorRipple1Gauss* clone() const override final;
+ FormFactorCosineRippleGauss(const std::vector<double> P);
+ FormFactorCosineRippleGauss(double length, double width, double height);
+ FormFactorCosineRippleGauss* clone() const override final;
void accept(INodeVisitor* visitor) const override final;
private:
@@ -45,15 +47,16 @@ private:
//! The form factor for a cosine ripple, with Lorentz form factor in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorRipple1Lorentz : public ProfileRipple1
+class BA_CORE_API_ FormFactorCosineRippleLorentz : public ICosineRipple
{
public:
- FormFactorRipple1Lorentz(double length, double width, double height);
- FormFactorRipple1Lorentz* clone() const override final;
+ FormFactorCosineRippleLorentz(const std::vector<double> P);
+ FormFactorCosineRippleLorentz(double length, double width, double height);
+ FormFactorCosineRippleLorentz* clone() const override final;
void accept(INodeVisitor* visitor) const override final;
private:
complex_t factor_x(complex_t qx) const override final;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE1_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCOSINERIPPLE_H
diff --git a/Core/HardParticle/FormFactorCuboctahedron.cpp b/Core/HardParticle/FormFactorCuboctahedron.cpp
index 16d86b4e186170ad7b58459ee3253a15cd262142..59e941aacd8123d43296ffec2741bfc19afa683e 100644
--- a/Core/HardParticle/FormFactorCuboctahedron.cpp
+++ b/Core/HardParticle/FormFactorCuboctahedron.cpp
@@ -16,7 +16,6 @@
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
#include "Core/HardParticle/FormFactorPyramid.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorCuboctahedron::topology = {{{{3, 2, 1, 0}, true},
@@ -37,17 +36,23 @@ const PolyhedralTopology FormFactorCuboctahedron::topology = {{{{3, 2, 1, 0}, tr
//! @param height: height of the lower pyramid in nanometers
//! @param height_ratio: ratio of heights of top to bottom pyramids
//! @param alpha: dihedral angle in radians between base and facet
+FormFactorCuboctahedron::FormFactorCuboctahedron(const std::vector<double> P)
+ : FormFactorPolyhedron({"Cuboctahedron",
+ "class_tooltip",
+ {{"Length", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"HeightRatio", "nm", "para_tooltip", 0, +INF, 0},
+ {"Alpha", "rad", "para_tooltip", 0., M_PI_2, 0}}},
+ P),
+ m_length(m_P[0]), m_height(m_P[1]), m_height_ratio(m_P[2]), m_alpha(m_P[3])
+{
+ onChange();
+}
+
FormFactorCuboctahedron::FormFactorCuboctahedron(double length, double height, double height_ratio,
double alpha)
- : FormFactorPolyhedron(), m_length(length), m_height(height), m_height_ratio(height_ratio),
- m_alpha(alpha)
+ : FormFactorCuboctahedron(std::vector<double>{length, height, height_ratio, alpha})
{
- setName("Cuboctahedron");
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("HeightRatio", &m_height_ratio).setUnit("nm").setNonnegative();
- registerParameter("Alpha", &m_alpha).setUnit("rad").setLimited(0., M_PI_2);
- onChange();
}
IFormFactor* FormFactorCuboctahedron::sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Core/HardParticle/FormFactorCuboctahedron.h b/Core/HardParticle/FormFactorCuboctahedron.h
index cdc59c649cd751add258b0cffa61cee11fafcf70..02da5d79440fa242cfb5b9aec08811fab6893678 100644
--- a/Core/HardParticle/FormFactorCuboctahedron.h
+++ b/Core/HardParticle/FormFactorCuboctahedron.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorCuboctahedron : public FormFactorPolyhedron
{
public:
+ FormFactorCuboctahedron(const std::vector<double> P);
FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha);
FormFactorCuboctahedron* clone() const override final
@@ -45,10 +46,10 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_length;
- double m_height;
- double m_height_ratio;
- double m_alpha;
+ const double& m_length;
+ const double& m_height;
+ const double& m_height_ratio;
+ const double& m_alpha;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCUBOCTAHEDRON_H
diff --git a/Core/HardParticle/FormFactorCylinder.cpp b/Core/HardParticle/FormFactorCylinder.cpp
index a4a4117acd8e6cc65392d2b4d902f9abd993b054..b9a55789176a9d9d3ec7fe6cafcb4e7b228224ca 100644
--- a/Core/HardParticle/FormFactorCylinder.cpp
+++ b/Core/HardParticle/FormFactorCylinder.cpp
@@ -14,22 +14,28 @@
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/DoubleEllipse.h"
#include "Core/Tools/MathFunctions.h"
//! Constructor of a cylinder with a circular base.
//! @param radius: radius of the circular base in nanometers
//! @param height: height of the cylinder in nanometers
-FormFactorCylinder::FormFactorCylinder(double radius, double height)
- : m_radius(radius), m_height(height)
+FormFactorCylinder::FormFactorCylinder(const std::vector<double> P)
+ : IFormFactorBorn({"Cylinder",
+ "class_tooltip",
+ {{"Radius", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_radius(m_P[0]), m_height(m_P[1])
{
- setName("Cylinder");
- registerParameter("Radius", &m_radius).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorCylinder::FormFactorCylinder(double radius, double height)
+ : FormFactorCylinder(std::vector<double>{radius, height})
+{
+}
+
complex_t FormFactorCylinder::evaluate_for_q(cvector_t q) const
{
double R = m_radius;
diff --git a/Core/HardParticle/FormFactorCylinder.h b/Core/HardParticle/FormFactorCylinder.h
index 0715d29c6c29f37584d78416f38dce22ec1e86e7..d1d07f5b110c16be5027985796fa596bd4c6550a 100644
--- a/Core/HardParticle/FormFactorCylinder.h
+++ b/Core/HardParticle/FormFactorCylinder.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorCylinder : public IFormFactorBorn
{
public:
+ FormFactorCylinder(const std::vector<double> P);
FormFactorCylinder(double radius, double height);
FormFactorCylinder* clone() const override final
@@ -45,8 +46,8 @@ protected:
void onChange() override final;
private:
- double m_radius;
- double m_height;
+ const double& m_radius;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORCYLINDER_H
diff --git a/Core/HardParticle/FormFactorDodecahedron.cpp b/Core/HardParticle/FormFactorDodecahedron.cpp
index f52f3d13eb46363689c10aea81bde91840451311..cdd2e323e00f68fa8df134c2e04a46a43235972f 100644
--- a/Core/HardParticle/FormFactorDodecahedron.cpp
+++ b/Core/HardParticle/FormFactorDodecahedron.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorDodecahedron.h"
-#include "Core/Parametrization/RealParameter.h"
const PolyhedralTopology FormFactorDodecahedron::topology = {{// bottom:
{{0, 4, 3, 2, 1}, false},
@@ -35,13 +34,19 @@ const PolyhedralTopology FormFactorDodecahedron::topology = {{// bottom:
//! Constructor of a dodecahedron.
//! @param edge: length of the edge in nanometers
-FormFactorDodecahedron::FormFactorDodecahedron(double edge) : FormFactorPolyhedron(), m_edge(edge)
+FormFactorDodecahedron::FormFactorDodecahedron(const std::vector<double> P)
+ : FormFactorPolyhedron(
+ {"Dodecahedron", "class_tooltip", {{"Edge", "nm", "para_tooltip", 0, +INF, 0}}}, P),
+ m_edge(m_P[0])
{
- setName("Dodecahedron");
- registerParameter("Edge", &m_edge).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorDodecahedron::FormFactorDodecahedron(double edge)
+ : FormFactorDodecahedron(std::vector<double>{edge})
+{
+}
+
void FormFactorDodecahedron::onChange()
{
double a = m_edge;
diff --git a/Core/HardParticle/FormFactorDodecahedron.h b/Core/HardParticle/FormFactorDodecahedron.h
index 4514bceb10549481a0cd61d05f36da2200db71c2..aca1951bbb4de2b10dd00d17cbd856d3a0ae549c 100644
--- a/Core/HardParticle/FormFactorDodecahedron.h
+++ b/Core/HardParticle/FormFactorDodecahedron.h
@@ -25,6 +25,7 @@ class BA_CORE_API_ FormFactorDodecahedron : public FormFactorPolyhedron
public:
//! @brief Constructs a regular dodecahedron
//! @param edge length
+ FormFactorDodecahedron(const std::vector<double> P);
FormFactorDodecahedron(double edge);
FormFactorDodecahedron* clone() const override final
@@ -40,7 +41,7 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_edge;
+ const double& m_edge;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDODECAHEDRON_H
diff --git a/Core/HardParticle/FormFactorDot.cpp b/Core/HardParticle/FormFactorDot.cpp
index 6a262be85d7a4230c782c51ec665655c4ef11c3d..eeb1a40a34b5d4a3b3cc669e20d630e300aa9f03 100644
--- a/Core/HardParticle/FormFactorDot.cpp
+++ b/Core/HardParticle/FormFactorDot.cpp
@@ -13,17 +13,18 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorDot.h"
-#include "Core/Parametrization/RealParameter.h"
//! Constructor.
//! @param rscat: radius of a sphere with same forward scattering power, in nanometers
-FormFactorDot::FormFactorDot(double radius) : m_radius(radius)
+FormFactorDot::FormFactorDot(const std::vector<double> P)
+ : IFormFactorBorn({"Dot", "class_tooltip", {{"Radius", "nm", "para_tooltip", 0, +INF, 0}}}, P),
+ m_radius(m_P[0])
{
- setName("Dot");
- registerParameter("Radius", &m_radius).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorDot::FormFactorDot(double radius) : FormFactorDot(std::vector<double>{radius}) {}
+
complex_t FormFactorDot::evaluate_for_q(cvector_t) const
{
return 4 * M_PI / 3 * pow(m_radius, 3);
diff --git a/Core/HardParticle/FormFactorDot.h b/Core/HardParticle/FormFactorDot.h
index 828c2532ed9addb7d3a7be006e5c4d9db9edaab4..99f16ec10601a5c56dafc63fde147ddbe3beddad 100644
--- a/Core/HardParticle/FormFactorDot.h
+++ b/Core/HardParticle/FormFactorDot.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorDot : public IFormFactorBorn
{
public:
+ FormFactorDot(const std::vector<double> P);
FormFactorDot(double radius);
FormFactorDot* clone() const override final { return new FormFactorDot(m_radius); }
@@ -41,7 +42,7 @@ protected:
bool canSliceAnalytically(const IRotation&) const override final { return false; }
private:
- double m_radius;
+ const double& m_radius;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORDOT_H
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
index b74cd93288e90f7ff4b14e41adfa894ce6f8e97c..93bcbd70e54b9422d8c3fb8e7bf414f10400e508 100644
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
@@ -14,7 +14,6 @@
#include "Core/HardParticle/FormFactorEllipsoidalCylinder.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/DoubleEllipse.h"
#include "Core/Tools/MathFunctions.h"
@@ -22,15 +21,22 @@
//! @param radius_x: radius of the ellipse base in the x-direction, in nanometers
//! @param radius_y: radius of the ellipse base in the y-direction, in nanometers
//! @param height: height of the ellipsoidal cylinder in nanometers
+FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(const std::vector<double> P)
+ : IFormFactorBorn({"EllipsoidalCylinder",
+ "class_tooltip",
+ {{"RadiusX", "nm", "para_tooltip", 0, +INF, 0},
+ {"RadiusY", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_radius_x(m_P[0]), m_radius_y(m_P[1]), m_height(m_P[2])
+{
+ onChange();
+}
+
FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(double radius_x, double radius_y,
double height)
- : m_radius_x(radius_x), m_radius_y(radius_y), m_height(height)
+ : FormFactorEllipsoidalCylinder(std::vector<double>{radius_x, radius_y, height})
{
- setName("EllipsoidalCylinder");
- registerParameter("RadiusX", &m_radius_x).setUnit("nm").setNonnegative();
- registerParameter("RadiusY", &m_radius_y).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- onChange();
}
double FormFactorEllipsoidalCylinder::radialExtension() const
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.h b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
index ef2686fe7ac3454a857146e408eb96d0068de015..910a2027077b0658a29727f023b2432e6231c0ce 100644
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.h
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorEllipsoidalCylinder : public IFormFactorBorn
{
public:
+ FormFactorEllipsoidalCylinder(const std::vector<double> P);
FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height);
FormFactorEllipsoidalCylinder* clone() const override final
@@ -46,9 +47,9 @@ protected:
void onChange() override final;
private:
- double m_radius_x;
- double m_radius_y;
- double m_height;
+ const double& m_radius_x;
+ const double& m_radius_y;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORELLIPSOIDALCYLINDER_H
diff --git a/Core/HardParticle/FormFactorFullSphere.cpp b/Core/HardParticle/FormFactorFullSphere.cpp
index 9d0a731646ffdb368e3c36e4d8d0d42bae81b2ad..4f584f548f3b5c8d8993f6c740423b23b5425812 100644
--- a/Core/HardParticle/FormFactorFullSphere.cpp
+++ b/Core/HardParticle/FormFactorFullSphere.cpp
@@ -15,21 +15,25 @@
#include "Core/HardParticle/FormFactorFullSphere.h"
#include "Core/Basics/MathConstants.h"
#include "Core/HardParticle/FormFactorTruncatedSphere.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Particle/FormFactorWeighted.h"
#include "Core/Scattering/Rotations.h"
#include "Core/Vector/SomeFormFactors.h"
//! Constructor of a full sphere.
//! @param radius: radius of the sphere in nanometers
-FormFactorFullSphere::FormFactorFullSphere(double radius, bool position_at_center)
- : m_radius(radius), m_position_at_center(position_at_center)
+FormFactorFullSphere::FormFactorFullSphere(const std::vector<double> P, bool position_at_center)
+ : IFormFactorBorn(
+ {"FullSphere", "class_tooltip", {{"Radius", "nm", "para_tooltip", 0, +INF, 0}}}, P),
+ m_radius(m_P[0]), m_position_at_center(position_at_center)
{
- setName("FullSphere");
- registerParameter("Radius", &m_radius).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorFullSphere::FormFactorFullSphere(double radius, bool position_at_center)
+ : FormFactorFullSphere(std::vector<double>{radius}, position_at_center)
+{
+}
+
double FormFactorFullSphere::bottomZ(const IRotation& rotation) const
{
if (m_position_at_center)
diff --git a/Core/HardParticle/FormFactorFullSphere.h b/Core/HardParticle/FormFactorFullSphere.h
index b8fc57b2aa92d808e0475001acff5487c4b86501..eced2bd2f9fec316a2cc9c51cd8c5ec8e4907dea 100644
--- a/Core/HardParticle/FormFactorFullSphere.h
+++ b/Core/HardParticle/FormFactorFullSphere.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorFullSphere : public IFormFactorBorn
{
public:
+ FormFactorFullSphere(const std::vector<double> P, bool position_at_center = false);
FormFactorFullSphere(double radius, bool position_at_center = false);
FormFactorFullSphere* clone() const override final
@@ -50,7 +51,7 @@ protected:
void onChange() override final;
private:
- double m_radius;
+ const double& m_radius;
bool m_position_at_center;
};
diff --git a/Core/HardParticle/FormFactorFullSpheroid.cpp b/Core/HardParticle/FormFactorFullSpheroid.cpp
index 97e7b9f1f6d297267125031f98674b25de47d7a2..6a189c842bd0004d87d4047aa798e99a9aac4c0c 100644
--- a/Core/HardParticle/FormFactorFullSpheroid.cpp
+++ b/Core/HardParticle/FormFactorFullSpheroid.cpp
@@ -15,7 +15,6 @@
#include "Core/HardParticle/FormFactorFullSpheroid.h"
#include "Core/Basics/MathConstants.h"
#include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
@@ -23,15 +22,22 @@
//! Constructor of full spheroid.
//! @param radius: radius of the circular cross section in nanometers
//! @param height: height of the full spheroid in nanometers
-FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height)
- : m_radius(radius), m_height(height)
+FormFactorFullSpheroid::FormFactorFullSpheroid(const std::vector<double> P)
+ : IFormFactorBorn({"FullSpheroid",
+ "class_tooltip",
+ {{"Radius", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_radius(m_P[0]), m_height(m_P[1])
{
- setName("FullSpheroid");
- registerParameter("Radius", &m_radius).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height)
+ : FormFactorFullSpheroid(std::vector<double>{radius, height})
+{
+}
+
complex_t FormFactorFullSpheroid::evaluate_for_q(cvector_t q) const
{
double h = m_height / 2;
diff --git a/Core/HardParticle/FormFactorFullSpheroid.h b/Core/HardParticle/FormFactorFullSpheroid.h
index 3aaa87f1c5138dc24694e2d06a8e6d4efe9748aa..18afd0b5ffa52afa420e328730ccec1315634361 100644
--- a/Core/HardParticle/FormFactorFullSpheroid.h
+++ b/Core/HardParticle/FormFactorFullSpheroid.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorFullSpheroid : public IFormFactorBorn
{
public:
+ FormFactorFullSpheroid(const std::vector<double> P);
FormFactorFullSpheroid(double radius, double height);
FormFactorFullSpheroid* clone() const override final
@@ -45,8 +46,8 @@ protected:
void onChange() override final;
private:
- double m_radius;
- double m_height;
+ const double& m_radius;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORFULLSPHEROID_H
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.cpp b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
index d486dc99de1b45d0ae950415e32922c8dc629905..ee73ec817ff6627ba6cd075118aa202216fca58f 100644
--- a/Core/HardParticle/FormFactorHemiEllipsoid.cpp
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
@@ -14,8 +14,8 @@
#include "Core/HardParticle/FormFactorHemiEllipsoid.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
@@ -23,16 +23,23 @@
//! @param radius_x: radius of the ellipse base in the x-direction, in nanometers
//! @param radius_y: radius of the ellipse base in the y-direction, in nanometers
//! @param height: height of the hemi ellipsoid in nanometers
-FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double radius_x, double radius_y, double height)
- : m_radius_x(radius_x), m_radius_y(radius_y), m_height(height)
+FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(const std::vector<double> P)
+ : IFormFactorBorn({"HemiEllipsoid",
+ "class_tooltip",
+ {{"RadiusX", "nm", "para_tooltip", 0, +INF, 0},
+ {"RadiusY", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_radius_x(m_P[0]), m_radius_y(m_P[1]), m_height(m_P[2])
{
- setName("HemiEllipsoid");
- registerParameter("RadiusX", &m_radius_x).setUnit("nm").setNonnegative();
- registerParameter("RadiusY", &m_radius_y).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double radius_x, double radius_y, double height)
+ : FormFactorHemiEllipsoid(std::vector<double>{radius_x, radius_y, height})
+{
+}
+
double FormFactorHemiEllipsoid::radialExtension() const
{
return (m_radius_x + m_radius_y) / 2.0;
@@ -66,7 +73,7 @@ complex_t FormFactorHemiEllipsoid::evaluate_for_q(cvector_t q) const
if (std::abs(m_q.mag()) <= std::numeric_limits<double>::epsilon())
return M_TWOPI * R * W * H / 3.;
- return M_TWOPI * m_integrator.integrate([&](double Z) { return Integrand(Z); }, 0., H);
+ return M_TWOPI * ComplexIntegrator().integrate([&](double Z) { return Integrand(Z); }, 0., H);
}
void FormFactorHemiEllipsoid::onChange()
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.h b/Core/HardParticle/FormFactorHemiEllipsoid.h
index 4ba53c9f4d7a32bb80e211639e75e1cc7836a68f..7453c429dea20fb1cf262cadd74c823b3d6a9ebb 100644
--- a/Core/HardParticle/FormFactorHemiEllipsoid.h
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
#include "Core/Scattering/IFormFactorBorn.h"
-#include "Core/Tools/Integrator.h"
//! An hemi ellipsoid,
//! obtained by truncating a full ellipsoid in the middle plane spanned by two principal axes.
@@ -25,6 +24,7 @@
class BA_CORE_API_ FormFactorHemiEllipsoid : public IFormFactorBorn
{
public:
+ FormFactorHemiEllipsoid(const std::vector<double> P);
FormFactorHemiEllipsoid(double radius_x, double radius_y, double height);
virtual ~FormFactorHemiEllipsoid() {}
@@ -48,11 +48,10 @@ protected:
private:
complex_t Integrand(double Z) const;
- double m_radius_x;
- double m_radius_y;
- double m_height;
+ const double& m_radius_x;
+ const double& m_radius_y;
+ const double& m_height;
mutable cvector_t m_q;
- mutable ComplexIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHEMIELLIPSOID_H
diff --git a/Core/HardParticle/FormFactorHollowSphere.cpp b/Core/HardParticle/FormFactorHollowSphere.cpp
index 2ceb443c9eca4eac7be80a513c144f9089764467..0ecb1c8c14b2b436e7271bbd4ea1b1d8b50ee438 100644
--- a/Core/HardParticle/FormFactorHollowSphere.cpp
+++ b/Core/HardParticle/FormFactorHollowSphere.cpp
@@ -15,23 +15,29 @@
#include "Core/HardParticle/FormFactorHollowSphere.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
#include <limits>
-FormFactorHollowSphere::FormFactorHollowSphere(double mean, double full_width)
- : m_mean(mean), m_full_width(full_width)
+FormFactorHollowSphere::FormFactorHollowSphere(const std::vector<double> P)
+ : IFormFactorBorn({"FormFactorHollowSphere",
+ "class_tooltip",
+ {{"MeanRadius", "nm", "para_tooltip", 0, +INF, 0},
+ {"FullWidth", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_mean(m_P[0]), m_full_width(m_P[1])
{
if (!checkParameters())
throw Exceptions::ClassInitializationException(
"FormFactorHollowSphere::FormFactorHollowSphere:"
" mean radius must be bigger than the half width");
- setName("FormFactorHollowSphere");
- registerParameter("MeanRadius", &m_mean).setUnit("nm").setNonnegative();
- registerParameter("FullWidth", &m_full_width).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorHollowSphere::FormFactorHollowSphere(double mean, double full_width)
+ : FormFactorHollowSphere(std::vector<double>{mean, full_width})
+{
+}
+
complex_t FormFactorHollowSphere::evaluate_for_q(cvector_t q) const
{
double R = m_mean;
diff --git a/Core/HardParticle/FormFactorHollowSphere.h b/Core/HardParticle/FormFactorHollowSphere.h
index 74d042cdfbe5eca11e1230a0c24d4d068bebd1f0..d08ceb7f05f5cc76c0f75c7c9ef2bf7427f1b01a 100644
--- a/Core/HardParticle/FormFactorHollowSphere.h
+++ b/Core/HardParticle/FormFactorHollowSphere.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorHollowSphere : public IFormFactorBorn
{
public:
+ FormFactorHollowSphere(const std::vector<double> P);
FormFactorHollowSphere(double mean, double full_width);
FormFactorHollowSphere* clone() const override final
@@ -40,8 +41,8 @@ protected:
private:
bool checkParameters() const;
- double m_mean; //!< This is the mean radius
- double m_full_width; //!< This is the full width of the radius distribution
+ const double& m_mean; //!< This is the mean radius
+ const double& m_full_width; //!< This is the full width of the radius distribution
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORHOLLOWSPHERE_H
diff --git a/Core/HardParticle/FormFactorIcosahedron.cpp b/Core/HardParticle/FormFactorIcosahedron.cpp
index 0924286442ed9e18806ebaf04df5e1af5f36b3cf..1055d6facb41858a6f5a3529d2a854d8a184ebb1 100644
--- a/Core/HardParticle/FormFactorIcosahedron.cpp
+++ b/Core/HardParticle/FormFactorIcosahedron.cpp
@@ -13,7 +13,6 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorIcosahedron.h"
-#include "Core/Parametrization/RealParameter.h"
const PolyhedralTopology FormFactorIcosahedron::topology = {{// bottom:
{{0, 2, 1}, false},
@@ -45,13 +44,19 @@ const PolyhedralTopology FormFactorIcosahedron::topology = {{// bottom:
//! Constructor of a icosahedron.
//! @param edge: length of the edge in nanometers
-FormFactorIcosahedron::FormFactorIcosahedron(double edge) : FormFactorPolyhedron(), m_edge(edge)
+FormFactorIcosahedron::FormFactorIcosahedron(const std::vector<double> P)
+ : FormFactorPolyhedron(
+ {"Icosahedron", "class_tooltip", {{"Edge", "nm", "para_tooltip", 0, +INF, 0}}}, P),
+ m_edge(m_P[0])
{
- setName("Icosahedron");
- registerParameter("Edge", &m_edge).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorIcosahedron::FormFactorIcosahedron(double edge)
+ : FormFactorIcosahedron(std::vector<double>{edge})
+{
+}
+
void FormFactorIcosahedron::onChange()
{
double a = m_edge;
diff --git a/Core/HardParticle/FormFactorIcosahedron.h b/Core/HardParticle/FormFactorIcosahedron.h
index 0b2a1eb1016e8b56082dce7646d3f062719a090e..700ef15004c5bcfaefe29b7ac2a1793cba52c911 100644
--- a/Core/HardParticle/FormFactorIcosahedron.h
+++ b/Core/HardParticle/FormFactorIcosahedron.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorIcosahedron : public FormFactorPolyhedron
{
public:
+ FormFactorIcosahedron(const std::vector<double> P);
FormFactorIcosahedron(double edge);
FormFactorIcosahedron* clone() const override final
@@ -38,7 +39,7 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_edge;
+ const double& m_edge;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORICOSAHEDRON_H
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.cpp b/Core/HardParticle/FormFactorLongBoxGauss.cpp
index fdb9a45d9bdf79996a9702d966b116c102af6de9..ff9156a6ce58d83ec9b2ded4fad3bcd66f34e590 100644
--- a/Core/HardParticle/FormFactorLongBoxGauss.cpp
+++ b/Core/HardParticle/FormFactorLongBoxGauss.cpp
@@ -13,20 +13,26 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorLongBoxGauss.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/Box.h"
#include "Core/Tools/MathFunctions.h"
-FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, double height)
- : m_length(length), m_width(width), m_height(height)
+FormFactorLongBoxGauss::FormFactorLongBoxGauss(const std::vector<double> P)
+ : IFormFactorBorn({"FormFactorLongBoxGauss",
+ "class_tooltip",
+ {{"Length", "nm", "para_tooltip", 0, +INF, 0},
+ {"Width", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_length(m_P[0]), m_width(m_P[1]), m_height(m_P[2])
{
- setName("FormFactorLongBoxGauss");
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Width", &m_width).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, double height)
+ : FormFactorLongBoxGauss(std::vector<double>{length, width, height})
+{
+}
+
complex_t FormFactorLongBoxGauss::evaluate_for_q(cvector_t q) const
{
complex_t qxL2 = std::pow(m_length * q.x(), 2) / 2.0;
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.h b/Core/HardParticle/FormFactorLongBoxGauss.h
index 4563904e7379f69df2e45e1b6452550de66f17b4..a1e74f842a203a3dea1e5224e31025678f0236c4 100644
--- a/Core/HardParticle/FormFactorLongBoxGauss.h
+++ b/Core/HardParticle/FormFactorLongBoxGauss.h
@@ -27,6 +27,7 @@ public:
//! @param length of Box's base
//! @param width of Box's base
//! @param height of Box
+ FormFactorLongBoxGauss(const std::vector<double> P);
FormFactorLongBoxGauss(double length, double width, double height);
FormFactorLongBoxGauss* clone() const override final
@@ -49,9 +50,9 @@ protected:
void onChange() override final;
private:
- double m_length;
- double m_width;
- double m_height;
+ const double& m_length;
+ const double& m_width;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXGAUSS_H
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.cpp b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
index d241e7a2ef42ffc8b651c19d9bdf7326e7254fb4..637fce0db5198fb2e90ae23c1098e7513a0ee1d8 100644
--- a/Core/HardParticle/FormFactorLongBoxLorentz.cpp
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
@@ -13,20 +13,26 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorLongBoxLorentz.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/Box.h"
#include "Core/Tools/MathFunctions.h"
-FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width, double height)
- : m_length(length), m_width(width), m_height(height)
+FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(const std::vector<double> P)
+ : IFormFactorBorn({"FormFactorLongBoxLorentz",
+ "class_tooltip",
+ {{"Length", "nm", "para_tooltip", 0, +INF, 0},
+ {"Width", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_length(m_P[0]), m_width(m_P[1]), m_height(m_P[2])
{
- setName("FormFactorLongBoxLorentz");
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Width", &m_width).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width, double height)
+ : FormFactorLongBoxLorentz(std::vector<double>{length, width, height})
+{
+}
+
complex_t FormFactorLongBoxLorentz::evaluate_for_q(cvector_t q) const
{
complex_t qxL2 = 2.5 * std::pow(m_length * q.x(), 2);
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.h b/Core/HardParticle/FormFactorLongBoxLorentz.h
index 8dd811bec65f67012465dd7329bb9d6e046a45d8..b36a799eed52f68ac3b3fa00d745ccd6bf9a6578 100644
--- a/Core/HardParticle/FormFactorLongBoxLorentz.h
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.h
@@ -27,6 +27,7 @@ public:
//! @param length of Box's base
//! @param width of Box's base
//! @param height of Box
+ FormFactorLongBoxLorentz(const std::vector<double> P);
FormFactorLongBoxLorentz(double length, double width, double height);
FormFactorLongBoxLorentz* clone() const override final
@@ -50,9 +51,9 @@ protected:
void onChange() override final;
private:
- double m_length;
- double m_width;
- double m_height;
+ const double& m_length;
+ const double& m_width;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORLONGBOXLORENTZ_H
diff --git a/Core/HardParticle/FormFactorPrism3.cpp b/Core/HardParticle/FormFactorPrism3.cpp
index 706af8009d14576ccf49380c6a0b23e70700f287..874606046146cdbf800053ad6e750cf5e7b1c7b8 100644
--- a/Core/HardParticle/FormFactorPrism3.cpp
+++ b/Core/HardParticle/FormFactorPrism3.cpp
@@ -13,21 +13,27 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorPrism3.h"
-#include "Core/Parametrization/RealParameter.h"
#include <iostream>
//! Constructor of a prism with an equilaterial triangle base.
//! @param base_edge: length of the base edge in nanometers
//! @param height: height in nanometers
-FormFactorPrism3::FormFactorPrism3(double base_edge, double height)
- : m_base_edge(base_edge), m_height(height)
+FormFactorPrism3::FormFactorPrism3(const std::vector<double> P)
+ : FormFactorPolygonalPrism({"Prism3",
+ "class_tooltip",
+ {{"BaseEdge", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_base_edge(m_P[0]), m_height(m_P[1])
{
- setName("Prism3");
- registerParameter("BaseEdge", &m_base_edge).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorPrism3::FormFactorPrism3(double base_edge, double height)
+ : FormFactorPrism3(std::vector<double>{base_edge, height})
+{
+}
+
IFormFactor* FormFactorPrism3::sliceFormFactor(ZLimits limits, const IRotation& rot,
kvector_t translation) const
{
diff --git a/Core/HardParticle/FormFactorPrism3.h b/Core/HardParticle/FormFactorPrism3.h
index e986f667b0d42419e09f8a71c8e224a31db18863..15a8841f1870e3e470d5f94939a2f904404c20e5 100644
--- a/Core/HardParticle/FormFactorPrism3.h
+++ b/Core/HardParticle/FormFactorPrism3.h
@@ -22,6 +22,7 @@
class BA_CORE_API_ FormFactorPrism3 : public FormFactorPolygonalPrism
{
public:
+ FormFactorPrism3(const std::vector<double> P);
FormFactorPrism3(double base_edge, double height);
FormFactorPrism3* clone() const override final
@@ -40,8 +41,8 @@ protected:
double height() const final { return m_height; }
private:
- double m_base_edge;
- double m_height;
+ const double& m_base_edge;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM3_H
diff --git a/Core/HardParticle/FormFactorPrism6.cpp b/Core/HardParticle/FormFactorPrism6.cpp
index 4d090bd18011418442ef88d265ff62203f0eabfc..ff5be1148ee797597fc00ae8b4f55eecfb117a6a 100644
--- a/Core/HardParticle/FormFactorPrism6.cpp
+++ b/Core/HardParticle/FormFactorPrism6.cpp
@@ -13,20 +13,26 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorPrism6.h"
-#include "Core/Parametrization/RealParameter.h"
//! Constructor of a prism with a regular hexagonal base.
//! @param base_edge: length of the hexagonal base in nanometers
//! @param height: height in nanometers
-FormFactorPrism6::FormFactorPrism6(double base_edge, double height)
- : m_base_edge(base_edge), m_height(height)
+FormFactorPrism6::FormFactorPrism6(const std::vector<double> P)
+ : FormFactorPolygonalPrism({"Prism6",
+ "class_tooltip",
+ {{"BaseEdge", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_base_edge(m_P[0]), m_height(m_P[1])
{
- setName("Prism6");
- registerParameter("BaseEdge", &m_base_edge).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorPrism6::FormFactorPrism6(double base_edge, double height)
+ : FormFactorPrism6(std::vector<double>{base_edge, height})
+{
+}
+
IFormFactor* FormFactorPrism6::sliceFormFactor(ZLimits limits, const IRotation& rot,
kvector_t translation) const
{
diff --git a/Core/HardParticle/FormFactorPrism6.h b/Core/HardParticle/FormFactorPrism6.h
index 111d07fae2114e6942238d8ce24310a7c5278b8f..414669bf6d954f5d395cd1ef01efd4e2a13cbe8a 100644
--- a/Core/HardParticle/FormFactorPrism6.h
+++ b/Core/HardParticle/FormFactorPrism6.h
@@ -22,6 +22,7 @@
class BA_CORE_API_ FormFactorPrism6 : public FormFactorPolygonalPrism
{
public:
+ FormFactorPrism6(const std::vector<double> P);
FormFactorPrism6(double base_edge, double height);
FormFactorPrism6* clone() const override final
@@ -40,8 +41,8 @@ protected:
double height() const final { return m_height; }
private:
- double m_base_edge;
- double m_height;
+ const double& m_base_edge;
+ const double& m_height;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPRISM6_H
diff --git a/Core/HardParticle/FormFactorPyramid.cpp b/Core/HardParticle/FormFactorPyramid.cpp
index 629f6619dc439e1fc72991192984b6a35f8fe58e..b678a90dc2dd43d9c9b8ff7d725813c1b3257e72 100644
--- a/Core/HardParticle/FormFactorPyramid.cpp
+++ b/Core/HardParticle/FormFactorPyramid.cpp
@@ -15,7 +15,6 @@
#include "Core/HardParticle/FormFactorPyramid.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorPyramid::topology = {{
@@ -32,16 +31,23 @@ const PolyhedralTopology FormFactorPyramid::topology = {{
//! @param base_edge: length of the square base in nanometers
//! @param height: height of the pyramid in nanometers
//! @param alpha: dihedral angle between the base and a side face in radians
-FormFactorPyramid::FormFactorPyramid(double base_edge, double height, double alpha)
- : FormFactorPolyhedron(), m_base_edge(base_edge), m_height(height), m_alpha(alpha)
+FormFactorPyramid::FormFactorPyramid(const std::vector<double> P)
+ : FormFactorPolyhedron({"Pyramid",
+ "class_tooltip",
+ {{"BaseEdge", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"Alpha", "rad", "para_tooltip", 0., M_PI, 0}}},
+ P),
+ m_base_edge(m_P[0]), m_height(m_P[1]), m_alpha(m_P[2])
{
- setName("Pyramid");
- registerParameter("BaseEdge", &m_base_edge).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("Alpha", &m_alpha).setUnit("rad").setLimited(0., M_PI);
onChange();
}
+FormFactorPyramid::FormFactorPyramid(double base_edge, double height, double alpha)
+ : FormFactorPyramid(std::vector<double>{base_edge, height, alpha})
+{
+}
+
IFormFactor* FormFactorPyramid::sliceFormFactor(ZLimits limits, const IRotation& rot,
kvector_t translation) const
{
diff --git a/Core/HardParticle/FormFactorPyramid.h b/Core/HardParticle/FormFactorPyramid.h
index 1581f5a2306abb87af76ac7ff304660dc96fdcf1..d0d86aed0ce9957dc3c33da52d9c3a7433a79d0c 100644
--- a/Core/HardParticle/FormFactorPyramid.h
+++ b/Core/HardParticle/FormFactorPyramid.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorPyramid : public FormFactorPolyhedron
{
public:
+ FormFactorPyramid(const std::vector<double> P);
FormFactorPyramid(double base_edge, double height, double alpha);
FormFactorPyramid* clone() const override final
@@ -44,9 +45,9 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_base_edge;
- double m_height;
- double m_alpha;
+ const double& m_base_edge;
+ const double& m_height;
+ const double& m_alpha;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORPYRAMID_H
diff --git a/Core/HardParticle/FormFactorRipple1.cpp b/Core/HardParticle/FormFactorRipple1.cpp
deleted file mode 100644
index 13dacca2a16629e97374ca5ea32c239efae2c031..0000000000000000000000000000000000000000
--- a/Core/HardParticle/FormFactorRipple1.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/FormFactorRipple1.cpp
-//! @brief Implements classes FormFactorRipple1*.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#include "Core/HardParticle/FormFactorRipple1.h"
-#include "Core/HardParticle/Ripples.h"
-
-// ************************************************************************** //
-// class FormFactorRipple1Box
-// ************************************************************************** //
-
-FormFactorRipple1Box::FormFactorRipple1Box(double length, double width, double height)
- : ProfileRipple1{length, width, height}
-{
- setName("Ripple1Box");
-}
-
-FormFactorRipple1Box* FormFactorRipple1Box::clone() const
-{
- return new FormFactorRipple1Box(m_length, m_width, m_height);
-}
-
-void FormFactorRipple1Box::accept(INodeVisitor* visitor) const
-{
- visitor->visit(this);
-}
-
-complex_t FormFactorRipple1Box::factor_x(complex_t qx) const
-{
- return ripples::factor_x_box(qx, m_length);
-}
-
-// ************************************************************************** //
-// class FormFactorRipple1Gauss
-// ************************************************************************** //
-
-FormFactorRipple1Gauss::FormFactorRipple1Gauss(double length, double width, double height)
- : ProfileRipple1{length, width, height}
-{
- setName("Ripple1Gauss");
-}
-
-FormFactorRipple1Gauss* FormFactorRipple1Gauss::clone() const
-{
- return new FormFactorRipple1Gauss(m_length, m_width, m_height);
-}
-
-void FormFactorRipple1Gauss::accept(INodeVisitor* visitor) const
-{
- visitor->visit(this);
-}
-
-complex_t FormFactorRipple1Gauss::factor_x(complex_t qx) const
-{
- return ripples::factor_x_Gauss(qx, m_length);
-}
-
-// ************************************************************************** //
-// class FormFactorRipple1Lorentz
-// ************************************************************************** //
-
-FormFactorRipple1Lorentz::FormFactorRipple1Lorentz(double length, double width, double height)
- : ProfileRipple1{length, width, height}
-{
- setName("Ripple1Lorentz");
-}
-
-FormFactorRipple1Lorentz* FormFactorRipple1Lorentz::clone() const
-{
- return new FormFactorRipple1Lorentz(m_length, m_width, m_height);
-}
-
-void FormFactorRipple1Lorentz::accept(INodeVisitor* visitor) const
-{
- visitor->visit(this);
-}
-
-complex_t FormFactorRipple1Lorentz::factor_x(complex_t qx) const
-{
- return ripples::factor_x_Lorentz(qx, m_length);
-}
diff --git a/Core/HardParticle/FormFactorRipple2.cpp b/Core/HardParticle/FormFactorRipple2.cpp
deleted file mode 100644
index b533d474b18825a968020e11ea48803dd97feb4c..0000000000000000000000000000000000000000
--- a/Core/HardParticle/FormFactorRipple2.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/FormFactorRipple2.cpp
-//! @brief Implements classes FormFactorRipple2*.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#include "Core/HardParticle/FormFactorRipple2.h"
-#include "Core/HardParticle/Ripples.h"
-
-// ************************************************************************** //
-// class FormFactorRipple2Box
-// ************************************************************************** //
-
-FormFactorRipple2Box::FormFactorRipple2Box(double length, double width, double height,
- double asymmetry)
- : ProfileRipple2{length, width, height, asymmetry}
-{
- setName("Ripple2Box");
-}
-
-FormFactorRipple2Box* FormFactorRipple2Box::clone() const
-{
- return new FormFactorRipple2Box(m_length, m_width, m_height, m_asymmetry);
-}
-
-void FormFactorRipple2Box::accept(INodeVisitor* visitor) const
-{
- visitor->visit(this);
-}
-
-complex_t FormFactorRipple2Box::factor_x(complex_t qx) const
-{
- return ripples::factor_x_box(qx, m_length);
-}
-
-// ************************************************************************** //
-// class FormFactorRipple2Gauss
-// ************************************************************************** //
-
-FormFactorRipple2Gauss::FormFactorRipple2Gauss(double length, double width, double height,
- double asymmetry)
- : ProfileRipple2{length, width, height, asymmetry}
-{
- setName("Ripple2Gauss");
-}
-
-FormFactorRipple2Gauss* FormFactorRipple2Gauss::clone() const
-{
- return new FormFactorRipple2Gauss(m_length, m_width, m_height, m_asymmetry);
-}
-
-void FormFactorRipple2Gauss::accept(INodeVisitor* visitor) const
-{
- visitor->visit(this);
-}
-
-complex_t FormFactorRipple2Gauss::factor_x(complex_t qx) const
-{
- return ripples::factor_x_Gauss(qx, m_length);
-}
-
-// ************************************************************************** //
-// class FormFactorRipple2Lorentz
-// ************************************************************************** //
-
-FormFactorRipple2Lorentz::FormFactorRipple2Lorentz(double length, double width, double height,
- double asymmetry)
- : ProfileRipple2{length, width, height, asymmetry}
-{
- setName("Ripple2Lorentz");
-}
-
-FormFactorRipple2Lorentz* FormFactorRipple2Lorentz::clone() const
-{
- return new FormFactorRipple2Lorentz(m_length, m_width, m_height, m_asymmetry);
-}
-
-void FormFactorRipple2Lorentz::accept(INodeVisitor* visitor) const
-{
- visitor->visit(this);
-}
-
-complex_t FormFactorRipple2Lorentz::factor_x(complex_t qx) const
-{
- return ripples::factor_x_Lorentz(qx, m_length);
-}
diff --git a/Core/HardParticle/FormFactorSawtoothRipple.cpp b/Core/HardParticle/FormFactorSawtoothRipple.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..665b7bc404ecd9238ad856bc3b07e692005cd8e7
--- /dev/null
+++ b/Core/HardParticle/FormFactorSawtoothRipple.cpp
@@ -0,0 +1,106 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/HardParticle/FormFactorSawtoothRipple.cpp
+//! @brief Implements classes FormFactorSawtoothRipple*.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#include "Core/HardParticle/FormFactorSawtoothRipple.h"
+#include "Core/HardParticle/Ripples.h"
+
+// ************************************************************************** //
+// class FormFactorSawtoothRippleBox
+// ************************************************************************** //
+
+FormFactorSawtoothRippleBox::FormFactorSawtoothRippleBox(const std::vector<double> P)
+ : ISawtoothRipple({"SawtoothRippleBox", "class_tooltip", {}}, P)
+{
+}
+
+FormFactorSawtoothRippleBox::FormFactorSawtoothRippleBox(double length, double width, double height,
+ double asymmetry)
+ : FormFactorSawtoothRippleBox(std::vector<double>{length, width, height, asymmetry})
+{
+}
+
+FormFactorSawtoothRippleBox* FormFactorSawtoothRippleBox::clone() const
+{
+ return new FormFactorSawtoothRippleBox(m_length, m_width, m_height, m_asymmetry);
+}
+
+void FormFactorSawtoothRippleBox::accept(INodeVisitor* visitor) const
+{
+ visitor->visit(this);
+}
+
+complex_t FormFactorSawtoothRippleBox::factor_x(complex_t qx) const
+{
+ return ripples::factor_x_box(qx, m_length);
+}
+
+// ************************************************************************** //
+// class FormFactorSawtoothRippleGauss
+// ************************************************************************** //
+
+FormFactorSawtoothRippleGauss::FormFactorSawtoothRippleGauss(const std::vector<double> P)
+ : ISawtoothRipple({"SawtoothRippleGauss", "class_tooltip", {}}, P)
+{
+}
+
+FormFactorSawtoothRippleGauss::FormFactorSawtoothRippleGauss(double length, double width,
+ double height, double asymmetry)
+ : FormFactorSawtoothRippleGauss(std::vector<double>{length, width, height, asymmetry})
+{
+}
+
+FormFactorSawtoothRippleGauss* FormFactorSawtoothRippleGauss::clone() const
+{
+ return new FormFactorSawtoothRippleGauss(m_length, m_width, m_height, m_asymmetry);
+}
+
+void FormFactorSawtoothRippleGauss::accept(INodeVisitor* visitor) const
+{
+ visitor->visit(this);
+}
+
+complex_t FormFactorSawtoothRippleGauss::factor_x(complex_t qx) const
+{
+ return ripples::factor_x_Gauss(qx, m_length);
+}
+
+// ************************************************************************** //
+// class FormFactorSawtoothRippleLorentz
+// ************************************************************************** //
+
+FormFactorSawtoothRippleLorentz::FormFactorSawtoothRippleLorentz(const std::vector<double> P)
+ : ISawtoothRipple({"SawtoothRippleLorentz", "class_tooltip", {}}, P)
+{
+}
+
+FormFactorSawtoothRippleLorentz::FormFactorSawtoothRippleLorentz(double length, double width,
+ double height, double asymmetry)
+ : FormFactorSawtoothRippleLorentz(std::vector<double>{length, width, height, asymmetry})
+{
+}
+
+FormFactorSawtoothRippleLorentz* FormFactorSawtoothRippleLorentz::clone() const
+{
+ return new FormFactorSawtoothRippleLorentz(m_length, m_width, m_height, m_asymmetry);
+}
+
+void FormFactorSawtoothRippleLorentz::accept(INodeVisitor* visitor) const
+{
+ visitor->visit(this);
+}
+
+complex_t FormFactorSawtoothRippleLorentz::factor_x(complex_t qx) const
+{
+ return ripples::factor_x_Lorentz(qx, m_length);
+}
diff --git a/Core/HardParticle/FormFactorRipple2.h b/Core/HardParticle/FormFactorSawtoothRipple.h
similarity index 50%
rename from Core/HardParticle/FormFactorRipple2.h
rename to Core/HardParticle/FormFactorSawtoothRipple.h
index c3688a0966d282757c2763ca63afbb323c7c3238..3637acaa3b7a9289db55669bde40e75cac49e4dd 100644
--- a/Core/HardParticle/FormFactorRipple2.h
+++ b/Core/HardParticle/FormFactorSawtoothRipple.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/HardParticle/FormFactorRipple2.h
-//! @brief Defines classes FormFactorRipple2*.
+//! @file Core/HardParticle/FormFactorSawtoothRipple.h
+//! @brief Defines classes FormFactorSawtoothRipple*.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,18 +12,19 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
-#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
-#include "Core/HardParticle/ProfileRipple2.h"
+#include "Core/HardParticle/IProfileRipple.h"
//! The form factor for a cosine ripple, with box profile in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorRipple2Box : public ProfileRipple2
+class BA_CORE_API_ FormFactorSawtoothRippleBox : public ISawtoothRipple
{
public:
- FormFactorRipple2Box(double length, double width, double height, double asymmetry);
- FormFactorRipple2Box* clone() const override final;
+ FormFactorSawtoothRippleBox(const std::vector<double> P);
+ FormFactorSawtoothRippleBox(double length, double width, double height, double asymmetry);
+ FormFactorSawtoothRippleBox* clone() const override final;
void accept(INodeVisitor* visitor) const override final;
private:
@@ -32,11 +33,12 @@ private:
//! The form factor for a cosine ripple, with Gaussian profile in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorRipple2Gauss : public ProfileRipple2
+class BA_CORE_API_ FormFactorSawtoothRippleGauss : public ISawtoothRipple
{
public:
- FormFactorRipple2Gauss(double length, double width, double height, double asymmetry);
- FormFactorRipple2Gauss* clone() const override final;
+ FormFactorSawtoothRippleGauss(const std::vector<double> P);
+ FormFactorSawtoothRippleGauss(double length, double width, double height, double asymmetry);
+ FormFactorSawtoothRippleGauss* clone() const override final;
void accept(INodeVisitor* visitor) const override final;
private:
@@ -45,15 +47,16 @@ private:
//! The form factor for a cosine ripple, with Lorentz form factor in elongation direction.
//! @ingroup legacyGrating
-class BA_CORE_API_ FormFactorRipple2Lorentz : public ProfileRipple2
+class BA_CORE_API_ FormFactorSawtoothRippleLorentz : public ISawtoothRipple
{
public:
- FormFactorRipple2Lorentz(double length, double width, double height, double asymmetry);
- FormFactorRipple2Lorentz* clone() const override final;
+ FormFactorSawtoothRippleLorentz(const std::vector<double> P);
+ FormFactorSawtoothRippleLorentz(double length, double width, double height, double asymmetry);
+ FormFactorSawtoothRippleLorentz* clone() const override final;
void accept(INodeVisitor* visitor) const override final;
private:
complex_t factor_x(complex_t qx) const override final;
};
-#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORRIPPLE2_H
+#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORSAWTOOTHRIPPLE_H
diff --git a/Core/HardParticle/FormFactorTetrahedron.cpp b/Core/HardParticle/FormFactorTetrahedron.cpp
index 598f6666b9d6836ee2d7bfbd44f1ab4f68f160d6..7ab8ac407f7b4f352d650e1a2e87c4f613a56371 100644
--- a/Core/HardParticle/FormFactorTetrahedron.cpp
+++ b/Core/HardParticle/FormFactorTetrahedron.cpp
@@ -15,7 +15,6 @@
#include "Core/HardParticle/FormFactorTetrahedron.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Tools/MathFunctions.h"
const PolyhedralTopology FormFactorTetrahedron::topology = {{{{2, 1, 0}, false},
@@ -29,16 +28,23 @@ const PolyhedralTopology FormFactorTetrahedron::topology = {{{{2, 1, 0}, false},
//! @param base_edge: length of one edge of the equilateral triangular base in nanometers
//! @param height: height of the tetrahedron in nanometers
//! @param alpha: dihedral angle in radians between base and facet
-FormFactorTetrahedron::FormFactorTetrahedron(double base_edge, double height, double alpha)
- : FormFactorPolyhedron(), m_base_edge(base_edge), m_height(height), m_alpha(alpha)
+FormFactorTetrahedron::FormFactorTetrahedron(const std::vector<double> P)
+ : FormFactorPolyhedron({"Tetrahedron",
+ "class_tooltip",
+ {{"BaseEdge", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"Alpha", "rad", "para_tooltip", 0., M_PI_2, 0}}},
+ P),
+ m_base_edge(m_P[0]), m_height(m_P[1]), m_alpha(m_P[2])
{
- setName("Tetrahedron");
- registerParameter("BaseEdge", &m_base_edge).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("Alpha", &m_alpha).setUnit("rad").setLimited(0., M_PI_2);
onChange();
}
+FormFactorTetrahedron::FormFactorTetrahedron(double base_edge, double height, double alpha)
+ : FormFactorTetrahedron(std::vector<double>{base_edge, height, alpha})
+{
+}
+
IFormFactor* FormFactorTetrahedron::sliceFormFactor(ZLimits limits, const IRotation& rot,
kvector_t translation) const
{
diff --git a/Core/HardParticle/FormFactorTetrahedron.h b/Core/HardParticle/FormFactorTetrahedron.h
index 3fca46b0aa5f0646add0eb3db3c9019681430bc2..22efd2876294c3ac3221f5e8fb51518ff82dc488 100644
--- a/Core/HardParticle/FormFactorTetrahedron.h
+++ b/Core/HardParticle/FormFactorTetrahedron.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorTetrahedron : public FormFactorPolyhedron
{
public:
+ FormFactorTetrahedron(const std::vector<double> P);
FormFactorTetrahedron(double base_edge, double height, double alpha);
FormFactorTetrahedron* clone() const override final
@@ -43,9 +44,9 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_base_edge;
- double m_height;
- double m_alpha;
+ const double& m_base_edge;
+ const double& m_height;
+ const double& m_alpha;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTETRAHEDRON_H
diff --git a/Core/HardParticle/FormFactorTriangle.cpp b/Core/HardParticle/FormFactorTriangle.cpp
index b500fa3dea63fc18522ac21cfdc70fdc8e8f0fb9..4d7f40b2f8c6683b1c6e78e65ceff3c25ae432b6 100644
--- a/Core/HardParticle/FormFactorTriangle.cpp
+++ b/Core/HardParticle/FormFactorTriangle.cpp
@@ -13,16 +13,21 @@
// ************************************************************************** //
#include "Core/HardParticle/FormFactorTriangle.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Fit/Tools/RealLimits.h"
-FormFactorTriangle::FormFactorTriangle(double base_edge) : m_base_edge(base_edge)
+FormFactorTriangle::FormFactorTriangle(const std::vector<double> P)
+ : FormFactorPolygonalSurface(
+ {"Triangle", "class_tooltip", {{"BaseEdge", "nm", "para_tooltip", 0, +INF, 0}}}, P),
+ m_base_edge(m_P[0])
{
- setName("Triangle");
- registerParameter("BaseEdge", &m_base_edge).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorTriangle::FormFactorTriangle(double base_edge)
+ : FormFactorTriangle(std::vector<double>{base_edge})
+{
+}
+
void FormFactorTriangle::onChange()
{
double a = m_base_edge;
diff --git a/Core/HardParticle/FormFactorTriangle.h b/Core/HardParticle/FormFactorTriangle.h
index 8166850ddd1f1c7f09ab3279ff1f09232aa0922e..57aad06b3f7a7ca5c3307522bac85837443eaec1 100644
--- a/Core/HardParticle/FormFactorTriangle.h
+++ b/Core/HardParticle/FormFactorTriangle.h
@@ -21,6 +21,7 @@
class BA_CORE_API_ FormFactorTriangle : public FormFactorPolygonalSurface
{
public:
+ FormFactorTriangle(const std::vector<double> P);
FormFactorTriangle(double base_edge);
FormFactorTriangle* clone() const override final { return new FormFactorTriangle(m_base_edge); }
@@ -32,7 +33,7 @@ protected:
void onChange() override final;
private:
- double m_base_edge;
+ const double& m_base_edge;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRIANGLE_H
diff --git a/Core/HardParticle/FormFactorTruncatedCube.cpp b/Core/HardParticle/FormFactorTruncatedCube.cpp
index dc0ad9767159bf78fc5dcbd84ede8e9e54c71973..a5a9be8fdbfdb4b32cc89dfc8c3ec5ec122daec2 100644
--- a/Core/HardParticle/FormFactorTruncatedCube.cpp
+++ b/Core/HardParticle/FormFactorTruncatedCube.cpp
@@ -14,7 +14,6 @@
#include "Core/HardParticle/FormFactorTruncatedCube.h"
#include "Core/Basics/Exceptions.h"
-#include "Core/Parametrization/RealParameter.h"
const PolyhedralTopology FormFactorTruncatedCube::topology = {
{{{0, 1, 7, 6, 9, 10, 4, 3}, true},
@@ -36,15 +35,22 @@ const PolyhedralTopology FormFactorTruncatedCube::topology = {
//! Constructor of a truncated cube.
//! @param length: length of the full cube's edge in nanometers
//! @param removed_length: removed length from each edge of the cube in nanometers
-FormFactorTruncatedCube::FormFactorTruncatedCube(double length, double removed_length)
- : FormFactorPolyhedron(), m_length(length), m_removed_length(removed_length)
+FormFactorTruncatedCube::FormFactorTruncatedCube(const std::vector<double> P)
+ : FormFactorPolyhedron({"TruncatedCube",
+ "class_tooltip",
+ {{"Length", "nm", "para_tooltip", 0, +INF, 0},
+ {"RemovedLength", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_length(m_P[0]), m_removed_length(m_P[1])
{
- setName("TruncatedCube");
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("RemovedLength", &m_removed_length).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorTruncatedCube::FormFactorTruncatedCube(double length, double removed_length)
+ : FormFactorTruncatedCube(std::vector<double>{length, removed_length})
+{
+}
+
void FormFactorTruncatedCube::onChange()
{
if (m_removed_length > 0.5 * m_length) {
diff --git a/Core/HardParticle/FormFactorTruncatedCube.h b/Core/HardParticle/FormFactorTruncatedCube.h
index b643a6d2a71e8d3a0202846fa5b5ac5fe798be09..8dc943c11b135d70ae0f6c1ee7c6a4b0b8515147 100644
--- a/Core/HardParticle/FormFactorTruncatedCube.h
+++ b/Core/HardParticle/FormFactorTruncatedCube.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorTruncatedCube : public FormFactorPolyhedron
{
public:
+ FormFactorTruncatedCube(const std::vector<double> P);
FormFactorTruncatedCube(double length, double removed_length);
FormFactorTruncatedCube* clone() const override final
@@ -39,8 +40,8 @@ protected:
private:
static const PolyhedralTopology topology;
- double m_length;
- double m_removed_length;
+ const double& m_length;
+ const double& m_removed_length;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDCUBE_H
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.cpp b/Core/HardParticle/FormFactorTruncatedSphere.cpp
index f88073f626706416c638c9a3278529755e4b4cab..0bbec494e3501aa2a4e6a248d0aaa7612f7cdac1 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSphere.cpp
@@ -15,8 +15,8 @@
#include "Core/HardParticle/FormFactorTruncatedSphere.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include "Fit/Tools/RealLimits.h"
#include <limits>
@@ -25,17 +25,24 @@
//! @param radius: radius of the truncated sphere in nanometers
//! @param height: height of the truncated sphere in nanometers
//! @param dh: length of cup truncated from the top
-FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height, double dh)
- : m_radius(radius), m_height(height), m_dh(dh)
+FormFactorTruncatedSphere::FormFactorTruncatedSphere(const std::vector<double> P)
+ : IFormFactorBorn({"TruncatedSphere",
+ "class_tooltip",
+ {{"Radius", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"DeltaHeight", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_radius(m_P[0]), m_height(m_P[1]), m_dh(m_P[2])
{
- setName("TruncatedSphere");
check_initialization();
- registerParameter("Radius", &m_radius).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("DeltaHeight", &m_dh).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height, double dh)
+ : FormFactorTruncatedSphere(std::vector<double>{radius, height, dh})
+{
+}
+
bool FormFactorTruncatedSphere::check_initialization() const
{
bool result(true);
@@ -70,8 +77,8 @@ complex_t FormFactorTruncatedSphere::evaluate_for_q(cvector_t q) const
- m_dh * m_dh * (3. * m_radius - m_dh));
}
// else
- complex_t integral = m_integrator.integrate([&](double Z) { return Integrand(Z); },
- m_radius - m_height, m_radius - m_dh);
+ complex_t integral = ComplexIntegrator().integrate([&](double Z) { return Integrand(Z); },
+ m_radius - m_height, m_radius - m_dh);
return M_TWOPI * integral * exp_I(q.z() * (m_height - m_radius));
}
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.h b/Core/HardParticle/FormFactorTruncatedSphere.h
index 6cde82ddc69c8efa05c8c39e133791c56f48fb96..aaab6b54cd46e7c74b56be9f32eda6344adacef2 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.h
+++ b/Core/HardParticle/FormFactorTruncatedSphere.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
#include "Core/Scattering/IFormFactorBorn.h"
-#include "Core/Tools/Integrator.h"
//! A truncated Sphere.
//! @ingroup hardParticle
@@ -24,6 +23,7 @@
class BA_CORE_API_ FormFactorTruncatedSphere : public IFormFactorBorn
{
public:
+ FormFactorTruncatedSphere(const std::vector<double> P);
FormFactorTruncatedSphere(double radius, double height, double dh);
FormFactorTruncatedSphere* clone() const override final
@@ -50,11 +50,10 @@ private:
bool check_initialization() const;
complex_t Integrand(double Z) const;
- double m_radius;
- double m_height;
- double m_dh;
+ const double& m_radius;
+ const double& m_height;
+ const double& m_dh;
mutable cvector_t m_q;
- mutable ComplexIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHERE_H
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
index 566696746552928dfcb844579ea88c1be2b721cf..b7e93ff209271203c2b1c63d88ee074a293e20dc 100644
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
@@ -15,8 +15,8 @@
#include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
#include <limits>
@@ -25,19 +25,26 @@
//! @param height: height of the truncated spheroid in nanometers
//! @param height_flattening: ratio of the height of the corresponding full spheroid to its diameter
//! @param dh: length of cup truncated from the top
-FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double radius, double height,
- double height_flattening, double dh)
- : m_radius(radius), m_height(height), m_height_flattening(height_flattening), m_dh(dh)
+FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(const std::vector<double> P)
+ : IFormFactorBorn({"TruncatedSpheroid",
+ "class_tooltip",
+ {{"Radius", "nm", "para_tooltip", 0, +INF, 0},
+ {"Height", "nm", "para_tooltip", 0, +INF, 0},
+ {"HeightFlattening", "", "para_tooltip", 0, +INF, 0},
+ {"DeltaHeight", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_radius(m_P[0]), m_height(m_P[1]), m_height_flattening(m_P[2]), m_dh(m_P[3])
{
- setName("TruncatedSpheroid");
check_initialization();
- registerParameter("Radius", &m_radius).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("HeightFlattening", &m_height_flattening).setNonnegative();
- registerParameter("DeltaHeight", &m_dh).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double radius, double height,
+ double height_flattening, double dh)
+ : FormFactorTruncatedSpheroid(std::vector<double>{radius, height, height_flattening, dh})
+{
+}
+
bool FormFactorTruncatedSpheroid::check_initialization() const
{
bool result(true);
@@ -77,8 +84,8 @@ complex_t FormFactorTruncatedSpheroid::evaluate_for_q(cvector_t q) const
return M_PI / 3. / fp * (H * H * (3. * R - H / fp) - m_dh * m_dh * (3. * R - m_dh / fp));
complex_t z_part = std::exp(complex_t(0.0, 1.0) * m_q.z() * (H - fp * R));
return M_TWOPI * z_part
- * m_integrator.integrate([&](double Z) { return Integrand(Z); }, fp * R - H,
- fp * R - m_dh);
+ * ComplexIntegrator().integrate([&](double Z) { return Integrand(Z); }, fp * R - H,
+ fp * R - m_dh);
}
IFormFactor* FormFactorTruncatedSpheroid::sliceFormFactor(ZLimits limits, const IRotation& rot,
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.h b/Core/HardParticle/FormFactorTruncatedSpheroid.h
index 60593bd86e60ee4861cb061598d978e77d8a93f7..887fa7a8ae2b2dcf62ad44f9db191ec3fb66a338 100644
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.h
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.h
@@ -16,7 +16,6 @@
#define BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
#include "Core/Scattering/IFormFactorBorn.h"
-#include "Core/Tools/Integrator.h"
//! A truncated spheroid.
//! An ellipsoid with two equal axis, truncated by a plane perpendicular to the third axis.
@@ -25,6 +24,7 @@
class BA_CORE_API_ FormFactorTruncatedSpheroid : public IFormFactorBorn
{
public:
+ FormFactorTruncatedSpheroid(const std::vector<double> P);
FormFactorTruncatedSpheroid(double radius, double height, double height_flattening, double dh);
FormFactorTruncatedSpheroid* clone() const override final
@@ -52,12 +52,11 @@ private:
bool check_initialization() const;
complex_t Integrand(double Z) const;
- double m_radius;
- double m_height;
- double m_height_flattening;
- double m_dh;
+ const double& m_radius;
+ const double& m_height;
+ const double& m_height_flattening;
+ const double& m_dh;
mutable cvector_t m_q;
- mutable ComplexIntegrator m_integrator;
};
#endif // BORNAGAIN_CORE_HARDPARTICLE_FORMFACTORTRUNCATEDSPHEROID_H
diff --git a/Core/HardParticle/IProfileRipple.cpp b/Core/HardParticle/IProfileRipple.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..96dfbba27ded91fd1c8911c6cfe0c45cc16c9550
--- /dev/null
+++ b/Core/HardParticle/IProfileRipple.cpp
@@ -0,0 +1,110 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/HardParticle/IProfileRipple.cpp
+//! @brief Implements class ISawtoothRipple.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#include "Core/HardParticle/IProfileRipple.h"
+#include "Core/HardParticle/Ripples.h"
+#include "Core/Shapes/Box.h"
+#include "Core/Shapes/RippleCosine.h"
+#include "Core/Shapes/RippleSawtooth.h"
+
+// ************************************************************************** //
+// interface IProfileRipple
+// ************************************************************************** //
+
+IProfileRipple::IProfileRipple(const NodeMeta& meta, const std::vector<double>& PValues)
+ : IFormFactorBorn(nodeMetaUnion({{"Length", "nm", "Characteristic length", 0, INF, 1.},
+ {"Width", "nm", "Width", 0, INF, 1.},
+ {"Height", "nm", "Height", 0, INF, 1.}},
+ meta),
+ PValues),
+ m_length(m_P[0]), m_width(m_P[1]), m_height(m_P[2])
+{
+}
+
+double IProfileRipple::radialExtension() const
+{
+ return (m_width + m_length) / 4.0;
+}
+
+complex_t IProfileRipple::evaluate_for_q(cvector_t q) const
+{
+ return factor_x(q.x()) * factor_yz(q.y(), q.z());
+}
+
+// ************************************************************************** //
+// interface IProfileRectangularRipple
+// ************************************************************************** //
+
+IProfileRectangularRipple::IProfileRectangularRipple(const NodeMeta& meta,
+ const std::vector<double>& PValues)
+ : IProfileRipple(meta, PValues)
+{
+ onChange();
+}
+
+//! Complex form factor.
+complex_t IProfileRectangularRipple::factor_yz(complex_t qy, complex_t qz) const
+{
+ return ripples::profile_yz_bar(qy, qz, m_width, m_height);
+}
+
+void IProfileRectangularRipple::onChange()
+{
+ mP_shape.reset(new Box(m_length, m_width, m_height));
+}
+
+// ************************************************************************** //
+// interface ICosineRipple
+// ************************************************************************** //
+
+ICosineRipple::ICosineRipple(const NodeMeta& meta, const std::vector<double>& PValues)
+ : IProfileRipple(meta, PValues)
+{
+ onChange();
+}
+
+//! Complex form factor.
+complex_t ICosineRipple::factor_yz(complex_t qy, complex_t qz) const
+{
+ return ripples::profile_yz_cosine(qy, qz, m_width, m_height);
+}
+
+void ICosineRipple::onChange()
+{
+ mP_shape.reset(new RippleCosine(m_length, m_width, m_height));
+}
+
+// ************************************************************************** //
+// interface ISawtoothRipple
+// ************************************************************************** //
+
+ISawtoothRipple::ISawtoothRipple(const NodeMeta& meta, const std::vector<double>& PValues)
+ : IProfileRipple(
+ nodeMetaUnion({{"AsymmetryLength", "nm", "Asymmetry of width", -INF, INF, 0.}}, meta),
+ PValues),
+ m_asymmetry(m_P[3])
+{
+ onChange();
+}
+
+//! Complex form factor.
+complex_t ISawtoothRipple::factor_yz(complex_t qy, complex_t qz) const
+{
+ return ripples::profile_yz_triangular(qy, qz, m_width, m_height, m_asymmetry);
+}
+
+void ISawtoothRipple::onChange()
+{
+ mP_shape.reset(new RippleSawtooth(m_length, m_width, m_height, m_asymmetry));
+}
diff --git a/Core/HardParticle/IProfileRipple.h b/Core/HardParticle/IProfileRipple.h
new file mode 100644
index 0000000000000000000000000000000000000000..c8c2be88181d753c809dda67b3366a70761f74a2
--- /dev/null
+++ b/Core/HardParticle/IProfileRipple.h
@@ -0,0 +1,86 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file Core/HardParticle/IProfileRipple.h
+//! @brief Defines interface classes IProfileRipple, ICosineRipple, ISawtoothRipple.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************** //
+
+#ifndef BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
+#define BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
+
+#include "Core/Scattering/IFormFactorBorn.h"
+
+//! Base class for form factors with a cosine ripple profile in the yz plane.
+
+class BA_CORE_API_ IProfileRipple : public IFormFactorBorn
+{
+public:
+ IProfileRipple(const NodeMeta& meta, const std::vector<double>& PValues);
+
+ double getLength() const { return m_length; }
+ double getHeight() const { return m_height; }
+ double getWidth() const { return m_width; }
+
+ double radialExtension() const override final;
+
+ complex_t evaluate_for_q(cvector_t q) const override final;
+
+protected:
+ const double& m_length;
+ const double& m_width;
+ const double& m_height;
+
+ virtual void onChange() override = 0;
+ virtual complex_t factor_x(complex_t qx) const = 0;
+ virtual complex_t factor_yz(complex_t qy, complex_t qz) const = 0;
+};
+
+//! Base class for form factors with a rectangular ripple (bar) profile in the yz plane.
+
+class BA_CORE_API_ IProfileRectangularRipple : public IProfileRipple
+{
+public:
+ IProfileRectangularRipple(const NodeMeta& meta, const std::vector<double>& PValues);
+
+private:
+ virtual void onChange() override final;
+ complex_t factor_yz(complex_t qy, complex_t qz) const final;
+};
+
+//! Base class for form factors with a cosine ripple profile in the yz plane.
+
+class BA_CORE_API_ ICosineRipple : public IProfileRipple
+{
+public:
+ ICosineRipple(const NodeMeta& meta, const std::vector<double>& PValues);
+
+private:
+ virtual void onChange() override final;
+ complex_t factor_yz(complex_t qy, complex_t qz) const final;
+};
+
+//! Base class for form factors with a triangular ripple profile in the yz plane.
+
+class BA_CORE_API_ ISawtoothRipple : public IProfileRipple
+{
+public:
+ ISawtoothRipple(const NodeMeta& meta, const std::vector<double>& PValues);
+
+ double getAsymmetry() const { return m_asymmetry; }
+
+protected:
+ const double& m_asymmetry;
+
+private:
+ virtual void onChange() override final;
+ complex_t factor_yz(complex_t qy, complex_t qz) const final;
+};
+
+#endif // BORNAGAIN_CORE_HARDPARTICLE_IPROFILERIPPLE_H
diff --git a/Core/HardParticle/ProfileBar.cpp b/Core/HardParticle/ProfileBar.cpp
deleted file mode 100644
index fd8ad0516d3dc3e6ef09f15616f9596fa972530b..0000000000000000000000000000000000000000
--- a/Core/HardParticle/ProfileBar.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/ProfileBar.cpp
-//! @brief Implements class ProfileBar.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#include "Core/HardParticle/ProfileBar.h"
-#include "Core/Basics/Exceptions.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
-#include "Core/Shapes/Box.h" // from Shapes/
-#include "Core/Tools/MathFunctions.h"
-#include "Fit/Tools/RealLimits.h"
-
-//! @brief Constructor of elongated bar
-//! @param length: length of the rectangular base in nanometers
-//! @param width: width of the rectangular base in nanometers
-//! @param height: height of the ripple in nanometers
-ProfileBar::ProfileBar(double length, double width, double height)
- : m_length(length), m_width(width), m_height(height)
-{
- check_initialization();
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Width", &m_width).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- onChange();
-}
-
-bool ProfileBar::check_initialization() const
-{
- bool result(true);
- if (m_height <= 0.0 || m_width <= 0.0 || m_length <= 0.0) {
- std::ostringstream ostr;
- ostr << "ProfileBar() -> Error in class initialization with parameters ";
- ostr << " height:" << m_height;
- ostr << " width:" << m_width;
- ostr << " length:" << m_length << "\n\n";
- ostr << "Check for 'height>0.0 && width>0.0 && length>0.0' failed.";
- throw Exceptions::ClassInitializationException(ostr.str());
- }
- return result;
-}
-
-double ProfileBar::radialExtension() const
-{
- return (m_width + m_length) / 4.0;
-}
-
-//! Complex form factor.
-complex_t ProfileBar::factor_yz(complex_t qy, complex_t qz) const
-{
- const complex_t qyWdiv2 = m_width * qy / 2.0;
- const complex_t qzHdiv2 = m_height * qz / 2.0;
-
- return m_height * m_width * exp_I(qzHdiv2) * MathFunctions::sinc(qyWdiv2)
- * MathFunctions::sinc(qzHdiv2);
-}
-
-void ProfileBar::onChange()
-{
- mP_shape.reset(new Box(m_length, m_width, m_height));
-}
diff --git a/Core/HardParticle/ProfileBar.h b/Core/HardParticle/ProfileBar.h
deleted file mode 100644
index af77525dd717d67f2631fa1b3b4df437645e0de0..0000000000000000000000000000000000000000
--- a/Core/HardParticle/ProfileBar.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/ProfileBar.h
-//! @brief Defines class ProfileBar.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILEBAR_H
-#define BORNAGAIN_CORE_HARDPARTICLE_PROFILEBAR_H
-
-#include "Core/Scattering/IFormFactorBorn.h"
-#include "Core/Tools/Integrator.h"
-
-//! Base class for form factors with a cosine ripple profile in the yz plane.
-
-class BA_CORE_API_ ProfileBar : public IFormFactorBorn
-{
-public:
- ProfileBar(double length, double width, double height);
-
- double getLength() const { return m_length; }
- double getHeight() const { return m_height; }
- double getWidth() const { return m_width; }
-
- double radialExtension() const override final;
-
- complex_t evaluate_for_q(cvector_t q) const override final
- {
- return factor_x(q.x()) * factor_yz(q.y(), q.z());
- }
-
-protected:
- void onChange() override final;
- virtual complex_t factor_x(complex_t qx) const = 0;
-
- double m_length;
- double m_width;
- double m_height;
-
-private:
- complex_t factor_yz(complex_t qy, complex_t qz) const;
- bool check_initialization() const;
- mutable ComplexIntegrator m_integrator;
-};
-
-#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILEBAR_H
diff --git a/Core/HardParticle/ProfileRipple1.cpp b/Core/HardParticle/ProfileRipple1.cpp
deleted file mode 100644
index 24e2df63e3f58afc8d602ad52398c2094f1ef865..0000000000000000000000000000000000000000
--- a/Core/HardParticle/ProfileRipple1.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/ProfileRipple1.cpp
-//! @brief Implements class ProfileRipple1.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#include "Core/HardParticle/ProfileRipple1.h"
-#include "Core/Basics/Exceptions.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
-#include "Core/Shapes/RippleCosine.h" // from Shapes/
-#include "Core/Tools/MathFunctions.h"
-#include "Fit/Tools/RealLimits.h"
-
-//! @brief Constructor of cosine ripple.
-//! @param length: length of the rectangular base in nanometers
-//! @param width: width of the rectangular base in nanometers
-//! @param height: height of the ripple in nanometers
-ProfileRipple1::ProfileRipple1(double length, double width, double height)
- : m_length(length), m_width(width), m_height(height)
-{
- check_initialization();
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Width", &m_width).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- onChange();
-}
-
-bool ProfileRipple1::check_initialization() const
-{
- bool result(true);
- if (m_height <= 0.0 || m_width <= 0.0 || m_length <= 0.0) {
- std::ostringstream ostr;
- ostr << "ProfileRipple1() -> Error in class initialization with parameters ";
- ostr << " height:" << m_height;
- ostr << " width:" << m_width;
- ostr << " length:" << m_length << "\n\n";
- ostr << "Check for 'height>0.0 && width>0.0 && length>0.0' failed.";
- throw Exceptions::ClassInitializationException(ostr.str());
- }
- return result;
-}
-
-double ProfileRipple1::radialExtension() const
-{
- return (m_width + m_length) / 4.0;
-}
-
-//! Complex form factor.
-complex_t ProfileRipple1::factor_yz(complex_t qy, complex_t qz) const
-{
- complex_t factor = m_width / M_PI;
-
- // analytical expressions for some particular cases
- if (qz == 0.) {
- if (qy == 0.)
- return factor * M_PI_2 * m_height;
- complex_t aaa = qy * m_width / (M_TWOPI);
- complex_t aaa2 = aaa * aaa;
- if (aaa2 == 1.)
- return factor * M_PI_4 * m_height;
- return factor * M_PI_2 * m_height * MathFunctions::sinc(qy * m_width * 0.5) / (1.0 - aaa2);
- }
-
- // numerical integration otherwise
- const complex_t ay = qy * m_width / M_TWOPI;
- const complex_t az = complex_t(0, 1) * qz * (m_height / 2);
-
- const auto integrand = [&](double u) -> complex_t {
- return sin(u) * exp(az * std::cos(u)) * (ay == 0. ? u : sin(ay * u) / ay);
- };
- complex_t integral = m_integrator.integrate(integrand, 0, M_PI);
- return factor * integral * exp(az) * (m_height / 2);
-}
-
-void ProfileRipple1::onChange()
-{
- mP_shape.reset(new RippleCosine(m_length, m_width, m_height));
-}
diff --git a/Core/HardParticle/ProfileRipple1.h b/Core/HardParticle/ProfileRipple1.h
deleted file mode 100644
index 1a0a6527b2a211d00b89dca20ae5dd85f6d2e131..0000000000000000000000000000000000000000
--- a/Core/HardParticle/ProfileRipple1.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/ProfileRipple1.h
-//! @brief Defines class ProfileRipple1.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE1_H
-#define BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE1_H
-
-#include "Core/Scattering/IFormFactorBorn.h"
-#include "Core/Tools/Integrator.h"
-
-//! Base class for form factors with a cosine ripple profile in the yz plane.
-
-class BA_CORE_API_ ProfileRipple1 : public IFormFactorBorn
-{
-public:
- ProfileRipple1(double length, double width, double height);
-
- double getLength() const { return m_length; }
- double getHeight() const { return m_height; }
- double getWidth() const { return m_width; }
-
- double radialExtension() const override final;
-
- complex_t evaluate_for_q(cvector_t q) const override final
- {
- return factor_x(q.x()) * factor_yz(q.y(), q.z());
- }
-
-protected:
- void onChange() override final;
- virtual complex_t factor_x(complex_t qx) const = 0;
-
- double m_length;
- double m_width;
- double m_height;
-
-private:
- complex_t factor_yz(complex_t qy, complex_t qz) const;
- bool check_initialization() const;
- mutable ComplexIntegrator m_integrator;
-};
-
-#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE1_H
diff --git a/Core/HardParticle/ProfileRipple2.cpp b/Core/HardParticle/ProfileRipple2.cpp
deleted file mode 100644
index 3e42fbed8049f35d78dbdb9c015927ddae32f036..0000000000000000000000000000000000000000
--- a/Core/HardParticle/ProfileRipple2.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/ProfileRipple2.cpp
-//! @brief Implements class ProfileRipple2.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#include "Core/HardParticle/ProfileRipple2.h"
-#include "Core/Basics/Exceptions.h"
-#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
-#include "Core/Shapes/RippleSawtooth.h" // from Shapes/
-#include "Core/Tools/MathFunctions.h"
-#include "Fit/Tools/RealLimits.h"
-
-//! @brief Constructor of triangular ripple.
-//! @param length: length of the rectangular base in nanometers
-//! @param width: width of the rectangular base in nanometers
-//! @param height: height of the ripple in nanometers
-ProfileRipple2::ProfileRipple2(double length, double width, double height, double asymmetry)
- : m_length(length), m_width(width), m_height(height), m_asymmetry(asymmetry)
-{
- check_initialization();
- registerParameter("Length", &m_length).setUnit("nm").setNonnegative();
- registerParameter("Width", &m_width).setUnit("nm").setNonnegative();
- registerParameter("Height", &m_height).setUnit("nm").setNonnegative();
- registerParameter("AsymmetryLength", &m_asymmetry).setUnit("nm");
- onChange();
-}
-
-bool ProfileRipple2::check_initialization() const
-{
- bool result(true);
- if (m_height <= 0.0 || m_width <= 0.0 || m_length <= 0.0) {
- std::ostringstream ostr;
- ostr << "ProfileRipple2() -> Error in class initialization with parameters ";
- ostr << " height:" << m_height;
- ostr << " width:" << m_width;
- ostr << " length:" << m_length << "\n\n";
- ostr << "Check for 'height>0.0 && width>0.0 && length>0.0' failed.";
- throw Exceptions::ClassInitializationException(ostr.str());
- }
- return result;
-}
-
-double ProfileRipple2::radialExtension() const
-{
- return (m_width + m_length) / 4.0;
-}
-
-//! Complex form factor.
-complex_t ProfileRipple2::factor_yz(complex_t qy, complex_t qz) const
-{
- complex_t result;
- const complex_t factor = m_height * m_width;
- const complex_t qyW2 = qy * m_width * 0.5;
- const complex_t qyd = qy * m_asymmetry;
- const complex_t qzH = qz * m_height;
- const complex_t a = qzH + qyd;
- // dimensionless scale factors
- const double a_scale = std::abs(a);
- const double w_scale = std::abs(qyW2);
-
- if (w_scale < 1.e-5) { // |q_y*W| << 1
- if (a_scale < 1e-5) { // |q_y*W| << 1 && |q_z*H + q_y*d| << 1
- // relative error is O((q_y*W)^2) and O((q_z*H + q_y*d)^2)
- result = exp_I(-qyd) * (0.5 + mul_I(a) / 6.);
- } else {
- // relative error is O((q_y*W)^2)
- result = exp_I(-qyd) * (1.0 + mul_I(a) - exp_I(a)) / (a * a);
- }
- } else {
- const complex_t gamma_p = (a + qyW2) * 0.5;
- const complex_t gamma_m = (a - qyW2) * 0.5;
- result = exp_I(gamma_m) * MathFunctions::sinc(gamma_p)
- - exp_I(gamma_p) * MathFunctions::sinc(gamma_m);
- result = mul_I(exp_I(-qyd) * result / (qyW2 * 2.));
- }
- return factor * result;
-}
-
-void ProfileRipple2::onChange()
-{
- mP_shape.reset(new RippleSawtooth(m_length, m_width, m_height, m_asymmetry));
-}
diff --git a/Core/HardParticle/ProfileRipple2.h b/Core/HardParticle/ProfileRipple2.h
deleted file mode 100644
index 726547f9aa3a0c0dbb7fc25a63999b4fbfc5b2d7..0000000000000000000000000000000000000000
--- a/Core/HardParticle/ProfileRipple2.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file Core/HardParticle/ProfileRipple2.h
-//! @brief Defines class ProfileRipple2.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#ifndef BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
-#define BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
-
-#include "Core/Scattering/IFormFactorBorn.h"
-#include "Core/Tools/Integrator.h"
-
-//! Base class for form factors with a cosine ripple profile in the yz plane.
-
-class BA_CORE_API_ ProfileRipple2 : public IFormFactorBorn
-{
-public:
- ProfileRipple2(double length, double width, double height, double asymmetry);
-
- double getLength() const { return m_length; }
- double getHeight() const { return m_height; }
- double getWidth() const { return m_width; }
- double getAsymmetry() const { return m_asymmetry; }
-
- double radialExtension() const override final;
-
- complex_t evaluate_for_q(cvector_t q) const override final
- {
- return factor_x(q.x()) * factor_yz(q.y(), q.z());
- }
-
-protected:
- void onChange() override final;
- virtual complex_t factor_x(complex_t qx) const = 0;
-
- double m_length;
- double m_width;
- double m_height;
- double m_asymmetry;
-
-private:
- complex_t factor_yz(complex_t qy, complex_t qz) const;
- bool check_initialization() const;
- mutable ComplexIntegrator m_integrator;
-};
-
-#endif // BORNAGAIN_CORE_HARDPARTICLE_PROFILERIPPLE2_H
diff --git a/Core/HardParticle/Ripples.cpp b/Core/HardParticle/Ripples.cpp
index a2d88df4678249094164b9082ceccebf18af5d2a..f4b677e2c50abb5e1090c44a140b31a5c169e46f 100644
--- a/Core/HardParticle/Ripples.cpp
+++ b/Core/HardParticle/Ripples.cpp
@@ -13,6 +13,8 @@
// ************************************************************************** //
#include "Core/HardParticle/Ripples.h"
+#include "Core/Basics/MathConstants.h"
+#include "Core/Tools/Integrator.h"
#include "Core/Tools/MathFunctions.h"
complex_t ripples::factor_x_box(complex_t q, double r)
@@ -29,3 +31,72 @@ complex_t ripples::factor_x_Lorentz(complex_t q, double r)
{
return r / (1.0 + (q * r) * (q * r));
}
+
+//! Complex form factor of rectangular ripple (bar).
+complex_t ripples::profile_yz_bar(complex_t qy, complex_t qz, double width, double height)
+{
+ const complex_t qyWdiv2 = width * qy / 2.0;
+ const complex_t qzHdiv2 = height * qz / 2.0;
+
+ return height * width * exp_I(qzHdiv2) * MathFunctions::sinc(qyWdiv2)
+ * MathFunctions::sinc(qzHdiv2);
+}
+
+//! Complex form factor of triangular ripple.
+complex_t ripples::profile_yz_cosine(complex_t qy, complex_t qz, double width, double height)
+{
+ complex_t factor = width / M_PI;
+
+ // analytical expressions for some particular cases
+ if (qz == 0.) {
+ if (qy == 0.)
+ return factor * M_PI_2 * height;
+ complex_t aaa = qy * width / (M_TWOPI);
+ complex_t aaa2 = aaa * aaa;
+ if (aaa2 == 1.)
+ return factor * M_PI_4 * height;
+ return factor * M_PI_2 * height * MathFunctions::sinc(qy * width * 0.5) / (1.0 - aaa2);
+ }
+
+ // numerical integration otherwise
+ const complex_t ay = qy * width / M_TWOPI;
+ const complex_t az = complex_t(0, 1) * qz * (height / 2);
+
+ const auto integrand = [&](double u) -> complex_t {
+ return sin(u) * exp(az * std::cos(u)) * (ay == 0. ? u : sin(ay * u) / ay);
+ };
+ complex_t integral = ComplexIntegrator().integrate(integrand, 0, M_PI);
+ return factor * integral * exp(az) * (height / 2);
+}
+
+//! Complex form factor of triangular ripple.
+complex_t ripples::profile_yz_triangular(complex_t qy, complex_t qz, double width, double height,
+ double asymmetry)
+{
+ complex_t result;
+ const complex_t factor = height * width;
+ const complex_t qyW2 = qy * width * 0.5;
+ const complex_t qyd = qy * asymmetry;
+ const complex_t qzH = qz * height;
+ const complex_t a = qzH + qyd;
+ // dimensionless scale factors
+ const double a_scale = std::abs(a);
+ const double w_scale = std::abs(qyW2);
+
+ if (w_scale < 1.e-5) { // |q_y*W| << 1
+ if (a_scale < 1e-5) { // |q_y*W| << 1 && |q_z*H + q_y*d| << 1
+ // relative error is O((q_y*W)^2) and O((q_z*H + q_y*d)^2)
+ result = exp_I(-qyd) * (0.5 + mul_I(a) / 6.);
+ } else {
+ // relative error is O((q_y*W)^2)
+ result = exp_I(-qyd) * (1.0 + mul_I(a) - exp_I(a)) / (a * a);
+ }
+ } else {
+ const complex_t gamma_p = (a + qyW2) * 0.5;
+ const complex_t gamma_m = (a - qyW2) * 0.5;
+ result = exp_I(gamma_m) * MathFunctions::sinc(gamma_p)
+ - exp_I(gamma_p) * MathFunctions::sinc(gamma_m);
+ result = mul_I(exp_I(-qyd) * result / (qyW2 * 2.));
+ }
+ return factor * result;
+}
diff --git a/Core/HardParticle/Ripples.h b/Core/HardParticle/Ripples.h
index 92f37c36fbc1fb49369cde68fb017ba15b5b9385..b654f3c8390f23f82c25a40a5f0553c6c8c24bef 100644
--- a/Core/HardParticle/Ripples.h
+++ b/Core/HardParticle/Ripples.h
@@ -25,6 +25,11 @@ complex_t factor_x_box(complex_t q, double l);
complex_t factor_x_Gauss(complex_t q, double l);
complex_t factor_x_Lorentz(complex_t q, double l);
+complex_t profile_yz_bar(complex_t qy, complex_t qz, double width, double height);
+complex_t profile_yz_cosine(complex_t qy, complex_t qz, double width, double height);
+complex_t profile_yz_triangular(complex_t qy, complex_t qz, double width, double height,
+ double asymmetry);
+
} // namespace ripples
#endif // BORNAGAIN_CORE_HARDPARTICLE_RIPPLES_H
diff --git a/Core/Intensity/SimpleUnitConverters.cpp b/Core/Intensity/SimpleUnitConverters.cpp
index 9ed7a1f85228ae1d6a616f3db8adb21edf2bdbbb..e3238c2d5f0f71d27fb0ccb78af8f9520a3f2620 100644
--- a/Core/Intensity/SimpleUnitConverters.cpp
+++ b/Core/Intensity/SimpleUnitConverters.cpp
@@ -17,6 +17,7 @@
#include "Core/Basics/Units.h"
#include "Core/Beam/Beam.h"
#include "Core/Detector/RectangularDetector.h"
+#include "Core/Detector/RectangularPixel.h"
#include "Core/Detector/RegionOfInterest.h"
#include "Core/Detector/SphericalDetector.h"
#include "Core/Intensity/AxisNames.h"
diff --git a/Core/Lattice/Lattice2D.cpp b/Core/Lattice/Lattice2D.cpp
index d84615a126fe45b9bd3b9474b30bb3eee993af79..7393c4b5bb848a8641e8fde374881b36805b33a7 100644
--- a/Core/Lattice/Lattice2D.cpp
+++ b/Core/Lattice/Lattice2D.cpp
@@ -18,6 +18,10 @@
#include "Core/Parametrization/RealParameter.h"
#include <cmath>
+// ************************************************************************** //
+// class Lattice2D
+// ************************************************************************** //
+
Lattice2D::Lattice2D(const NodeMeta& meta, const std::vector<double>& PValues)
: INode(meta, PValues)
{
@@ -57,7 +61,9 @@ void Lattice2D::setRotationEnabled(bool enabled) // TODO ASAP replace by generic
}
}
-// --------------------------------------------------------------------------------------------- //
+// ************************************************************************** //
+// class BasicLattice
+// ************************************************************************** //
BasicLattice::BasicLattice(double length1, double length2, double angle, double xi)
: Lattice2D(xi), m_length1(length1), m_length2(length2), m_angle(angle)
@@ -82,7 +88,9 @@ double BasicLattice::unitCellArea() const
return std::abs(m_length1 * m_length2 * std::sin(m_angle));
}
-// --------------------------------------------------------------------------------------------- //
+// ************************************************************************** //
+// class SquareLattice
+// ************************************************************************** //
SquareLattice::SquareLattice(double length, double xi) : Lattice2D(xi), m_length(length)
{
@@ -109,7 +117,9 @@ double SquareLattice::unitCellArea() const
return std::abs(m_length * m_length);
}
-// --------------------------------------------------------------------------------------------- //
+// ************************************************************************** //
+// class HexagonalLattice
+// ************************************************************************** //
HexagonalLattice::HexagonalLattice(double length, double xi) : Lattice2D(xi), m_length(length)
{
diff --git a/Core/Multilayer/SpecularSimulationElement.h b/Core/Multilayer/SpecularSimulationElement.h
index cc632d70c3318a38fc175bd1fde1fffef9e6239c..ade4a2f685e3cc540d2d7425657bd522442dd467 100644
--- a/Core/Multilayer/SpecularSimulationElement.h
+++ b/Core/Multilayer/SpecularSimulationElement.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
-#define BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
+#ifndef BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
+#define BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
#include "Core/Basics/Complex.h"
#include "Core/SimulationElement/PolarizationHandler.h"
@@ -67,4 +67,4 @@ private:
std::function<std::vector<complex_t>(const std::vector<Slice>&)> m_kz_computation;
};
-#endif // BORNAGAIN_CORE_SIMULATIONELEMENT_SPECULARSIMULATIONELEMENT_H
+#endif // BORNAGAIN_CORE_MULTILAYER_SPECULARSIMULATIONELEMENT_H
diff --git a/Core/Parametrization/Distributions.cpp b/Core/Parametrization/Distributions.cpp
index 92127008fd52afd983bb205c31081bd35a07e6f7..9b2debaad75a76720029b4ffe55088a399576044 100644
--- a/Core/Parametrization/Distributions.cpp
+++ b/Core/Parametrization/Distributions.cpp
@@ -124,13 +124,21 @@ IDistribution1D::generateSamplesFromValues(const std::vector<double>& sample_val
// class DistributionGate
// ************************************************************************** //
-DistributionGate::DistributionGate(double min, double max) : m_min(min), m_max(max)
+DistributionGate::DistributionGate(const std::vector<double> P)
+ : IDistribution1D(
+ {"DistributionGate",
+ "class_tooltip",
+ {{"Min", "", "para_tooltip", -INF, +INF, 0}, {"Max", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_min(m_P[0]), m_max(m_P[1])
{
- setName("DistributionGate");
if (m_max < m_min)
throw Exceptions::ClassInitializationException("DistributionGate: max<min");
- registerParameter("Min", &m_min);
- registerParameter("Max", &m_max);
+}
+
+DistributionGate::DistributionGate(double min, double max)
+ : DistributionGate(std::vector<double>{min, max})
+{
}
DistributionGate::DistributionGate() : DistributionGate(0., 1.) {}
@@ -144,10 +152,9 @@ double DistributionGate::probabilityDensity(double x) const
return 1.0 / (m_max - m_min);
}
-std::vector<double> DistributionGate::equidistantPoints(size_t nbr_samples, double sigma_factor,
+std::vector<double> DistributionGate::equidistantPoints(size_t nbr_samples, double /*sigma_factor*/,
const RealLimits& limits) const
{
- (void)sigma_factor;
double xmin = m_min;
double xmax = m_max;
adjustMinMaxForLimits(xmin, xmax, limits);
@@ -163,13 +170,21 @@ bool DistributionGate::isDelta() const
// class DistributionLorentz
// ************************************************************************** //
-DistributionLorentz::DistributionLorentz(double mean, double hwhm) : m_mean(mean), m_hwhm(hwhm)
+DistributionLorentz::DistributionLorentz(const std::vector<double> P)
+ : IDistribution1D({"DistributionLorentz",
+ "class_tooltip",
+ {{"Mean", "", "para_tooltip", -INF, +INF, 0},
+ {"HWHM", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_mean(m_P[0]), m_hwhm(m_P[1])
{
- setName("DistributionLorentz");
if (m_hwhm < 0.0)
throw Exceptions::ClassInitializationException("DistributionLorentz: hwhm<0");
- registerParameter("Mean", &m_mean);
- registerParameter("HWHM", &m_hwhm);
+}
+
+DistributionLorentz::DistributionLorentz(double mean, double hwhm)
+ : DistributionLorentz(std::vector<double>{mean, hwhm})
+{
}
DistributionLorentz::DistributionLorentz() : DistributionLorentz(0., 1.) {}
@@ -201,14 +216,21 @@ bool DistributionLorentz::isDelta() const
// class DistributionGaussian
// ************************************************************************** //
-DistributionGaussian::DistributionGaussian(double mean, double std_dev)
- : m_mean(mean), m_std_dev(std_dev)
+DistributionGaussian::DistributionGaussian(const std::vector<double> P)
+ : IDistribution1D({"DistributionGaussian",
+ "class_tooltip",
+ {{"Mean", "", "para_tooltip", -INF, +INF, 0},
+ {"StdDev", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_mean(m_P[0]), m_std_dev(m_P[1])
{
- setName("DistributionGaussian");
if (m_std_dev < 0.0)
throw Exceptions::ClassInitializationException("DistributionGaussian: std_dev < 0");
- registerParameter("Mean", &m_mean);
- registerParameter("StdDev", &m_std_dev);
+}
+
+DistributionGaussian::DistributionGaussian(double mean, double std_dev)
+ : DistributionGaussian(std::vector<double>{mean, std_dev})
+{
}
DistributionGaussian::DistributionGaussian() : DistributionGaussian(0., 1.) {}
@@ -241,18 +263,27 @@ bool DistributionGaussian::isDelta() const
// class DistributionLogNormal
// ************************************************************************** //
-DistributionLogNormal::DistributionLogNormal(double median, double scale_param)
- : m_median(median), m_scale_param(scale_param)
+DistributionLogNormal::DistributionLogNormal(const std::vector<double> P)
+ : IDistribution1D({"DistributionLogNormal",
+ "class_tooltip",
+ {{"Median", "", "para_tooltip", -INF, +INF, 0},
+ {"ScaleParameter", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_median(m_P[0]), m_scale_param(m_P[1])
{
- setName("DistributionLogNormal");
if (m_scale_param < 0.0)
throw Exceptions::ClassInitializationException("DistributionLogNormal: scale_param < 0");
if (m_median <= 0.0)
throw Exceptions::ClassInitializationException("DistributionLogNormal: median < 0");
- registerParameter("Median", &m_median);
- registerParameter("ScaleParameter", &m_scale_param);
}
+DistributionLogNormal::DistributionLogNormal(double median, double scale_param)
+ : DistributionLogNormal(std::vector<double>{median, scale_param})
+{
+}
+
+DistributionTrapezoid::DistributionTrapezoid() : DistributionTrapezoid(0., 0., 1., 0.) {}
+
double DistributionLogNormal::probabilityDensity(double x) const
{
if (m_scale_param == 0.0)
@@ -299,13 +330,21 @@ void DistributionLogNormal::setUnits(const std::string& units)
// class DistributionCosine
// ************************************************************************** //
-DistributionCosine::DistributionCosine(double mean, double sigma) : m_mean(mean), m_sigma(sigma)
+DistributionCosine::DistributionCosine(const std::vector<double> P)
+ : IDistribution1D({"DistributionCosine",
+ "class_tooltip",
+ {{"Mean", "", "para_tooltip", -INF, +INF, 0},
+ {"Sigma", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_mean(m_P[0]), m_sigma(m_P[1])
{
- setName("DistributionCosine");
if (m_sigma < 0.0)
throw Exceptions::ClassInitializationException("DistributionCosine: sigma<0");
- registerParameter("Mean", &m_mean);
- registerParameter("Sigma", &m_sigma);
+}
+
+DistributionCosine::DistributionCosine(double mean, double sigma)
+ : DistributionCosine(std::vector<double>{mean, sigma})
+{
}
DistributionCosine::DistributionCosine() : DistributionCosine(0., 1.) {}
@@ -339,24 +378,29 @@ bool DistributionCosine::isDelta() const
// class DistributionTrapezoidal
// ************************************************************************** //
-DistributionTrapezoid::DistributionTrapezoid(double center, double left, double middle,
- double right)
- : m_center(center), m_left(left), m_middle(middle), m_right(right)
+DistributionTrapezoid::DistributionTrapezoid(const std::vector<double> P)
+ : IDistribution1D({"DistributionTrapezoid",
+ "class_tooltip",
+ {{"Center", "", "para_tooltip", -INF, +INF, 0},
+ {"LeftWidth", "", "para_tooltip", -INF, +INF, 0},
+ {"MiddleWidth", "", "para_tooltip", -INF, +INF, 0},
+ {"RightWidth", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_center(m_P[0]), m_left(m_P[1]), m_middle(m_P[2]), m_right(m_P[3])
{
- setName("DistributionTrapezoid");
if (m_left < 0.0)
throw Exceptions::ClassInitializationException("DistributionTrapezoid: leftWidth < 0");
if (m_middle < 0.0)
throw Exceptions::ClassInitializationException("DistributionTrapezoid: middleWidth < 0");
if (m_right < 0.0)
throw Exceptions::ClassInitializationException("DistributionTrapezoid: rightWidth < 0");
- registerParameter("Center", &m_center);
- registerParameter("LeftWidth", &m_left);
- registerParameter("MiddleWidth", &m_middle);
- registerParameter("RightWidth", &m_right);
}
-DistributionTrapezoid::DistributionTrapezoid() : DistributionTrapezoid(0., 0., 1., 0.) {}
+DistributionTrapezoid::DistributionTrapezoid(double center, double left, double middle,
+ double right)
+ : DistributionTrapezoid(std::vector<double>{center, left, middle, right})
+{
+}
double DistributionTrapezoid::probabilityDensity(double x) const
{
diff --git a/Core/Parametrization/Distributions.h b/Core/Parametrization/Distributions.h
index bcc9420e9cbafae99c0b0cbf2a7c707200cb4c30..738d080307f64521276b8b78698384b65985e991 100644
--- a/Core/Parametrization/Distributions.h
+++ b/Core/Parametrization/Distributions.h
@@ -23,7 +23,7 @@
class ParameterSample;
// ************************************************************************** //
-// interface class IDistribution1D
+// interface IDistribution1D
// ************************************************************************** //
//! Interface for one-dimensional distributions.
@@ -32,7 +32,6 @@ class ParameterSample;
class BA_CORE_API_ IDistribution1D : public ICloneable, public INode
{
public:
- IDistribution1D() = default;
IDistribution1D(const NodeMeta& meta, const std::vector<double>& PValues);
virtual IDistribution1D* clone() const = 0;
@@ -77,7 +76,7 @@ protected:
};
// ************************************************************************** //
-// specific distribution classes
+// class DistributionGate
// ************************************************************************** //
//! Uniform distribution function with half width hwhm.
@@ -86,8 +85,9 @@ protected:
class BA_CORE_API_ DistributionGate : public IDistribution1D
{
public:
- DistributionGate();
+ DistributionGate(const std::vector<double> P);
DistributionGate(double min, double max);
+ DistributionGate();
DistributionGate* clone() const final { return new DistributionGate(m_min, m_max); }
@@ -105,18 +105,23 @@ public:
void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
private:
- double m_min;
- double m_max;
+ const double& m_min;
+ const double& m_max;
};
+// ************************************************************************** //
+// class DistributionLorentz
+// ************************************************************************** //
+
//! Lorentz distribution with half width hwhm.
//! @ingroup paramDistribution
class BA_CORE_API_ DistributionLorentz : public IDistribution1D
{
public:
- DistributionLorentz();
+ DistributionLorentz(const std::vector<double> P);
DistributionLorentz(double mean, double hwhm);
+ DistributionLorentz();
DistributionLorentz* clone() const final { return new DistributionLorentz(m_mean, m_hwhm); }
@@ -133,18 +138,23 @@ public:
void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
private:
- double m_mean;
- double m_hwhm;
+ const double& m_mean;
+ const double& m_hwhm;
};
+// ************************************************************************** //
+// class Distribution
+// ************************************************************************** //
+
//! Gaussian distribution with standard deviation std_dev.
//! @ingroup paramDistribution
class BA_CORE_API_ DistributionGaussian : public IDistribution1D
{
public:
- DistributionGaussian();
+ DistributionGaussian(const std::vector<double> P);
DistributionGaussian(double mean, double std_dev);
+ DistributionGaussian();
DistributionGaussian* clone() const final
{
@@ -164,18 +174,23 @@ public:
void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
private:
- double m_mean;
- double m_std_dev;
+ const double& m_mean;
+ const double& m_std_dev;
};
+// ************************************************************************** //
+// class DistributionLogNormal
+// ************************************************************************** //
+
//! Log-normal distribution.
//! @ingroup paramDistribution
class BA_CORE_API_ DistributionLogNormal : public IDistribution1D
{
public:
- DistributionLogNormal() = delete;
+ DistributionLogNormal(const std::vector<double> P);
DistributionLogNormal(double median, double scale_param);
+ DistributionLogNormal() = delete;
DistributionLogNormal* clone() const final
{
@@ -198,18 +213,23 @@ public:
virtual void setUnits(const std::string& units);
private:
- double m_median;
- double m_scale_param;
+ const double& m_median;
+ const double& m_scale_param;
};
+// ************************************************************************** //
+// class DistributionCosine
+// ************************************************************************** //
+
//! Cosine distribution.
//! @ingroup paramDistribution
class BA_CORE_API_ DistributionCosine : public IDistribution1D
{
public:
- DistributionCosine();
+ DistributionCosine(const std::vector<double> P);
DistributionCosine(double mean, double sigma);
+ DistributionCosine();
DistributionCosine* clone() const final { return new DistributionCosine(m_mean, m_sigma); }
@@ -226,18 +246,23 @@ public:
void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
private:
- double m_mean;
- double m_sigma;
+ const double& m_mean;
+ const double& m_sigma;
};
+// ************************************************************************** //
+// class DistributionTrapezoid
+// ************************************************************************** //
+
//! Trapezoidal distribution.
//! @ingroup paramDistribution
class BA_CORE_API_ DistributionTrapezoid : public IDistribution1D
{
public:
- DistributionTrapezoid();
+ DistributionTrapezoid(const std::vector<double> P);
DistributionTrapezoid(double center, double left, double middle, double right);
+ DistributionTrapezoid();
DistributionTrapezoid* clone() const final
{
@@ -260,10 +285,10 @@ public:
private:
void adjustLimitsToNonZeroSamples(double& min, double& max, size_t nbr_samples) const;
- double m_center;
- double m_left;
- double m_middle;
- double m_right;
+ const double& m_center;
+ const double& m_left;
+ const double& m_middle;
+ const double& m_right;
};
#endif // BORNAGAIN_CORE_PARAMETRIZATION_DISTRIBUTIONS_H
diff --git a/Core/Parametrization/INodeVisitor.h b/Core/Parametrization/INodeVisitor.h
index ba328b34206ffa043052ddda09a2b121ca98be0b..c91abd7dc01f0f35d19afaf27ece5ae564682b13 100644
--- a/Core/Parametrization/INodeVisitor.h
+++ b/Core/Parametrization/INodeVisitor.h
@@ -60,12 +60,12 @@ class FormFactorLongBoxLorentz;
class FormFactorPrism3;
class FormFactorPrism6;
class FormFactorPyramid;
-class FormFactorRipple1Box;
-class FormFactorRipple1Gauss;
-class FormFactorRipple1Lorentz;
-class FormFactorRipple2Box;
-class FormFactorRipple2Gauss;
-class FormFactorRipple2Lorentz;
+class FormFactorCosineRippleBox;
+class FormFactorCosineRippleGauss;
+class FormFactorCosineRippleLorentz;
+class FormFactorSawtoothRippleBox;
+class FormFactorSawtoothRippleGauss;
+class FormFactorSawtoothRippleLorentz;
class FormFactorSphereGaussianRadius;
class FormFactorSphereLogNormalRadius;
class FormFactorTetrahedron;
@@ -196,12 +196,12 @@ public:
virtual void visit(const FormFactorPrism3*) {}
virtual void visit(const FormFactorPrism6*) {}
virtual void visit(const FormFactorPyramid*) {}
- virtual void visit(const FormFactorRipple1Box*) {}
- virtual void visit(const FormFactorRipple1Gauss*) {}
- virtual void visit(const FormFactorRipple1Lorentz*) {}
- virtual void visit(const FormFactorRipple2Box*) {}
- virtual void visit(const FormFactorRipple2Gauss*) {}
- virtual void visit(const FormFactorRipple2Lorentz*) {}
+ virtual void visit(const FormFactorCosineRippleBox*) {}
+ virtual void visit(const FormFactorCosineRippleGauss*) {}
+ virtual void visit(const FormFactorCosineRippleLorentz*) {}
+ virtual void visit(const FormFactorSawtoothRippleBox*) {}
+ virtual void visit(const FormFactorSawtoothRippleGauss*) {}
+ virtual void visit(const FormFactorSawtoothRippleLorentz*) {}
virtual void visit(const FormFactorSphereGaussianRadius*) {}
virtual void visit(const FormFactorSphereLogNormalRadius*) {}
virtual void visit(const FormFactorTetrahedron*) {}
diff --git a/Core/RT/ILayerRTCoefficients.h b/Core/RT/ILayerRTCoefficients.h
index 2ef9d2f726f6e90b5caad3f9abcf5382334f7652..dfeba8d7162f05a9d0aef2b22d565d91e3e8667a 100644
--- a/Core/RT/ILayerRTCoefficients.h
+++ b/Core/RT/ILayerRTCoefficients.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
#include "Core/Basics/Complex.h"
#include "Core/Basics/Exceptions.h"
@@ -62,4 +62,4 @@ public:
}
};
-#endif // BORNAGAIN_CORE_MULTILAYER_ILAYERRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_ILAYERRTCOEFFICIENTS_H
diff --git a/Core/RT/MatrixRTCoefficients.h b/Core/RT/MatrixRTCoefficients.h
index 75335d0855d23e6e8e5318c1283fe848c249dbdf..b8c6424a9458c18e98516a3499f71533b4cf7cde 100644
--- a/Core/RT/MatrixRTCoefficients.h
+++ b/Core/RT/MatrixRTCoefficients.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
#include "Core/RT/ILayerRTCoefficients.h"
@@ -67,4 +67,4 @@ public:
//!< lambda=0
};
-#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_H
diff --git a/Core/RT/MatrixRTCoefficients_v2.h b/Core/RT/MatrixRTCoefficients_v2.h
index bd04b2044ee57560e2df92f3afffc4d6c6f0aa68..46aad9b26f74b2695ccd80d9d600bb0369465242 100644
--- a/Core/RT/MatrixRTCoefficients_v2.h
+++ b/Core/RT/MatrixRTCoefficients_v2.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
-#define BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
+#ifndef BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
+#define BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
#include "Core/RT/ILayerRTCoefficients.h"
#include "Core/Vector/Vectors3D.h"
@@ -65,4 +65,4 @@ private:
//!< the second eigenmode
};
-#endif // BORNAGAIN_CORE_MULTILAYER_MATRIXRTCOEFFICIENTS_V2_H
+#endif // BORNAGAIN_CORE_RT_MATRIXRTCOEFFICIENTS_V2_H
diff --git a/Core/RT/ScalarRTCoefficients.h b/Core/RT/ScalarRTCoefficients.h
index 206fcabcfdbe09e80972b697fd49b57ef91338ff..9f1d4bffee66739c81dfb96881a4a0a5c895efb3 100644
--- a/Core/RT/ScalarRTCoefficients.h
+++ b/Core/RT/ScalarRTCoefficients.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
-#define BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
+#ifndef BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
+#define BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
#include "Core/Basics/Complex.h"
#include "Core/RT/ILayerRTCoefficients.h"
@@ -139,4 +139,4 @@ inline complex_t ScalarRTCoefficients::getScalarT() const
return t_r(0);
}
-#endif // BORNAGAIN_CORE_MULTILAYER_SCALARRTCOEFFICIENTS_H
+#endif // BORNAGAIN_CORE_RT_SCALARRTCOEFFICIENTS_H
diff --git a/Core/Scattering/Rotations.cpp b/Core/Scattering/Rotations.cpp
index 7eca01bf8b03b6b05c9dd2cab4953cb9c86e7fc0..fb499db3e0c13fcb671ffbe54cd33f103b583696 100644
--- a/Core/Scattering/Rotations.cpp
+++ b/Core/Scattering/Rotations.cpp
@@ -14,9 +14,12 @@
#include "Core/Scattering/Rotations.h"
#include "Core/Basics/Assert.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Vector/Transform3D.h"
+// ************************************************************************** //
+// interface IRotation
+// ************************************************************************** //
+
IRotation::IRotation(const NodeMeta& meta, const std::vector<double>& PValues)
: INode(meta, PValues)
{
@@ -77,72 +80,103 @@ IRotation* createProduct(const IRotation& left, const IRotation& right)
return p_result;
}
-// --- IdentityRotation -------------------------------------------------------
+// ************************************************************************** //
+// class IdentityRotation
+// ************************************************************************** //
+
+IdentityRotation::IdentityRotation()
+ : IRotation({"IdentityRotation", "Identity rotation, does nothing", {}}, {})
+{
+}
Transform3D IdentityRotation::getTransform3D() const
{
return Transform3D::createIdentity();
}
-// --- RotationX --------------------------------------------------------------
+// ************************************************************************** //
+// class RotationX
+// ************************************************************************** //
//! Constructor of rotation around x-axis
//! @param angle: rotation angle around x-axis in radians
-RotationX::RotationX(double angle) : m_angle(angle)
+RotationX::RotationX(const std::vector<double> P)
+ : IRotation(
+ {"XRotation", "class_tooltip", {{"Angle", "rad", "Angle around x axis", -INF, +INF, 0}}},
+ P),
+ m_angle(m_P[0])
{
- setName("XRotation");
- registerParameter("Angle", &m_angle).setUnit("rad");
}
+RotationX::RotationX(double angle) : RotationX(std::vector<double>{angle}) {}
+
Transform3D RotationX::getTransform3D() const
{
return Transform3D::createRotateX(m_angle);
}
-// --- RotationY --------------------------------------------------------------
+// ************************************************************************** //
+// class RotationY
+// ************************************************************************** //
//! Constructor of rotation around y-axis
//! @param angle: rotation angle around y-axis in radians
-RotationY::RotationY(double angle) : m_angle(angle)
+RotationY::RotationY(const std::vector<double> P)
+ : IRotation(
+ {"YRotation", "class_tooltip", {{"Angle", "rad", "Angle around y axis", -INF, +INF, 0}}},
+ P),
+ m_angle(m_P[0])
{
- setName("YRotation");
- registerParameter("Angle", &m_angle).setUnit("rad");
}
+RotationY::RotationY(double angle) : RotationY(std::vector<double>{angle}) {}
+
Transform3D RotationY::getTransform3D() const
{
return Transform3D::createRotateY(m_angle);
}
+// ************************************************************************** //
+// class RotationZ
+// ************************************************************************** //
+
// --- RotationZ --------------------------------------------------------------
//! Constructor of rotation around z-axis
//! @param angle: rotation angle around z-axis in radians
-RotationZ::RotationZ(double angle) : m_angle(angle)
+RotationZ::RotationZ(const std::vector<double> P)
+ : IRotation(
+ {"ZRotation", "class_tooltip", {{"Angle", "rad", "Angle around z axis", -INF, +INF, 0}}},
+ P),
+ m_angle(m_P[0])
{
- setName("ZRotation");
- registerParameter("Angle", &m_angle).setUnit("rad");
}
+RotationZ::RotationZ(double angle) : RotationZ(std::vector<double>{angle}) {}
+
Transform3D RotationZ::getTransform3D() const
{
return Transform3D::createRotateZ(m_angle);
}
-// --- RotationEuler ----------------------------------------------------------
+// ************************************************************************** //
+// class RotationEuler
+// ************************************************************************** //
+
+RotationEuler::RotationEuler(const std::vector<double> P)
+ : IRotation({"EulerRotation",
+ "Sequence of three rotations around z-x'-z''",
+ {{"Alpha", "rad", "First Euler angle, rotation around z axis", -INF, +INF, 0},
+ {"Beta", "rad", "Second Euler angle, rotation around x' axis", -INF, +INF, 0},
+ {"Gamma", "rad", "Third Euler angle, rotation around z'' axis", -INF, +INF, 0}}},
+ P),
+ m_alpha(m_P[0]), m_beta(m_P[1]), m_gamma(m_P[2])
+{
+}
-//! Constructor of Euler rotation (sequence of three rotations following Euler angles
-//! notation z-x'-z').
-//! @param alpha: first Euler angle in radians
-//! @param beta: second Euler angle in radians
-//! @param gamma: third Euler angle in radians
RotationEuler::RotationEuler(double alpha, double beta, double gamma)
- : m_alpha(alpha), m_beta(beta), m_gamma(gamma)
+ : RotationEuler(std::vector<double>{alpha, beta, gamma})
{
- setName("EulerRotation");
- registerParameter("Alpha", &m_alpha).setUnit("rad");
- registerParameter("Beta", &m_beta).setUnit("rad");
- registerParameter("Gamma", &m_gamma).setUnit("rad");
}
IRotation* RotationEuler::createInverse() const
diff --git a/Core/Scattering/Rotations.h b/Core/Scattering/Rotations.h
index 1dd312fcc22d4df78d0826358658125306524305..443c898fb111ba727418365c181158765e613086 100644
--- a/Core/Scattering/Rotations.h
+++ b/Core/Scattering/Rotations.h
@@ -30,7 +30,6 @@ public:
static IRotation* createRotation(const Transform3D& transform);
static IRotation* createIdentity();
- IRotation() = default;
IRotation(const NodeMeta& meta, const std::vector<double>& PValues);
virtual IRotation* clone() const = 0;
@@ -53,10 +52,10 @@ BA_CORE_API_ IRotation* createProduct(const IRotation& left, const IRotation& ri
//! The identity rotation, which leaves everything in place.
-class BA_CORE_API_ IdentityRotation : public IRotation
+class BA_CORE_API_ IdentityRotation : public IRotation // TODO get rid of this class
{
public:
- IdentityRotation() = default;
+ IdentityRotation();
IdentityRotation* clone() const { return new IdentityRotation(); }
IdentityRotation* createInverse() const { return new IdentityRotation(); }
@@ -73,6 +72,7 @@ public:
class BA_CORE_API_ RotationX : public IRotation
{
public:
+ RotationX(const std::vector<double> P);
RotationX(double angle);
RotationX* clone() const { return new RotationX(m_angle); }
@@ -85,7 +85,7 @@ public:
Transform3D getTransform3D() const;
protected:
- double m_angle;
+ const double& m_angle;
};
//! A rotation about the y axis.
@@ -93,6 +93,7 @@ protected:
class BA_CORE_API_ RotationY : public IRotation
{
public:
+ RotationY(const std::vector<double> P);
RotationY(double angle);
RotationY* clone() const { return new RotationY(m_angle); }
@@ -105,7 +106,7 @@ public:
Transform3D getTransform3D() const;
protected:
- double m_angle;
+ const double& m_angle;
};
//! A rotation about the z axis.
@@ -113,6 +114,7 @@ protected:
class BA_CORE_API_ RotationZ : public IRotation
{
public:
+ RotationZ(const std::vector<double> P);
RotationZ(double angle);
RotationZ* clone() const { return new RotationZ(m_angle); }
@@ -125,7 +127,7 @@ public:
Transform3D getTransform3D() const;
protected:
- double m_angle;
+ const double& m_angle;
};
//! A sequence of rotations about the z-x'-z'' axes.
@@ -133,6 +135,7 @@ protected:
class BA_CORE_API_ RotationEuler : public IRotation
{
public:
+ RotationEuler(const std::vector<double> P);
RotationEuler(double alpha, double beta, double gamma);
RotationEuler* clone() const { return new RotationEuler(m_alpha, m_beta, m_gamma); }
diff --git a/Core/Simulation/SimulationFactory.h b/Core/Simulation/SimulationFactory.h
index 4af257cb2c79e6be81899463c6cdd88c1d62ee60..af9421d159b426c66888da653efcdb47a5f389ff 100644
--- a/Core/Simulation/SimulationFactory.h
+++ b/Core/Simulation/SimulationFactory.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
+#ifndef BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
+#define BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
#include "Core/Simulation/GISASSimulation.h"
#include "Fit/TestEngine/IFactory.h"
@@ -29,4 +29,4 @@ public:
SimulationFactory();
};
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_SIMULATIONFACTORY_H
+#endif // BORNAGAIN_CORE_SIMULATION_SIMULATIONFACTORY_H
diff --git a/Core/Simulation/StandardSimulations.h b/Core/Simulation/StandardSimulations.h
index 2af738b7c9139814c4bfbd1ae86211357bcf7894..9593bf24549f6acedf3819dd3594a5a51900f186 100644
--- a/Core/Simulation/StandardSimulations.h
+++ b/Core/Simulation/StandardSimulations.h
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
-#define BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
+#ifndef BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
+#define BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
#include "Wrap/WinDllMacros.h"
@@ -82,4 +82,4 @@ BA_CORE_API_ DepthProbeSimulation* BasicDepthProbe();
} // namespace StandardSimulations
-#endif // BORNAGAIN_CORE_STANDARDSAMPLES_STANDARDSIMULATIONS_H
+#endif // BORNAGAIN_CORE_SIMULATION_STANDARDSIMULATIONS_H
diff --git a/Core/SoftParticle/FormFactorGauss.cpp b/Core/SoftParticle/FormFactorGauss.cpp
index 8fd75c965c1f167704118b77d96a9283d0f2f794..4405ef52be9b0ecb4fc42130021c5fe7b7b44887 100644
--- a/Core/SoftParticle/FormFactorGauss.cpp
+++ b/Core/SoftParticle/FormFactorGauss.cpp
@@ -14,17 +14,24 @@
#include "Core/SoftParticle/FormFactorGauss.h"
#include "Core/Basics/MathConstants.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/Box.h"
#include <limits>
-FormFactorGaussSphere::FormFactorGaussSphere(double mean_radius) : m_mean_radius(mean_radius)
+FormFactorGaussSphere::FormFactorGaussSphere(const std::vector<double> P)
+ : IFormFactorBorn({"FormFactorGaussSphere",
+ "class_tooltip",
+ {{"MeanRadius", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_mean_radius(m_P[0])
{
- setName("FormFactorGaussSphere");
- registerParameter("MeanRadius", &m_mean_radius).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorGaussSphere::FormFactorGaussSphere(double mean_radius)
+ : FormFactorGaussSphere(std::vector<double>{mean_radius})
+{
+}
+
complex_t FormFactorGaussSphere::evaluate_for_q(cvector_t q) const
{
const double max_ql = std::sqrt(-4 * M_PI * std::log(std::numeric_limits<double>::min()) / 3);
diff --git a/Core/SoftParticle/FormFactorGauss.h b/Core/SoftParticle/FormFactorGauss.h
index 0c593529089c6dd491ab176ca5c49297d502c4b3..4986e74217f310a181e182649e0b3d357e3c4d88 100644
--- a/Core/SoftParticle/FormFactorGauss.h
+++ b/Core/SoftParticle/FormFactorGauss.h
@@ -23,6 +23,7 @@
class BA_CORE_API_ FormFactorGaussSphere : public IFormFactorBorn
{
public:
+ FormFactorGaussSphere(const std::vector<double> P);
FormFactorGaussSphere(double mean_radius);
FormFactorGaussSphere* clone() const override final
@@ -41,7 +42,7 @@ protected:
void onChange() override final{};
private:
- double m_mean_radius;
+ const double& m_mean_radius;
void initialize();
};
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
index 1c4bfba80c5313a1a6fbe9acda3ac8b76463bf6b..cb128553f7358a280a72dff9c200d29cbfc5fad1 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
@@ -13,21 +13,27 @@
// ************************************************************************** //
#include "Core/SoftParticle/FormFactorSphereGaussianRadius.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
#include "Core/Vector/SomeFormFactors.h"
#include "Fit/Tools/RealLimits.h"
-FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)
- : m_mean(mean), m_sigma(sigma), m_mean_r3(0.0)
+FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(const std::vector<double> P)
+ : IFormFactorBorn({"FormFactorSphereGaussianRadius",
+ "class_tooltip",
+ {{"MeanRadius", "nm", "para_tooltip", 0, +INF, 0},
+ {"SigmaRadius", "nm", "para_tooltip", 0, +INF, 0}}},
+ P),
+ m_mean(m_P[0]), m_sigma(m_P[1])
{
- setName("FormFactorSphereGaussianRadius");
m_mean_r3 = calculateMeanR3();
- registerParameter("MeanRadius", &m_mean).setUnit("nm").setNonnegative();
- registerParameter("SigmaRadius", &m_sigma).setUnit("nm").setNonnegative();
onChange();
}
+FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)
+ : FormFactorSphereGaussianRadius(std::vector<double>{mean, sigma})
+{
+}
+
complex_t FormFactorSphereGaussianRadius::evaluate_for_q(cvector_t q) const
{
double q2 = std::norm(q.x()) + std::norm(q.y()) + std::norm(q.z());
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.h b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
index bf84d66c29339e0f18a51dd9abed7383c615be91..da353e5124aa540513f365bf0d3e9323e490eca5 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.h
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
@@ -24,6 +24,7 @@
class BA_CORE_API_ FormFactorSphereGaussianRadius : public IFormFactorBorn
{
public:
+ FormFactorSphereGaussianRadius(const std::vector<double> P);
FormFactorSphereGaussianRadius(double mean, double sigma);
FormFactorSphereGaussianRadius* clone() const override final
@@ -43,8 +44,8 @@ protected:
private:
double calculateMeanR3() const;
- double m_mean; //!< This is the mean radius
- double m_sigma;
+ const double& m_mean; //!< This is the mean radius
+ const double& m_sigma;
double m_mean_r3; //!< This is the radius that gives the mean volume
};
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index 5414a2f7202da70764e2ba79a34a639b13ce3a17..dc1c459a57a84f7481b52fb1359d8a5b8f6f0a51 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -15,17 +15,18 @@
#include "Core/SoftParticle/FormFactorSphereLogNormalRadius.h"
#include "Core/Parametrization/Distributions.h"
#include "Core/Parametrization/ParameterSample.h"
-#include "Core/Parametrization/RealParameter.h"
#include "Core/Shapes/TruncatedEllipsoid.h"
#include "Core/Vector/SomeFormFactors.h"
-FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param,
+FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(const std::vector<double> P,
size_t n_samples)
- : m_mean(mean), m_scale_param(scale_param), m_n_samples(n_samples)
+ : IFormFactorBorn({"FormFactorSphereLogNormalRadius",
+ "class_tooltip",
+ {{"MeanRadius", "nm", "para_tooltip", 0, +INF, 0},
+ {"ScaleParameter", "", "para_tooltip", -INF, +INF, 0}}},
+ P),
+ m_mean(m_P[0]), m_scale_param(m_P[1]), m_n_samples(n_samples)
{
- setName("FormFactorSphereLogNormalRadius");
- registerParameter("MeanRadius", &m_mean).setUnit("nm").setNonnegative();
- registerParameter("ScaleParameter", &m_scale_param);
DistributionLogNormal distri(m_mean, m_scale_param);
m_radii.clear();
@@ -38,6 +39,12 @@ FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, do
onChange();
}
+FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param,
+ size_t n_samples)
+ : FormFactorSphereLogNormalRadius(std::vector<double>{mean, scale_param}, n_samples)
+{
+}
+
FormFactorSphereLogNormalRadius* FormFactorSphereLogNormalRadius::clone() const
{
return new FormFactorSphereLogNormalRadius(m_mean, m_scale_param, m_n_samples);
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
index 8ed805408f94ca5d9ea69d99c065547b06b0053b..7180b1ba347e86bc3c0c3752cffb36195c87733b 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -25,6 +25,7 @@
class BA_CORE_API_ FormFactorSphereLogNormalRadius : public IFormFactorBorn
{
public:
+ FormFactorSphereLogNormalRadius(const std::vector<double> P, size_t n_samples = 0);
FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples);
FormFactorSphereLogNormalRadius* clone() const override final;
@@ -39,8 +40,8 @@ protected:
void onChange() override final;
private:
- double m_mean;
- double m_scale_param;
+ const double& m_mean;
+ const double& m_scale_param;
size_t m_n_samples;
std::vector<double> m_radii;
diff --git a/Core/StandardSamples/RipplesBuilder.cpp b/Core/StandardSamples/RipplesBuilder.cpp
index 3abae826112e3e230e3bef1595bf939d82c4eef2..993b0ab6cfe7c5afa1c2184d4c65cb9a2b108609 100644
--- a/Core/StandardSamples/RipplesBuilder.cpp
+++ b/Core/StandardSamples/RipplesBuilder.cpp
@@ -16,8 +16,8 @@
#include "Core/Aggregate/InterferenceFunctionRadialParaCrystal.h"
#include "Core/Aggregate/ParticleLayout.h"
#include "Core/Basics/Units.h"
-#include "Core/HardParticle/FormFactorRipple1.h"
-#include "Core/HardParticle/FormFactorRipple2.h"
+#include "Core/HardParticle/FormFactorCosineRipple.h"
+#include "Core/HardParticle/FormFactorSawtoothRipple.h"
#include "Core/Material/MaterialFactoryFuncs.h"
#include "Core/Multilayer/Layer.h"
#include "Core/Multilayer/MultiLayer.h"
@@ -35,7 +35,7 @@ MultiLayer* CosineRippleBuilder::buildSample() const
Material particle_material = HomogeneousMaterial("Particle", 6e-4, 2e-8);
Layer air_layer(air_material);
- FormFactorRipple1Box ff_ripple1(100.0, 20.0, 4.0);
+ FormFactorCosineRippleBox ff_ripple1(100.0, 20.0, 4.0);
Particle ripple(particle_material, ff_ripple1);
ParticleLayout particle_layout;
@@ -71,7 +71,7 @@ MultiLayer* TriangularRippleBuilder::buildSample() const
Material particle_material = HomogeneousMaterial("Particle", 6e-4, 2e-8);
Layer air_layer(air_material);
- FormFactorRipple2Box ff_ripple2(100.0, 20.0, 4.0, m_d);
+ FormFactorSawtoothRippleBox ff_ripple2(100.0, 20.0, 4.0, m_d);
Particle ripple(particle_material, ff_ripple2);
ParticleLayout particle_layout;
diff --git a/Core/StandardSamples/SampleComponents.cpp b/Core/StandardSamples/SampleComponents.cpp
index b2ce04d932f340e064f96ef12304743e5d96e568..00bd3fec7b28caa8f702c2897513173fb45468c9 100644
--- a/Core/StandardSamples/SampleComponents.cpp
+++ b/Core/StandardSamples/SampleComponents.cpp
@@ -66,9 +66,9 @@ FormFactorComponents::FormFactorComponents()
add("Pyramid", new FormFactorPyramid(10.0, 5.0, Units::deg2rad(54.73)));
- add("Ripple1Box", new FormFactorRipple1Box(100.0, 20.0, 4.0));
+ add("CosineRippleBox", new FormFactorCosineRippleBox(100.0, 20.0, 4.0));
- add("Ripple2Box", new FormFactorRipple2Box(100.0, 20.0, 4.0, 0.0));
+ add("SawtoothRippleBox", new FormFactorSawtoothRippleBox(100.0, 20.0, 4.0, 0.0));
add("Tetrahedron", new FormFactorTetrahedron(10.0, 4.0, Units::deg2rad(54.73)));
diff --git a/Core/StandardSamples/TwoDimLatticeBuilder.cpp b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
index 116e25fea6311acdbe23da84a3cadc2738cc218a..ec77b444569b518ba98d077103463525f3e9b841 100644
--- a/Core/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
@@ -155,8 +155,7 @@ MultiLayer* RotatedSquareLatticeBuilder::buildSample() const
std::unique_ptr<InterferenceFunction2DLattice> P_interference_function{
InterferenceFunction2DLattice::createSquare(10.0 * Units::nanometer, 30.0 * Units::degree)};
FTDecayFunction2DCauchy pdf(300.0 * Units::nanometer / 2.0 / M_PI,
- 100.0 * Units::nanometer / 2.0 / M_PI, 0);
- pdf.setGamma(30.0 * Units::degree);
+ 100.0 * Units::nanometer / 2.0 / M_PI, 30.0 * Units::degree);
P_interference_function->setDecayFunction(pdf);
ParticleLayout particle_layout;
diff --git a/Core/includeIncludes/HardParticles.h b/Core/includeIncludes/HardParticles.h
index 8d69e08b5950b51926ed7dc61a895a080f503f36..5b25fa17641a40880aa10b74a46f364f7eacb11b 100644
--- a/Core/includeIncludes/HardParticles.h
+++ b/Core/includeIncludes/HardParticles.h
@@ -21,6 +21,7 @@
#include "Core/HardParticle/FormFactorCantellatedCube.h"
#include "Core/HardParticle/FormFactorCone.h"
#include "Core/HardParticle/FormFactorCone6.h"
+#include "Core/HardParticle/FormFactorCosineRipple.h"
#include "Core/HardParticle/FormFactorCuboctahedron.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorDodecahedron.h"
@@ -36,8 +37,7 @@
#include "Core/HardParticle/FormFactorPrism3.h"
#include "Core/HardParticle/FormFactorPrism6.h"
#include "Core/HardParticle/FormFactorPyramid.h"
-#include "Core/HardParticle/FormFactorRipple1.h"
-#include "Core/HardParticle/FormFactorRipple2.h"
+#include "Core/HardParticle/FormFactorSawtoothRipple.h"
#include "Core/HardParticle/FormFactorTetrahedron.h"
#include "Core/HardParticle/FormFactorTruncatedCube.h"
#include "Core/HardParticle/FormFactorTruncatedSphere.h"
diff --git a/Doc/FFCatalog/FormFactors.tex b/Doc/FFCatalog/FormFactors.tex
index a4902e19d3eb2ad120b86b91bc2eabfec4162e55..3ae55fef598e9ec606e493c74b7e67cf6d566ee5 100644
--- a/Doc/FFCatalog/FormFactors.tex
+++ b/Doc/FFCatalog/FormFactors.tex
@@ -1985,7 +1985,7 @@ For the foreseeable future, this is not in the scope of BornAgain.
We choose ripples to be elongated in $x$ direction.
Different profiles in the $yz$ plane can be chosen:
-box, sinusoidal [\ffref{Ripple1}], saw-tooth [\ffref{Ripple2}].
+bar, cosine, sawtooth.
For each of them, different profiles can also be chosen in the $xz$ plane,
each of them characterized by a single parameter \texttt{length},~$L$.
@@ -2022,8 +2022,8 @@ the \texttt{Lorentz}
form factor is the Fourier transform of an exponential in~$|x|$.
\paragraph{History}\strut\\
-The \texttt{Box} variant of \E{Ripple1} and \E{Ripple2} replicates
-two form factors from \FitGISAXS\ \cite{Bab13}.
+\E{CosineRippleBox} and \E{SawtoothRippleBox} replicate
+Ripple1 and Ripple2 from \FitGISAXS\ \cite{Bab13}.
Full documentation and API support for all ripple form factors appeared in BornAgain-1.17.
Before that release, the \texttt{Lorentz} factor~$f_\parallel$
@@ -2084,34 +2084,33 @@ with $f_\parallel$ as defined in~\cref{EFparallel},
\end{equation*}
%===============================================================================
-\ffsection{Ripple1 (sinusoidal)} \label{SRipple1}
+\ffsection{CosineRipple} \label{SRipple1}
%===============================================================================
-\index{Ripple!sinusoidal}
-\index{Sinusoidal ripple}
-\index{FormFactorRipple1Box@\Code{FormFactorRipple1Box}}
-\index{FormFactorRipple1Gauss@\Code{FormFactorRipple1Gauss}}
-\index{FormFactorRipple1Lorentz@\Code{FormFactorRipple1Lorentz}}
+\index{Ripple!cosine}
+\index{FormFactorCosineRippleBox@\Code{FormFactorCosineRippleBox}}
+\index{FormFactorCosineRippleGauss@\Code{FormFactorCosineRippleGauss}}
+\index{FormFactorCosineRippleLorentz@\Code{FormFactorCosineRippleLorentz}}
\paragraph{Real-space geometry}\strut\\
\begin{figure}[H]
\hfill
-\subfigure[Perspective]{\includefinal{.24\TW}{fig/blue/Ripple13d.png}}
+\subfigure[Perspective]{\includefinal{.24\TW}{fig/blue/CosineRipple3d.png}}
\hfill
-\subfigure[Top view]{\includefinal{.3\TW}{fig/cuts/Ripple12dxy.pdf}}
+\subfigure[Top view]{\includefinal{.3\TW}{fig/cuts/CosineRipple2dxy.pdf}}
\hfill
-\subfigure[Side view]{\includefinal{.3\TW}{fig/cuts/Ripple12dyz.pdf}}
+\subfigure[Side view]{\includefinal{.3\TW}{fig/cuts/CosineRipple2dyz.pdf}}
\hfill
\caption{A ripple with a sinusoidal profile.}
\end{figure}
\paragraph{Syntax and parameters}\strut\\[-2ex plus .2ex minus .2ex]
\begin{lstlisting}
- FormFactorRipple1Box(
+ FormFactorCosineRippleBox(
double length, double width, double height)
- FormFactorRipple1Gauss(
+ FormFactorCosineRippleGauss(
double length, double width, double height)
- FormFactorRipple1Lorentz(
+ FormFactorCosineRippleLorentz(
double length, double width, double height)
\end{lstlisting}
with the parameters
@@ -2151,7 +2150,7 @@ $u=\text{arccos}( 2z/H-1)$.
\begin{figure}[H]
\begin{center}
-\includefinal{1\TW}{fig/ff2/ff_Ripple1.pdf}
+\includefinal{1\TW}{fig/ff2/ff_CosineRipple.pdf}
\end{center}
\caption{Normalized intensity $|F|^2/V^2$,
computed with $L=25$~nm, $W=10$~nm and $H=8$~nm,
@@ -2159,26 +2158,27 @@ for four different angles~$\omega$ of rotation around the $z$ axis.}
\end{figure}
\paragraph{History}\strut\\
-Agrees with the \E{Ripple1} form factor of \FitGISAXS\ \cite{Bab13}.
+Renamed from Ripple1 in BornAgain 1.18.
+\E{CosineRippleBox} agrees with Ripple1 of \FitGISAXS\ \cite{Bab13}.
%===============================================================================
-\ffsection{Ripple2 (saw-tooth)} \label{SRipple2}
+\ffsection{SawtoothRipple} \label{SSawtoothRipple}
%===============================================================================
-\index{Ripple!saw-tooth}
-\index{Saw-tooth ripple}
-\index{FormFactorRipple2@\Code{FormFactorRipple2Box}}
-\index{FormFactorRipple2Gauss@\Code{FormFactorRipple2Gauss}}
-\index{FormFactorRipple2Lorentz@\Code{FormFactorRipple2Lorentz}}
+\index{Ripple!sawtooth}
+\index{Sawtooth ripple}
+\index{FormFactorSawtoothRipple@\Code{FormFactorSawtoothRippleBox}}
+\index{FormFactorSawtoothRippleGauss@\Code{FormFactorSawtoothRippleGauss}}
+\index{FormFactorSawtoothRippleLorentz@\Code{FormFactorSawtoothRippleLorentz}}
\paragraph{Real-space geometry}\strut\\
\begin{figure}[H]
\hfill
-\subfigure[Perspective]{\includefinal{.24\TW}{fig/blue/Ripple23d.png}}
+\subfigure[Perspective]{\includefinal{.24\TW}{fig/blue/SawtoothRipple3d.png}}
\hfill
-\subfigure[Top view]{\includefinal{.3\TW}{fig/cuts/Ripple22dxy.pdf}}
+\subfigure[Top view]{\includefinal{.3\TW}{fig/cuts/SawtoothRipple2dxy.pdf}}
\hfill
-\subfigure[Side view]{\includefinal{.3\TW}{fig/cuts/Ripple22dyz.pdf}}
+\subfigure[Side view]{\includefinal{.3\TW}{fig/cuts/SawtoothRipple2dyz.pdf}}
\hfill
\caption{A ripple with an asymmetric saw-tooth profile.}
\end{figure}
@@ -2187,11 +2187,11 @@ Agrees with the \E{Ripple1} form factor of \FitGISAXS\ \cite{Bab13}.
\paragraph{Syntax and parameters}\strut\\[-2ex plus .2ex minus .2ex]
\begin{lstlisting}
- FormFactorRipple2Box(
+ FormFactorSawtoothRippleBox(
double length, double width, double height, asymmetry)
- FormFactorRipple2Gauss(
+ FormFactorSawtoothRippleGauss(
double length, double width, double height, asymmetry)
- FormFactorRipple2Lorentz(
+ FormFactorSawtoothRippleLorentz(
double length, double width, double height, asymmetry)
\end{lstlisting}
with the parameters
@@ -2231,7 +2231,7 @@ with $f_\parallel$ defined in~\cref{EFparallel}.
\begin{figure}[H]
\begin{center}
-\includefinal{1\TW}{fig/ff2/ff_Ripple2.pdf}
+\includefinal{1\TW}{fig/ff2/ff_SawtoothRipple.pdf}
\end{center}
\caption{Normalized intensity $|F|^2/V^2$,
computed with $L=25$~nm, $W=10$~nm, $H=8$~nm, and $d=5$~nm,
@@ -2240,7 +2240,8 @@ The low symmetry requires other angular ranges than used in most other figures.}
\end{figure}
\paragraph{History}\strut\\
-Agrees with the \E{Ripple2} form factor of \FitGISAXS\ \cite{Bab13}.
+Renamed from Ripple2 in BornAgain 1.18.
+\E{SawtoothRippleBox} agrees with Ripple2 of \FitGISAXS\ \cite{Bab13}.
\index{Ripple|)}
diff --git a/Doc/FFCatalog/fig/ff2/ff_Ripple1.pdf b/Doc/FFCatalog/fig/ff2/ff_CosineRipple.pdf
similarity index 100%
rename from Doc/FFCatalog/fig/ff2/ff_Ripple1.pdf
rename to Doc/FFCatalog/fig/ff2/ff_CosineRipple.pdf
diff --git a/Doc/FFCatalog/fig/ff2/ff_Ripple2.pdf b/Doc/FFCatalog/fig/ff2/ff_SawtoothRipple.pdf
similarity index 100%
rename from Doc/FFCatalog/fig/ff2/ff_Ripple2.pdf
rename to Doc/FFCatalog/fig/ff2/ff_SawtoothRipple.pdf
diff --git a/Doc/FFCatalog/fig/ff2/sim_Ripple1.py b/Doc/FFCatalog/fig/ff2/sim_CosineRipple.py
similarity index 75%
rename from Doc/FFCatalog/fig/ff2/sim_Ripple1.py
rename to Doc/FFCatalog/fig/ff2/sim_CosineRipple.py
index 1d5c67e79f1a5652e0209f951bbde812adbc936b..885213f9d095ca09386424c553f71eb52237512f 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Ripple1.py
+++ b/Doc/FFCatalog/fig/ff2/sim_CosineRipple.py
@@ -11,9 +11,9 @@ results = []
for i in range(n):
omega=90*i/(n-1)
title = r'$\omega=%d^\circ$' % omega
- ff = ba.FormFactorRipple1(25*nanometer, 10*nanometer, 8*nanometer )
+ ff = ba.FormFactorCosineRipple(25*nanometer, 10*nanometer, 8*nanometer )
trafo = ba.RotationZ(omega*degree)
data = bp.run_simulation(det,ff,trafo)
results.append( bp.Result(i, data, title) )
-bp.make_plot( results, det, "ff_Ripple1" )
+bp.make_plot( results, det, "ff_CosineRipple" )
diff --git a/Doc/FFCatalog/fig/ff2/sim_Ripple2.py b/Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py
similarity index 72%
rename from Doc/FFCatalog/fig/ff2/sim_Ripple2.py
rename to Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py
index e387cbb70ee264aa1e994e0435f21664ec965b2a..c255993694b34b30488afef40c609622275ba043 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Ripple2.py
+++ b/Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py
@@ -11,9 +11,9 @@ results = []
for i in range(n):
omega=90*i/(n-1)
title = r'$\omega=%d^\circ$' % omega
- ff = ba.FormFactorRipple2Box(25*nanometer, 10*nanometer, 8*nanometer, 5*nanometer )
+ ff = ba.FormFactorSawtoothRippleBox(25*nanometer, 10*nanometer, 8*nanometer, 5*nanometer )
trafo = ba.RotationZ(omega*degree)
data = bp.run_simulation(det,ff,trafo)
results.append( bp.Result(i, data, title) )
-bp.make_plot( results, det, "ff_Ripple2" )
+bp.make_plot( results, det, "ff_SawtoothRipple" )
diff --git a/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py b/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py
index a3d2f8b17158d3c73a9aed05aa911a4ad7c188db..d54c5bd692e5613ff721a73cb3933b6cfa998209 100644
--- a/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py
+++ b/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py
@@ -27,8 +27,8 @@ formfactors = [
ba.FormFactorPrism3(10.0, 13.0),
ba.FormFactorPrism6(5.0, 11.0),
ba.FormFactorPyramid(18.0, 13.0, 60.0*deg),
- ba.FormFactorRipple1Box(27.0, 20.0, 14.0),
- ba.FormFactorRipple2Box(36.0, 25.0, 14.0, 3.0),
+ ba.FormFactorCosineRippleBox(27.0, 20.0, 14.0),
+ ba.FormFactorSawtoothRippleBox(36.0, 25.0, 14.0, 3.0),
ba.FormFactorTetrahedron(15.0, 6.0, 60.0*deg),
ba.FormFactorTruncatedCube(15.0, 6.0),
ba.FormFactorTruncatedSphere(5.0, 7.0, 0),
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py
index 0c3e2a7ac37d6cf2bf74231df3086a9a40264cae..ff05c1ca28831215e91e7e0d4211a40adc75bab3 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py
@@ -17,7 +17,7 @@ def get_sample():
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# collection of particles
- ff = ba.FormFactorRipple1Box(100*nm, 20*nm, 4*nm)
+ ff = ba.FormFactorCosineRippleBox(100*nm, 20*nm, 4*nm)
particle = ba.Particle(m_particle, ff)
particle_layout = ba.ParticleLayout()
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py
index 3ba2783f12a023389975018aacc4e783d8555697..b631a3ec9455ff7a0d13a8b037dc52e27a6093f6 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py
@@ -19,7 +19,7 @@ def get_sample():
interference = ba.InterferenceFunction2DLattice.createSquare(
25.0*nm, 30.0*deg)
pdf = ba.FTDecayFunction2DCauchy(300.0*nm/2.0/numpy.pi, 100.0*nm/2.0/numpy.pi, 0)
- pdf.setGamma(30.0*deg)
+ pdf.setParameterValue("Gamma", 30.0*deg)
interference.setDecayFunction(pdf)
cylinder_ff = ba.FormFactorCylinder(3.*nm, 3.*nm)
diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py b/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py
index 8622e0f227f233fcf57b8e344f41a5fb7fec70a3..9bb91dc7bb10a3c48b42d109694372c19442f9c7 100644
--- a/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py
+++ b/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py
@@ -17,7 +17,7 @@ def get_sample():
m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
# collection of particles
- ripple2_ff = ba.FormFactorRipple2Box(
+ ripple2_ff = ba.FormFactorSawtoothRippleBox(
100*nm, 20*nm, 4*nm, -3.0*nm)
ripple = ba.Particle(m_particle, ripple2_ff)
diff --git a/GUI/ba3d/model/geometry/ripple.cpp b/GUI/ba3d/model/geometry/ripple.cpp
index a56164ac3a0a3198ddcdec154730e765109e8442..558e7d5872fe732a61ac515d015f633f92dabab9 100644
--- a/GUI/ba3d/model/geometry/ripple.cpp
+++ b/GUI/ba3d/model/geometry/ripple.cpp
@@ -28,12 +28,12 @@ Geometry::Mesh Geometry::meshRipple(float numSides, float ratio_asymmetry_W)
// Values are chosen such that length, width and height are 1
float const R = .5f;
float const H = 2 * R; // L = W = H = 2*R
- float const asymmetry = ratio_asymmetry_W * 2 * R; // for Ripple1 asymmetry is inherently 0
+ float const asymmetry = ratio_asymmetry_W * 2 * R; // for CosineRipple asymmetry is inherently 0
Vertices vfront(slices), vback(slices);
if (numSides == 3) {
- // Ripple2: saw-tooth (3 rectangular sides and 2 triangular front and back)
+ // SawtoothRipple: saw-tooth (3 rectangular sides and 2 triangular front and back)
vfront[0] = Vector3D(-R, -R, 0);
vfront[1] = Vector3D(-R, asymmetry, H);
vfront[2] = Vector3D(-R, R, 0);
@@ -42,7 +42,7 @@ Geometry::Mesh Geometry::meshRipple(float numSides, float ratio_asymmetry_W)
vback[1] = Vector3D(R, asymmetry, H);
vback[2] = Vector3D(R, R, 0);
} else if (numSides == 0) {
- // Ripple1: cosine ripple
+ // CosineRipple: cosine ripple
for (int s = 0; s < slices; ++s) {
float th = static_cast<float>(M_PI * s / (slices + 1));
float y = -R * cosf(th);
diff --git a/GUI/ba3d/model/model.cpp b/GUI/ba3d/model/model.cpp
index 76d4d581703d36542590acc5bda80496debbf6f4..13da41a07616254cf339f01e67f6d2008ff68d68 100644
--- a/GUI/ba3d/model/model.cpp
+++ b/GUI/ba3d/model/model.cpp
@@ -99,18 +99,18 @@ Particles::Particle* Model::newParticle(Particles::EShape k, float R)
return new HemiEllipsoid(R, R, D);
case EShape::Dot:
return new Dot();
- case EShape::Ripple1Box:
- return new Ripple1Box(D, D, D); // TODO ripples should be elongated
- case EShape::Ripple1Gauss:
- return new Ripple1Gauss(D, D, D); // TODO ripples should be elongated
- case EShape::Ripple1Lorentz:
- return new Ripple1Lorentz(D, D, D); // TODO ripples should be elongated
- case EShape::Ripple2Box:
- return new Ripple2Box(D, D, D); // TODO ripples should be elongated
- case EShape::Ripple2Gauss:
- return new Ripple2Gauss(D, D, D); // TODO ripples should be elongated
- case EShape::Ripple2Lorentz:
- return new Ripple2Lorentz(D, D, D); // TODO ripples should be elongated
+ case EShape::CosineRippleBox:
+ return new CosineRippleBox(D, D, D); // TODO ripples should be elongated
+ case EShape::CosineRippleGauss:
+ return new CosineRippleGauss(D, D, D); // TODO ripples should be elongated
+ case EShape::CosineRippleLorentz:
+ return new CosineRippleLorentz(D, D, D); // TODO ripples should be elongated
+ case EShape::SawtoothRippleBox:
+ return new SawtoothRippleBox(D, D, D); // TODO ripples should be elongated
+ case EShape::SawtoothRippleGauss:
+ return new SawtoothRippleGauss(D, D, D); // TODO ripples should be elongated
+ case EShape::SawtoothRippleLorentz:
+ return new SawtoothRippleLorentz(D, D, D); // TODO ripples should be elongated
case EShape::AnisoPyramid:
return new AnisoPyramid(R, D, D, 1.3f);
}
diff --git a/GUI/ba3d/model/particles.cpp b/GUI/ba3d/model/particles.cpp
index 16af6813542c55cf3ca837e0d9360a28c254c330..80733fcde1c7c2a8a2f72a058899adc9fb723a68 100644
--- a/GUI/ba3d/model/particles.cpp
+++ b/GUI/ba3d/model/particles.cpp
@@ -45,12 +45,12 @@ QString const& name(EShape k)
"Box",
"HemiEllipsoid",
"Dot",
- "Ripple1Box",
- "Ripple1Gauss",
- "Ripple1Lorentz",
- "Ripple2Box",
- "Ripple2Gauss",
- "Ripple2Lorentz",
+ "CosineRippleBox",
+ "CosineRippleGauss",
+ "CosineRippleLorentz",
+ "SawtoothRippleBox",
+ "SawtoothRippleGauss",
+ "SawtoothRippleLorentz",
"AnisoPyramid",
};
return names[uint(k)];
@@ -263,7 +263,7 @@ Pyramid::Pyramid(float L, float H, float alpha)
set();
}
-Ripple1Box::Ripple1Box(float L, float W, float H) : Particle(Key(BaseShape::Ripple, 0, 0))
+CosineRippleBox::CosineRippleBox(float L, float W, float H) : Particle(Key(BaseShape::Ripple, 0, 0))
{
isNull = (L < 0 || W < 0 || H < 0) || (L <= 0 && W <= 0 && H <= 0);
turn = Vector3D(0, 0, 0);
@@ -272,7 +272,8 @@ Ripple1Box::Ripple1Box(float L, float W, float H) : Particle(Key(BaseShape::Ripp
set();
}
-Ripple1Gauss::Ripple1Gauss(float L, float W, float H) : Particle(Key(BaseShape::Ripple, 0, 0))
+CosineRippleGauss::CosineRippleGauss(float L, float W, float H)
+ : Particle(Key(BaseShape::Ripple, 0, 0))
{
isNull = (L < 0 || W < 0 || H < 0) || (L <= 0 && W <= 0 && H <= 0);
turn = Vector3D(0, 0, 0);
@@ -281,7 +282,8 @@ Ripple1Gauss::Ripple1Gauss(float L, float W, float H) : Particle(Key(BaseShape::
set();
}
-Ripple1Lorentz::Ripple1Lorentz(float L, float W, float H) : Particle(Key(BaseShape::Ripple, 0, 0))
+CosineRippleLorentz::CosineRippleLorentz(float L, float W, float H)
+ : Particle(Key(BaseShape::Ripple, 0, 0))
{
isNull = (L < 0 || W < 0 || H < 0) || (L <= 0 && W <= 0 && H <= 0);
turn = Vector3D(0, 0, 0);
@@ -290,7 +292,8 @@ Ripple1Lorentz::Ripple1Lorentz(float L, float W, float H) : Particle(Key(BaseSha
set();
}
-Ripple2Box::Ripple2Box(float L, float W, float H) : Particle(Key(BaseShape::Ripple, 0, 0))
+SawtoothRippleBox::SawtoothRippleBox(float L, float W, float H)
+ : Particle(Key(BaseShape::Ripple, 0, 0))
{
isNull = (L < 0 || W < 0 || H < 0) || (L <= 0 && W <= 0 && H <= 0);
turn = Vector3D(0, 0, 0);
@@ -299,7 +302,8 @@ Ripple2Box::Ripple2Box(float L, float W, float H) : Particle(Key(BaseShape::Ripp
set();
}
-Ripple2Gauss::Ripple2Gauss(float L, float W, float H) : Particle(Key(BaseShape::Ripple, 0, 0))
+SawtoothRippleGauss::SawtoothRippleGauss(float L, float W, float H)
+ : Particle(Key(BaseShape::Ripple, 0, 0))
{
isNull = (L < 0 || W < 0 || H < 0) || (L <= 0 && W <= 0 && H <= 0);
turn = Vector3D(0, 0, 0);
@@ -308,7 +312,8 @@ Ripple2Gauss::Ripple2Gauss(float L, float W, float H) : Particle(Key(BaseShape::
set();
}
-Ripple2Lorentz::Ripple2Lorentz(float L, float W, float H) : Particle(Key(BaseShape::Ripple, 0, 0))
+SawtoothRippleLorentz::SawtoothRippleLorentz(float L, float W, float H)
+ : Particle(Key(BaseShape::Ripple, 0, 0))
{
isNull = (L < 0 || W < 0 || H < 0) || (L <= 0 && W <= 0 && H <= 0);
turn = Vector3D(0, 0, 0);
diff --git a/GUI/ba3d/model/particles.h b/GUI/ba3d/model/particles.h
index dcb0c5e6f635ab4dbd56a483c0f97d73a36d7d36..d46ffd4171844465476da27354a6c46eb0b54f16 100644
--- a/GUI/ba3d/model/particles.h
+++ b/GUI/ba3d/model/particles.h
@@ -45,12 +45,12 @@ enum class EShape {
Box,
HemiEllipsoid,
Dot,
- Ripple1Box,
- Ripple1Gauss,
- Ripple1Lorentz,
- Ripple2Box,
- Ripple2Gauss,
- Ripple2Lorentz,
+ CosineRippleBox,
+ CosineRippleGauss,
+ CosineRippleLorentz,
+ SawtoothRippleBox,
+ SawtoothRippleGauss,
+ SawtoothRippleLorentz,
AnisoPyramid,
};
@@ -210,46 +210,46 @@ public:
HemiEllipsoid(float Ra, float Rb, float H);
};
-class Ripple1Box : public Particle
+class CosineRippleBox : public Particle
{
public:
- Ripple1Box(float L, float W, float H);
+ CosineRippleBox(float L, float W, float H);
};
-class Ripple1Gauss : public Particle
+class CosineRippleGauss : public Particle
{
public:
- Ripple1Gauss(float L, float W, float H);
+ CosineRippleGauss(float L, float W, float H);
};
-class Ripple1Lorentz : public Particle
+class CosineRippleLorentz : public Particle
{
public:
- Ripple1Lorentz(float L, float W, float H);
+ CosineRippleLorentz(float L, float W, float H);
};
-class Ripple2Box : public Particle
+class SawtoothRippleBox : public Particle
{
public:
- Ripple2Box(float L, float W, float H);
+ SawtoothRippleBox(float L, float W, float H);
};
-class Ripple2Gauss : public Particle
+class SawtoothRippleGauss : public Particle
{
public:
- Ripple2Gauss(float L, float W, float H);
+ SawtoothRippleGauss(float L, float W, float H);
};
-class Ripple2Lorentz : public Particle
+class SawtoothRippleLorentz : public Particle
{
public:
- Ripple2Lorentz(float L, float W, float H);
+ SawtoothRippleLorentz(float L, float W, float H);
};
-class Ripple2 : public Particle
+class SawtoothRipple : public Particle
{
public:
- Ripple2(float L, float W, float H, float asymmetry);
+ SawtoothRipple(float L, float W, float H, float asymmetry);
};
class AnisoPyramid : public Particle
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/coregui/Models/FormFactorItems.cpp
index a98dc302c5698ca4ba5c3d17e946503a42c3352f..b458f23d44c36ff24cccb187d375c5ee2d3a39d7 100644
--- a/GUI/coregui/Models/FormFactorItems.cpp
+++ b/GUI/coregui/Models/FormFactorItems.cpp
@@ -373,11 +373,11 @@ std::unique_ptr<IFormFactor> PyramidItem::createFormFactor() const
/* ------------------------------------------------ */
-const QString Ripple1BoxItem::P_LENGTH("Length");
-const QString Ripple1BoxItem::P_WIDTH("Width");
-const QString Ripple1BoxItem::P_HEIGHT("Height");
+const QString CosineRippleBoxItem::P_LENGTH("Length");
+const QString CosineRippleBoxItem::P_WIDTH("Width");
+const QString CosineRippleBoxItem::P_HEIGHT("Height");
-Ripple1BoxItem::Ripple1BoxItem() : FormFactorItem("Ripple1Box")
+CosineRippleBoxItem::CosineRippleBoxItem() : FormFactorItem("CosineRippleBox")
{
setToolTip("Particle with a cosine profile and a rectangular base");
addProperty(P_LENGTH, 27.0)->setToolTip("Length of the rectangular base in nanometers");
@@ -385,20 +385,20 @@ Ripple1BoxItem::Ripple1BoxItem() : FormFactorItem("Ripple1Box")
addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers");
}
-std::unique_ptr<IFormFactor> Ripple1BoxItem::createFormFactor() const
+std::unique_ptr<IFormFactor> CosineRippleBoxItem::createFormFactor() const
{
- return std::make_unique<FormFactorRipple1Box>(getItemValue(P_LENGTH).toDouble(),
- getItemValue(P_WIDTH).toDouble(),
- getItemValue(P_HEIGHT).toDouble());
+ return std::make_unique<FormFactorCosineRippleBox>(getItemValue(P_LENGTH).toDouble(),
+ getItemValue(P_WIDTH).toDouble(),
+ getItemValue(P_HEIGHT).toDouble());
}
/* ------------------------------------------------ */
-const QString Ripple1GaussItem::P_LENGTH("Length");
-const QString Ripple1GaussItem::P_WIDTH("Width");
-const QString Ripple1GaussItem::P_HEIGHT("Height");
+const QString CosineRippleGaussItem::P_LENGTH("Length");
+const QString CosineRippleGaussItem::P_WIDTH("Width");
+const QString CosineRippleGaussItem::P_HEIGHT("Height");
-Ripple1GaussItem::Ripple1GaussItem() : FormFactorItem("Ripple1Gauss")
+CosineRippleGaussItem::CosineRippleGaussItem() : FormFactorItem("CosineRippleGauss")
{
setToolTip("Particle with a cosine profile and a rectangular base");
addProperty(P_LENGTH, 27.0)->setToolTip("Length of the rectangular base in nanometers");
@@ -406,20 +406,20 @@ Ripple1GaussItem::Ripple1GaussItem() : FormFactorItem("Ripple1Gauss")
addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers");
}
-std::unique_ptr<IFormFactor> Ripple1GaussItem::createFormFactor() const
+std::unique_ptr<IFormFactor> CosineRippleGaussItem::createFormFactor() const
{
- return std::make_unique<FormFactorRipple1Gauss>(getItemValue(P_LENGTH).toDouble(),
- getItemValue(P_WIDTH).toDouble(),
- getItemValue(P_HEIGHT).toDouble());
+ return std::make_unique<FormFactorCosineRippleGauss>(getItemValue(P_LENGTH).toDouble(),
+ getItemValue(P_WIDTH).toDouble(),
+ getItemValue(P_HEIGHT).toDouble());
}
/* ------------------------------------------------ */
-const QString Ripple1LorentzItem::P_LENGTH("Length");
-const QString Ripple1LorentzItem::P_WIDTH("Width");
-const QString Ripple1LorentzItem::P_HEIGHT("Height");
+const QString CosineRippleLorentzItem::P_LENGTH("Length");
+const QString CosineRippleLorentzItem::P_WIDTH("Width");
+const QString CosineRippleLorentzItem::P_HEIGHT("Height");
-Ripple1LorentzItem::Ripple1LorentzItem() : FormFactorItem("Ripple1Lorentz")
+CosineRippleLorentzItem::CosineRippleLorentzItem() : FormFactorItem("CosineRippleLorentz")
{
setToolTip("Particle with a cosine profile and a rectangular base");
addProperty(P_LENGTH, 27.0)->setToolTip("Length of the rectangular base in nanometers");
@@ -427,21 +427,21 @@ Ripple1LorentzItem::Ripple1LorentzItem() : FormFactorItem("Ripple1Lorentz")
addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers");
}
-std::unique_ptr<IFormFactor> Ripple1LorentzItem::createFormFactor() const
+std::unique_ptr<IFormFactor> CosineRippleLorentzItem::createFormFactor() const
{
- return std::make_unique<FormFactorRipple1Lorentz>(getItemValue(P_LENGTH).toDouble(),
- getItemValue(P_WIDTH).toDouble(),
- getItemValue(P_HEIGHT).toDouble());
+ return std::make_unique<FormFactorCosineRippleLorentz>(getItemValue(P_LENGTH).toDouble(),
+ getItemValue(P_WIDTH).toDouble(),
+ getItemValue(P_HEIGHT).toDouble());
}
/* ------------------------------------------------ */
-const QString Ripple2BoxItem::P_LENGTH("Length");
-const QString Ripple2BoxItem::P_WIDTH("Width");
-const QString Ripple2BoxItem::P_HEIGHT("Height");
-const QString Ripple2BoxItem::P_ASYMMETRY("AsymmetryLength");
+const QString SawtoothRippleBoxItem::P_LENGTH("Length");
+const QString SawtoothRippleBoxItem::P_WIDTH("Width");
+const QString SawtoothRippleBoxItem::P_HEIGHT("Height");
+const QString SawtoothRippleBoxItem::P_ASYMMETRY("AsymmetryLength");
-Ripple2BoxItem::Ripple2BoxItem() : FormFactorItem("Ripple2Box")
+SawtoothRippleBoxItem::SawtoothRippleBoxItem() : FormFactorItem("SawtoothRippleBox")
{
setToolTip("Particle with an asymmetric triangle profile and a rectangular base");
addProperty(P_LENGTH, 36.0)->setToolTip("Length of the rectangular base in nanometers");
@@ -451,21 +451,21 @@ Ripple2BoxItem::Ripple2BoxItem() : FormFactorItem("Ripple2Box")
->setToolTip("Asymmetry length of the triangular profile in nanometers");
}
-std::unique_ptr<IFormFactor> Ripple2BoxItem::createFormFactor() const
+std::unique_ptr<IFormFactor> SawtoothRippleBoxItem::createFormFactor() const
{
- return std::make_unique<FormFactorRipple2Box>(
+ return std::make_unique<FormFactorSawtoothRippleBox>(
getItemValue(P_LENGTH).toDouble(), getItemValue(P_WIDTH).toDouble(),
getItemValue(P_HEIGHT).toDouble(), getItemValue(P_ASYMMETRY).toDouble());
}
/* ------------------------------------------------ */
-const QString Ripple2GaussItem::P_LENGTH("Length");
-const QString Ripple2GaussItem::P_WIDTH("Width");
-const QString Ripple2GaussItem::P_HEIGHT("Height");
-const QString Ripple2GaussItem::P_ASYMMETRY("AsymmetryLength");
+const QString SawtoothRippleGaussItem::P_LENGTH("Length");
+const QString SawtoothRippleGaussItem::P_WIDTH("Width");
+const QString SawtoothRippleGaussItem::P_HEIGHT("Height");
+const QString SawtoothRippleGaussItem::P_ASYMMETRY("AsymmetryLength");
-Ripple2GaussItem::Ripple2GaussItem() : FormFactorItem("Ripple2Gauss")
+SawtoothRippleGaussItem::SawtoothRippleGaussItem() : FormFactorItem("SawtoothRippleGauss")
{
setToolTip("Particle with an asymmetric triangle profile and a rectangular base");
addProperty(P_LENGTH, 36.0)->setToolTip("Length of the rectangular base in nanometers");
@@ -475,21 +475,21 @@ Ripple2GaussItem::Ripple2GaussItem() : FormFactorItem("Ripple2Gauss")
->setToolTip("Asymmetry length of the triangular profile in nanometers");
}
-std::unique_ptr<IFormFactor> Ripple2GaussItem::createFormFactor() const
+std::unique_ptr<IFormFactor> SawtoothRippleGaussItem::createFormFactor() const
{
- return std::make_unique<FormFactorRipple2Gauss>(
+ return std::make_unique<FormFactorSawtoothRippleGauss>(
getItemValue(P_LENGTH).toDouble(), getItemValue(P_WIDTH).toDouble(),
getItemValue(P_HEIGHT).toDouble(), getItemValue(P_ASYMMETRY).toDouble());
}
/* ------------------------------------------------ */
-const QString Ripple2LorentzItem::P_LENGTH("Length");
-const QString Ripple2LorentzItem::P_WIDTH("Width");
-const QString Ripple2LorentzItem::P_HEIGHT("Height");
-const QString Ripple2LorentzItem::P_ASYMMETRY("AsymmetryLength");
+const QString SawtoothRippleLorentzItem::P_LENGTH("Length");
+const QString SawtoothRippleLorentzItem::P_WIDTH("Width");
+const QString SawtoothRippleLorentzItem::P_HEIGHT("Height");
+const QString SawtoothRippleLorentzItem::P_ASYMMETRY("AsymmetryLength");
-Ripple2LorentzItem::Ripple2LorentzItem() : FormFactorItem("Ripple2Lorentz")
+SawtoothRippleLorentzItem::SawtoothRippleLorentzItem() : FormFactorItem("SawtoothRippleLorentz")
{
setToolTip("Particle with an asymmetric triangle profile and a rectangular base");
addProperty(P_LENGTH, 36.0)->setToolTip("Length of the rectangular base in nanometers");
@@ -499,9 +499,9 @@ Ripple2LorentzItem::Ripple2LorentzItem() : FormFactorItem("Ripple2Lorentz")
->setToolTip("Asymmetry length of the triangular profile in nanometers");
}
-std::unique_ptr<IFormFactor> Ripple2LorentzItem::createFormFactor() const
+std::unique_ptr<IFormFactor> SawtoothRippleLorentzItem::createFormFactor() const
{
- return std::make_unique<FormFactorRipple2Lorentz>(
+ return std::make_unique<FormFactorSawtoothRippleLorentz>(
getItemValue(P_LENGTH).toDouble(), getItemValue(P_WIDTH).toDouble(),
getItemValue(P_HEIGHT).toDouble(), getItemValue(P_ASYMMETRY).toDouble());
}
diff --git a/GUI/coregui/Models/FormFactorItems.h b/GUI/coregui/Models/FormFactorItems.h
index 359b4cdeeb07935872b6d461fb4126607e8563f5..11adccb0a55f425d67749e3eb5cf11756f5fb9c4 100644
--- a/GUI/coregui/Models/FormFactorItems.h
+++ b/GUI/coregui/Models/FormFactorItems.h
@@ -196,66 +196,66 @@ public:
std::unique_ptr<IFormFactor> createFormFactor() const;
};
-class BA_CORE_API_ Ripple1BoxItem : public FormFactorItem
+class BA_CORE_API_ CosineRippleBoxItem : public FormFactorItem
{
public:
static const QString P_LENGTH;
static const QString P_WIDTH;
static const QString P_HEIGHT;
- Ripple1BoxItem();
+ CosineRippleBoxItem();
std::unique_ptr<IFormFactor> createFormFactor() const;
};
-class BA_CORE_API_ Ripple1GaussItem : public FormFactorItem
+class BA_CORE_API_ CosineRippleGaussItem : public FormFactorItem
{
public:
static const QString P_LENGTH;
static const QString P_WIDTH;
static const QString P_HEIGHT;
- Ripple1GaussItem();
+ CosineRippleGaussItem();
std::unique_ptr<IFormFactor> createFormFactor() const;
};
-class BA_CORE_API_ Ripple1LorentzItem : public FormFactorItem
+class BA_CORE_API_ CosineRippleLorentzItem : public FormFactorItem
{
public:
static const QString P_LENGTH;
static const QString P_WIDTH;
static const QString P_HEIGHT;
- Ripple1LorentzItem();
+ CosineRippleLorentzItem();
std::unique_ptr<IFormFactor> createFormFactor() const;
};
-class BA_CORE_API_ Ripple2BoxItem : public FormFactorItem
+class BA_CORE_API_ SawtoothRippleBoxItem : public FormFactorItem
{
public:
static const QString P_LENGTH;
static const QString P_WIDTH;
static const QString P_HEIGHT;
static const QString P_ASYMMETRY;
- Ripple2BoxItem();
+ SawtoothRippleBoxItem();
std::unique_ptr<IFormFactor> createFormFactor() const;
};
-class BA_CORE_API_ Ripple2GaussItem : public FormFactorItem
+class BA_CORE_API_ SawtoothRippleGaussItem : public FormFactorItem
{
public:
static const QString P_LENGTH;
static const QString P_WIDTH;
static const QString P_HEIGHT;
static const QString P_ASYMMETRY;
- Ripple2GaussItem();
+ SawtoothRippleGaussItem();
std::unique_ptr<IFormFactor> createFormFactor() const;
};
-class BA_CORE_API_ Ripple2LorentzItem : public FormFactorItem
+class BA_CORE_API_ SawtoothRippleLorentzItem : public FormFactorItem
{
public:
static const QString P_LENGTH;
static const QString P_WIDTH;
static const QString P_HEIGHT;
static const QString P_ASYMMETRY;
- Ripple2LorentzItem();
+ SawtoothRippleLorentzItem();
std::unique_ptr<IFormFactor> createFormFactor() const;
};
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
index 9780f1d6539137ebe790a40f74ae2346b6a84fe2..348b65fd5bb3dd96d623965aabc342e3e5166336 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.cpp
@@ -352,66 +352,66 @@ void GUIDomainSampleVisitor::visit(const FormFactorPyramid* p_sample)
m_levelToParentItem[depth()] = p_particle_item;
}
-void GUIDomainSampleVisitor::visit(const FormFactorRipple1Box* p_sample)
+void GUIDomainSampleVisitor::visit(const FormFactorCosineRippleBox* p_sample)
{
SessionItem* p_particle_item = m_levelToParentItem[depth() - 1];
- SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "Ripple1Box");
- p_ff_item->setItemValue(Ripple1BoxItem::P_LENGTH, p_sample->getLength());
- p_ff_item->setItemValue(Ripple1BoxItem::P_WIDTH, p_sample->getWidth());
- p_ff_item->setItemValue(Ripple1BoxItem::P_HEIGHT, p_sample->getHeight());
+ SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "CosineRippleBox");
+ p_ff_item->setItemValue(CosineRippleBoxItem::P_LENGTH, p_sample->getLength());
+ p_ff_item->setItemValue(CosineRippleBoxItem::P_WIDTH, p_sample->getWidth());
+ p_ff_item->setItemValue(CosineRippleBoxItem::P_HEIGHT, p_sample->getHeight());
m_levelToParentItem[depth()] = p_particle_item;
}
-void GUIDomainSampleVisitor::visit(const FormFactorRipple1Gauss* p_sample)
+void GUIDomainSampleVisitor::visit(const FormFactorCosineRippleGauss* p_sample)
{
SessionItem* p_particle_item = m_levelToParentItem[depth() - 1];
- SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "Ripple1Gauss");
- p_ff_item->setItemValue(Ripple1GaussItem::P_LENGTH, p_sample->getLength());
- p_ff_item->setItemValue(Ripple1GaussItem::P_WIDTH, p_sample->getWidth());
- p_ff_item->setItemValue(Ripple1GaussItem::P_HEIGHT, p_sample->getHeight());
+ SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "CosineRippleGauss");
+ p_ff_item->setItemValue(CosineRippleGaussItem::P_LENGTH, p_sample->getLength());
+ p_ff_item->setItemValue(CosineRippleGaussItem::P_WIDTH, p_sample->getWidth());
+ p_ff_item->setItemValue(CosineRippleGaussItem::P_HEIGHT, p_sample->getHeight());
m_levelToParentItem[depth()] = p_particle_item;
}
-void GUIDomainSampleVisitor::visit(const FormFactorRipple1Lorentz* p_sample)
+void GUIDomainSampleVisitor::visit(const FormFactorCosineRippleLorentz* p_sample)
{
SessionItem* p_particle_item = m_levelToParentItem[depth() - 1];
- SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "Ripple1Lorentz");
- p_ff_item->setItemValue(Ripple1LorentzItem::P_LENGTH, p_sample->getLength());
- p_ff_item->setItemValue(Ripple1LorentzItem::P_WIDTH, p_sample->getWidth());
- p_ff_item->setItemValue(Ripple1LorentzItem::P_HEIGHT, p_sample->getHeight());
+ SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "CosineRippleLorentz");
+ p_ff_item->setItemValue(CosineRippleLorentzItem::P_LENGTH, p_sample->getLength());
+ p_ff_item->setItemValue(CosineRippleLorentzItem::P_WIDTH, p_sample->getWidth());
+ p_ff_item->setItemValue(CosineRippleLorentzItem::P_HEIGHT, p_sample->getHeight());
m_levelToParentItem[depth()] = p_particle_item;
}
-void GUIDomainSampleVisitor::visit(const FormFactorRipple2Box* p_sample)
+void GUIDomainSampleVisitor::visit(const FormFactorSawtoothRippleBox* p_sample)
{
SessionItem* p_particle_item = m_levelToParentItem[depth() - 1];
- SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "Ripple2Box");
- p_ff_item->setItemValue(Ripple2BoxItem::P_LENGTH, p_sample->getLength());
- p_ff_item->setItemValue(Ripple2BoxItem::P_WIDTH, p_sample->getWidth());
- p_ff_item->setItemValue(Ripple2BoxItem::P_HEIGHT, p_sample->getHeight());
- p_ff_item->setItemValue(Ripple2BoxItem::P_ASYMMETRY, p_sample->getAsymmetry());
+ SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "SawtoothRippleBox");
+ p_ff_item->setItemValue(SawtoothRippleBoxItem::P_LENGTH, p_sample->getLength());
+ p_ff_item->setItemValue(SawtoothRippleBoxItem::P_WIDTH, p_sample->getWidth());
+ p_ff_item->setItemValue(SawtoothRippleBoxItem::P_HEIGHT, p_sample->getHeight());
+ p_ff_item->setItemValue(SawtoothRippleBoxItem::P_ASYMMETRY, p_sample->getAsymmetry());
m_levelToParentItem[depth()] = p_particle_item;
}
-void GUIDomainSampleVisitor::visit(const FormFactorRipple2Gauss* p_sample)
+void GUIDomainSampleVisitor::visit(const FormFactorSawtoothRippleGauss* p_sample)
{
SessionItem* p_particle_item = m_levelToParentItem[depth() - 1];
- SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "Ripple2Gauss");
- p_ff_item->setItemValue(Ripple2GaussItem::P_LENGTH, p_sample->getLength());
- p_ff_item->setItemValue(Ripple2GaussItem::P_WIDTH, p_sample->getWidth());
- p_ff_item->setItemValue(Ripple2GaussItem::P_HEIGHT, p_sample->getHeight());
- p_ff_item->setItemValue(Ripple2GaussItem::P_ASYMMETRY, p_sample->getAsymmetry());
+ SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "SawtoothRippleGauss");
+ p_ff_item->setItemValue(SawtoothRippleGaussItem::P_LENGTH, p_sample->getLength());
+ p_ff_item->setItemValue(SawtoothRippleGaussItem::P_WIDTH, p_sample->getWidth());
+ p_ff_item->setItemValue(SawtoothRippleGaussItem::P_HEIGHT, p_sample->getHeight());
+ p_ff_item->setItemValue(SawtoothRippleGaussItem::P_ASYMMETRY, p_sample->getAsymmetry());
m_levelToParentItem[depth()] = p_particle_item;
}
-void GUIDomainSampleVisitor::visit(const FormFactorRipple2Lorentz* p_sample)
+void GUIDomainSampleVisitor::visit(const FormFactorSawtoothRippleLorentz* p_sample)
{
SessionItem* p_particle_item = m_levelToParentItem[depth() - 1];
- SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "Ripple2Lorentz");
- p_ff_item->setItemValue(Ripple2LorentzItem::P_LENGTH, p_sample->getLength());
- p_ff_item->setItemValue(Ripple2LorentzItem::P_WIDTH, p_sample->getWidth());
- p_ff_item->setItemValue(Ripple2LorentzItem::P_HEIGHT, p_sample->getHeight());
- p_ff_item->setItemValue(Ripple2LorentzItem::P_ASYMMETRY, p_sample->getAsymmetry());
+ SessionItem* p_ff_item = AddFormFactorItem(p_particle_item, "SawtoothRippleLorentz");
+ p_ff_item->setItemValue(SawtoothRippleLorentzItem::P_LENGTH, p_sample->getLength());
+ p_ff_item->setItemValue(SawtoothRippleLorentzItem::P_WIDTH, p_sample->getWidth());
+ p_ff_item->setItemValue(SawtoothRippleLorentzItem::P_HEIGHT, p_sample->getHeight());
+ p_ff_item->setItemValue(SawtoothRippleLorentzItem::P_ASYMMETRY, p_sample->getAsymmetry());
m_levelToParentItem[depth()] = p_particle_item;
}
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.h b/GUI/coregui/Models/GUIDomainSampleVisitor.h
index 80c2b23c306919cd14f6b1be61ab7ac002961247..13156e0114738087ac8e7853fd004000281b3e7c 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.h
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.h
@@ -70,12 +70,12 @@ public:
void visit(const FormFactorPrism3*);
void visit(const FormFactorPrism6*);
void visit(const FormFactorPyramid*);
- void visit(const FormFactorRipple1Box*);
- void visit(const FormFactorRipple1Gauss*);
- void visit(const FormFactorRipple1Lorentz*);
- void visit(const FormFactorRipple2Box*);
- void visit(const FormFactorRipple2Gauss*);
- void visit(const FormFactorRipple2Lorentz*);
+ void visit(const FormFactorCosineRippleBox*);
+ void visit(const FormFactorCosineRippleGauss*);
+ void visit(const FormFactorCosineRippleLorentz*);
+ void visit(const FormFactorSawtoothRippleBox*);
+ void visit(const FormFactorSawtoothRippleGauss*);
+ void visit(const FormFactorSawtoothRippleLorentz*);
void visit(const FormFactorTetrahedron*);
void visit(const FormFactorDot*);
void visit(const FormFactorTruncatedCube*);
diff --git a/GUI/coregui/Models/GroupInfoCatalog.cpp b/GUI/coregui/Models/GroupInfoCatalog.cpp
index ccc4f4373b1d57407e47f278d8e337cd3dd51029..7a4607eeb7ed91a985ff29f837b9169d053797b1 100644
--- a/GUI/coregui/Models/GroupInfoCatalog.cpp
+++ b/GUI/coregui/Models/GroupInfoCatalog.cpp
@@ -36,12 +36,12 @@ GroupInfoCatalog::GroupInfoCatalog()
info.add("Prism3", "Prism3");
info.add("Prism6", "Prism6");
info.add("Pyramid", "Pyramid");
- info.add("Ripple1Box", "Ripple1Box");
- info.add("Ripple1Gauss", "Ripple1Gauss");
- info.add("Ripple1Lorentz", "Ripple1Lorentz");
- info.add("Ripple2Box", "Ripple2Box");
- info.add("Ripple2Gauss", "Ripple2Gauss");
- info.add("Ripple2Lorentz", "Ripple2Lorentz");
+ info.add("CosineRippleBox", "CosineRippleBox");
+ info.add("CosineRippleGauss", "CosineRippleGauss");
+ info.add("CosineRippleLorentz", "CosineRippleLorentz");
+ info.add("SawtoothRippleBox", "SawtoothRippleBox");
+ info.add("SawtoothRippleGauss", "SawtoothRippleGauss");
+ info.add("SawtoothRippleLorentz", "SawtoothRippleLorentz");
info.add("Tetrahedron", "Tetrahedron");
info.add("TruncatedCube", "Truncated Cube");
info.add("TruncatedSphere", "Truncated Sphere");
diff --git a/GUI/coregui/Models/ItemCatalog.cpp b/GUI/coregui/Models/ItemCatalog.cpp
index 11d89e351887d8702d082db6039d575aba202dfe..945c556d1d6586b8f9c7cbf9366e9ffc1a675b47 100644
--- a/GUI/coregui/Models/ItemCatalog.cpp
+++ b/GUI/coregui/Models/ItemCatalog.cpp
@@ -115,12 +115,12 @@ ItemCatalog::ItemCatalog()
add("Prism3", create_new<Prism3Item>);
add("Prism6", create_new<Prism6Item>);
add("Pyramid", create_new<PyramidItem>);
- add("Ripple1Box", create_new<Ripple1BoxItem>);
- add("Ripple1Gauss", create_new<Ripple1GaussItem>);
- add("Ripple1Lorentz", create_new<Ripple1LorentzItem>);
- add("Ripple2Box", create_new<Ripple2BoxItem>);
- add("Ripple2Gauss", create_new<Ripple2GaussItem>);
- add("Ripple2Lorentz", create_new<Ripple2LorentzItem>);
+ add("CosineRippleBox", create_new<CosineRippleBoxItem>);
+ add("CosineRippleGauss", create_new<CosineRippleGaussItem>);
+ add("CosineRippleLorentz", create_new<CosineRippleLorentzItem>);
+ add("SawtoothRippleBox", create_new<SawtoothRippleBoxItem>);
+ add("SawtoothRippleGauss", create_new<SawtoothRippleGaussItem>);
+ add("SawtoothRippleLorentz", create_new<SawtoothRippleLorentzItem>);
add("Tetrahedron", create_new<TetrahedronItem>);
add("TruncatedCube", create_new<TruncatedCubeItem>);
add("TruncatedSphere", create_new<TruncatedSphereItem>);
diff --git a/GUI/coregui/Models/ModelMapper.cpp b/GUI/coregui/Models/ModelMapper.cpp
index 82f2519da51a301b2aef0754c95d3e1bfd215282..0021ef25161b3f8923e3363d80ca059a85084338 100644
--- a/GUI/coregui/Models/ModelMapper.cpp
+++ b/GUI/coregui/Models/ModelMapper.cpp
@@ -34,10 +34,7 @@ void ModelMapper::setOnValueChange(std::function<void(void)> f, const void* call
void ModelMapper::setOnPropertyChange(std::function<void(QString)> f, const void* caller)
{
- auto ff = [=](SessionItem* item, const QString& property) {
- (void)item;
- f(property);
- };
+ auto ff = [=](SessionItem* /*item*/, const QString& property) { f(property); };
m_onPropertyChange.push_back(call_item_str_t(ff, caller));
}
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
index f61d5b1243a888a418e4cd7b302d0eac9f3297b4..be67cebf8d62bf8f54967e8350b926321bdadfce 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
@@ -255,40 +255,40 @@ bool isPositionInsideMesoCrystal(const IFormFactor* outerShape, kvector_t positi
if (std::abs(positionInside.x()) <= l_z && std::abs(positionInside.y()) <= l_z
&& (positionInside.z() >= 0 && positionInside.z() <= H))
check = true;
- } else if (dynamic_cast<const FormFactorRipple1Box*>(outerShape)) {
- // TODO: Implement Ripple1Box
+ } else if (dynamic_cast<const FormFactorCosineRippleBox*>(outerShape)) {
+ // TODO: Implement CosineRippleBox
std::ostringstream ostr;
- ostr << "Sorry, outer shape Ripple1Box not yet implemented for Mesocrystal";
+ ostr << "Sorry, outer shape CosineRippleBox not yet implemented for Mesocrystal";
ostr << "\n\nStay tuned!";
throw Exceptions::ClassInitializationException(ostr.str());
- } else if (dynamic_cast<const FormFactorRipple1Gauss*>(outerShape)) {
- // TODO: Implement Ripple1Gauss
+ } else if (dynamic_cast<const FormFactorCosineRippleGauss*>(outerShape)) {
+ // TODO: Implement CosineRippleGauss
std::ostringstream ostr;
- ostr << "Sorry, outer shape Ripple1Gauss not yet implemented for Mesocrystal";
+ ostr << "Sorry, outer shape CosineRippleGauss not yet implemented for Mesocrystal";
ostr << "\n\nStay tuned!";
throw Exceptions::ClassInitializationException(ostr.str());
- } else if (dynamic_cast<const FormFactorRipple1Lorentz*>(outerShape)) {
- // TODO: Implement Ripple1Lorentz
+ } else if (dynamic_cast<const FormFactorCosineRippleLorentz*>(outerShape)) {
+ // TODO: Implement CosineRippleLorentz
std::ostringstream ostr;
- ostr << "Sorry, outer shape Ripple1Lorentz not yet implemented for Mesocrystal";
+ ostr << "Sorry, outer shape CosineRippleLorentz not yet implemented for Mesocrystal";
ostr << "\n\nStay tuned!";
throw Exceptions::ClassInitializationException(ostr.str());
- } else if (dynamic_cast<const FormFactorRipple2Box*>(outerShape)) {
- // TODO: Implement Ripple2Box
+ } else if (dynamic_cast<const FormFactorSawtoothRippleBox*>(outerShape)) {
+ // TODO: Implement SawtoothRippleBox
std::ostringstream ostr;
- ostr << "Sorry, outer shape Ripple2Box not yet implemented for Mesocrystal";
+ ostr << "Sorry, outer shape SawtoothRippleBox not yet implemented for Mesocrystal";
ostr << "\n\nStay tuned!";
throw Exceptions::ClassInitializationException(ostr.str());
- } else if (dynamic_cast<const FormFactorRipple2Gauss*>(outerShape)) {
- // TODO: Implement Ripple2Gauss
+ } else if (dynamic_cast<const FormFactorSawtoothRippleGauss*>(outerShape)) {
+ // TODO: Implement SawtoothRippleGauss
std::ostringstream ostr;
- ostr << "Sorry, outer shape Ripple2Gauss not yet implemented for Mesocrystal";
+ ostr << "Sorry, outer shape SawtoothRippleGauss not yet implemented for Mesocrystal";
ostr << "\n\nStay tuned!";
throw Exceptions::ClassInitializationException(ostr.str());
- } else if (dynamic_cast<const FormFactorRipple2Lorentz*>(outerShape)) {
- // TODO: Implement Ripple2Lorentz
+ } else if (dynamic_cast<const FormFactorSawtoothRippleLorentz*>(outerShape)) {
+ // TODO: Implement SawtoothRippleLorentz
std::ostringstream ostr;
- ostr << "Sorry, outer shape Ripple2Lorentz not yet implemented for Mesocrystal";
+ ostr << "Sorry, outer shape SawtoothRippleLorentz not yet implemented for Mesocrystal";
ostr << "\n\nStay tuned!";
throw Exceptions::ClassInitializationException(ostr.str());
} else if (auto ff_Tetrahedron = dynamic_cast<const FormFactorTetrahedron*>(outerShape)) {
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
index 4f4cf1980770bb84b1c3b83757846721260611ae..0867a3c98d2d7be969e3c5d8636bff1e929523b6 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
@@ -188,36 +188,40 @@ TransformTo3D::createParticlefromIFormFactor(const IFormFactor* ff)
double height = ff_Pyramid->getHeight();
double alpha = ff_Pyramid->getAlpha();
result = std::make_unique<RealSpace::Particles::Pyramid>(baseedge, height, alpha);
- } else if (auto ff_Ripple1Box = dynamic_cast<const FormFactorRipple1Box*>(ff)) {
- double length = ff_Ripple1Box->getLength();
- double width = ff_Ripple1Box->getWidth();
- double height = ff_Ripple1Box->getHeight();
- result = std::make_unique<RealSpace::Particles::Ripple1Box>(length, width, height);
- } else if (auto ff_Ripple1Gauss = dynamic_cast<const FormFactorRipple1Gauss*>(ff)) {
- double length = ff_Ripple1Gauss->getLength();
- double width = ff_Ripple1Gauss->getWidth();
- double height = ff_Ripple1Gauss->getHeight();
- result = std::make_unique<RealSpace::Particles::Ripple1Gauss>(length, width, height);
- } else if (auto ff_Ripple1Lorentz = dynamic_cast<const FormFactorRipple1Lorentz*>(ff)) {
- double length = ff_Ripple1Lorentz->getLength();
- double width = ff_Ripple1Lorentz->getWidth();
- double height = ff_Ripple1Lorentz->getHeight();
- result = std::make_unique<RealSpace::Particles::Ripple1Lorentz>(length, width, height);
- } else if (auto ff_Ripple2Box = dynamic_cast<const FormFactorRipple2Box*>(ff)) {
- double length = ff_Ripple2Box->getLength();
- double width = ff_Ripple2Box->getWidth();
- double height = ff_Ripple2Box->getHeight();
- result = std::make_unique<RealSpace::Particles::Ripple2Box>(length, width, height);
- } else if (auto ff_Ripple2Gauss = dynamic_cast<const FormFactorRipple2Gauss*>(ff)) {
- double length = ff_Ripple2Gauss->getLength();
- double width = ff_Ripple2Gauss->getWidth();
- double height = ff_Ripple2Gauss->getHeight();
- result = std::make_unique<RealSpace::Particles::Ripple2Gauss>(length, width, height);
- } else if (auto ff_Ripple2Lorentz = dynamic_cast<const FormFactorRipple2Lorentz*>(ff)) {
- double length = ff_Ripple2Lorentz->getLength();
- double width = ff_Ripple2Lorentz->getWidth();
- double height = ff_Ripple2Lorentz->getHeight();
- result = std::make_unique<RealSpace::Particles::Ripple2Lorentz>(length, width, height);
+ } else if (auto ff_CosineRippleBox = dynamic_cast<const FormFactorCosineRippleBox*>(ff)) {
+ double length = ff_CosineRippleBox->getLength();
+ double width = ff_CosineRippleBox->getWidth();
+ double height = ff_CosineRippleBox->getHeight();
+ result = std::make_unique<RealSpace::Particles::CosineRippleBox>(length, width, height);
+ } else if (auto ff_CosineRippleGauss = dynamic_cast<const FormFactorCosineRippleGauss*>(ff)) {
+ double length = ff_CosineRippleGauss->getLength();
+ double width = ff_CosineRippleGauss->getWidth();
+ double height = ff_CosineRippleGauss->getHeight();
+ result = std::make_unique<RealSpace::Particles::CosineRippleGauss>(length, width, height);
+ } else if (auto ff_CosineRippleLorentz =
+ dynamic_cast<const FormFactorCosineRippleLorentz*>(ff)) {
+ double length = ff_CosineRippleLorentz->getLength();
+ double width = ff_CosineRippleLorentz->getWidth();
+ double height = ff_CosineRippleLorentz->getHeight();
+ result = std::make_unique<RealSpace::Particles::CosineRippleLorentz>(length, width, height);
+ } else if (auto ff_SawtoothRippleBox = dynamic_cast<const FormFactorSawtoothRippleBox*>(ff)) {
+ double length = ff_SawtoothRippleBox->getLength();
+ double width = ff_SawtoothRippleBox->getWidth();
+ double height = ff_SawtoothRippleBox->getHeight();
+ result = std::make_unique<RealSpace::Particles::SawtoothRippleBox>(length, width, height);
+ } else if (auto ff_SawtoothRippleGauss =
+ dynamic_cast<const FormFactorSawtoothRippleGauss*>(ff)) {
+ double length = ff_SawtoothRippleGauss->getLength();
+ double width = ff_SawtoothRippleGauss->getWidth();
+ double height = ff_SawtoothRippleGauss->getHeight();
+ result = std::make_unique<RealSpace::Particles::SawtoothRippleGauss>(length, width, height);
+ } else if (auto ff_SawtoothRippleLorentz =
+ dynamic_cast<const FormFactorSawtoothRippleLorentz*>(ff)) {
+ double length = ff_SawtoothRippleLorentz->getLength();
+ double width = ff_SawtoothRippleLorentz->getWidth();
+ double height = ff_SawtoothRippleLorentz->getHeight();
+ result =
+ std::make_unique<RealSpace::Particles::SawtoothRippleLorentz>(length, width, height);
} else if (auto ff_Tetrahedron = dynamic_cast<const FormFactorTetrahedron*>(ff)) {
double baseedge = ff_Tetrahedron->getBaseEdge();
double height = ff_Tetrahedron->getHeight();
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Ripple1_64x64.png b/GUI/coregui/Views/widgetbox/images/ff_CosineRipple_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Ripple1_64x64.png
rename to GUI/coregui/Views/widgetbox/images/ff_CosineRipple_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/images/ff_Ripple2_64x64.png b/GUI/coregui/Views/widgetbox/images/ff_SawtoothRipple_64x64.png
similarity index 100%
rename from GUI/coregui/Views/widgetbox/images/ff_Ripple2_64x64.png
rename to GUI/coregui/Views/widgetbox/images/ff_SawtoothRipple_64x64.png
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.qrc b/GUI/coregui/Views/widgetbox/widgetbox.qrc
index c96c47587be7a6f31f971dea748a2fe17b9c4ce3..13e5e9ccb7376d36fc49c544927a42ba41363a0f 100644
--- a/GUI/coregui/Views/widgetbox/widgetbox.qrc
+++ b/GUI/coregui/Views/widgetbox/widgetbox.qrc
@@ -1,10 +1,24 @@
<RCC>
<qresource prefix="/widgetbox">
<file>widgetbox.xml</file>
+ <file>images/Lattice1D.png</file>
+ <file>images/Lattice2D.png</file>
+ <file>images/Lattice2DFinite.png</file>
+ <file>images/Layer.png</file>
+ <file>images/Mesocrystal_64x64.png</file>
+ <file>images/MultiLayer.png</file>
+ <file>images/ParaCrystal1D.png</file>
+ <file>images/ParaCrystal2D.png</file>
+ <file>images/ParticleComposition_64x64.png</file>
+ <file>images/ParticleCoreShell_64x64.png</file>
+ <file>images/ParticleDistribution_64x64.png</file>
+ <file>images/ParticleLayout.png</file>
+ <file>images/Transformation.png</file>
<file>images/ff_AnisoPyramid_64x64.png</file>
<file>images/ff_Box_64x64.png</file>
- <file>images/ff_Cone_64x64.png</file>
<file>images/ff_Cone6_64x64.png</file>
+ <file>images/ff_Cone_64x64.png</file>
+ <file>images/ff_CosineRipple_64x64.png</file>
<file>images/ff_Cuboctahedron_64x64.png</file>
<file>images/ff_Cylinder_64x64.png</file>
<file>images/ff_Dodecahedron_64x64.png</file>
@@ -14,28 +28,14 @@
<file>images/ff_FullSpheroid_64x64.png</file>
<file>images/ff_HemiEllipsoid_64x64.png</file>
<file>images/ff_Icosahedron_64x64.png</file>
- <file>images/Mesocrystal_64x64.png</file>
<file>images/ff_Prism3_64x64.png</file>
<file>images/ff_Prism6_64x64.png</file>
<file>images/ff_Pyramid_64x64.png</file>
- <file>images/ff_Ripple1_64x64.png</file>
- <file>images/ff_Ripple2_64x64.png</file>
+ <file>images/ff_SawtoothRipple_64x64.png</file>
<file>images/ff_Tetrahedron_64x64.png</file>
<file>images/ff_TruncatedCube_64x64.png</file>
<file>images/ff_TruncatedSphere_64x64.png</file>
<file>images/ff_TruncatedSpheroid_64x64.png</file>
- <file>images/MultiLayer.png</file>
- <file>images/Layer.png</file>
- <file>images/ParaCrystal2D.png</file>
- <file>images/ParaCrystal1D.png</file>
- <file>images/ParticleLayout.png</file>
- <file>images/ParticleCoreShell_64x64.png</file>
- <file>images/Lattice2D.png</file>
- <file>images/Transformation.png</file>
- <file>images/ParticleComposition_64x64.png</file>
- <file>images/ParticleDistribution_64x64.png</file>
- <file>images/Lattice1D.png</file>
<file>images/sample_layers2.png</file>
- <file>images/Lattice2DFinite.png</file>
</qresource>
</RCC>
diff --git a/Tests/Performance/Benchmark.h b/Tests/Performance/Benchmark.h
index b9de85735022c3ab52ebf4b04374aee8a45dea45..925baaf30800d8b499b548e23974bac8576c632f 100644
--- a/Tests/Performance/Benchmark.h
+++ b/Tests/Performance/Benchmark.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_TESTS_PERFORMANCE_BENCHMARK_H
#define BORNAGAIN_TESTS_PERFORMANCE_BENCHMARK_H
-#include "Core/Tools/OrderedMap.h"
+#include "Core/Export/OrderedMap.h"
#include "Fit/Tools/WallclockTimer.h"
#include <functional>
#include <map>
diff --git a/Tests/ReferenceData/Std/FormFactorsWithAbsorption_Ripple1Box.int.gz b/Tests/ReferenceData/Std/FormFactorsWithAbsorption_CosineRippleBox.int.gz
similarity index 100%
rename from Tests/ReferenceData/Std/FormFactorsWithAbsorption_Ripple1Box.int.gz
rename to Tests/ReferenceData/Std/FormFactorsWithAbsorption_CosineRippleBox.int.gz
diff --git a/Tests/ReferenceData/Std/FormFactorsWithAbsorption_Ripple2Box.int.gz b/Tests/ReferenceData/Std/FormFactorsWithAbsorption_SawtoothRippleBox.int.gz
similarity index 100%
rename from Tests/ReferenceData/Std/FormFactorsWithAbsorption_Ripple2Box.int.gz
rename to Tests/ReferenceData/Std/FormFactorsWithAbsorption_SawtoothRippleBox.int.gz
diff --git a/Tests/ReferenceData/Std/FormFactors_Ripple1Box.int.gz b/Tests/ReferenceData/Std/FormFactors_CosineRippleBox.int.gz
similarity index 100%
rename from Tests/ReferenceData/Std/FormFactors_Ripple1Box.int.gz
rename to Tests/ReferenceData/Std/FormFactors_CosineRippleBox.int.gz
diff --git a/Tests/ReferenceData/Std/FormFactors_Ripple2Box.int.gz b/Tests/ReferenceData/Std/FormFactors_SawtoothRippleBox.int.gz
similarity index 100%
rename from Tests/ReferenceData/Std/FormFactors_Ripple2Box.int.gz
rename to Tests/ReferenceData/Std/FormFactors_SawtoothRippleBox.int.gz
diff --git a/Tests/UnitTests/Core/Other/OrderedMapTest.cpp b/Tests/UnitTests/Core/Other/OrderedMapTest.cpp
index 2d3bcdcf9e4251eb764c107124a93d2c7be94422..09f2972acff0c25559d262937938028d698990c5 100644
--- a/Tests/UnitTests/Core/Other/OrderedMapTest.cpp
+++ b/Tests/UnitTests/Core/Other/OrderedMapTest.cpp
@@ -1,4 +1,4 @@
-#include "Core/Tools/OrderedMap.h"
+#include "Core/Export/OrderedMap.h"
#include "Tests/GTestWrapper/google_test.h"
class OrderedMapTest : public ::testing::Test
diff --git a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
index 37d1056a0727c000191fe88fa95cadec240c5d72..432bbeabc512a1e83faaa16e5cac147b5ede32e4 100644
--- a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
+++ b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp
@@ -17,11 +17,8 @@ TEST_F(FTDistributionsTest, FTDistribution1DCauchyConstructor)
EXPECT_EQ(1.0, P_1d_cauchy->omega());
EXPECT_NEAR(0.961538, P_1d_cauchy->evaluate(0.2), 0.000001);
- P_1d_cauchy->setOmega(3.0);
- EXPECT_EQ(3.0, P_1d_cauchy->omega());
-
- P_1d_cauchy->setParameterValue("Omega", -7.0);
- EXPECT_EQ(-7.0, P_1d_cauchy->omega());
+ P_1d_cauchy->setParameterValue("Omega", 7.0);
+ EXPECT_EQ(7.0, P_1d_cauchy->omega());
}
TEST_F(FTDistributionsTest, FTDistribution1DCauchyClone)
@@ -38,9 +35,6 @@ TEST_F(FTDistributionsTest, FTDistribution1DGaussConstructor)
std::unique_ptr<IFTDistribution1D> P_1d_gauss{new FTDistribution1DGauss(1.0)};
EXPECT_EQ(1.0, P_1d_gauss->omega());
EXPECT_NEAR(0.9801987, P_1d_gauss->evaluate(0.2), 0.000001);
-
- P_1d_gauss->setOmega(3.0);
- EXPECT_EQ(3.0, P_1d_gauss->omega());
}
TEST_F(FTDistributionsTest, FTDistribution1DGaussClone)
@@ -57,9 +51,6 @@ TEST_F(FTDistributionsTest, FTDistribution1DGateConstructor)
std::unique_ptr<IFTDistribution1D> P_1d_gate{new FTDistribution1DGate(1.0)};
EXPECT_EQ(1.0, P_1d_gate->omega());
EXPECT_NEAR(0.993347, P_1d_gate->evaluate(0.2), 0.000001);
-
- P_1d_gate->setOmega(3.0);
- EXPECT_EQ(3.0, P_1d_gate->omega());
}
TEST_F(FTDistributionsTest, FTDistribution1DGateClone)
@@ -76,9 +67,6 @@ TEST_F(FTDistributionsTest, FTDistribution1DTriangleConstructor)
std::unique_ptr<IFTDistribution1D> P_1d_triangle{new FTDistribution1DTriangle(1.0)};
EXPECT_EQ(1.0, P_1d_triangle->omega());
EXPECT_NEAR(0.996671, P_1d_triangle->evaluate(0.2), 0.000001);
-
- P_1d_triangle->setOmega(3.0);
- EXPECT_EQ(3.0, P_1d_triangle->omega());
}
TEST_F(FTDistributionsTest, FTDistribution1DTriangleClone)
@@ -95,9 +83,6 @@ TEST_F(FTDistributionsTest, FTDistribution1DCosineConstructor)
std::unique_ptr<IFTDistribution1D> P_1d_cosine{new FTDistribution1DCosine(1.0)};
EXPECT_EQ(1.0, P_1d_cosine->omega());
EXPECT_NEAR(0.997389, P_1d_cosine->evaluate(0.2), 0.000001);
-
- P_1d_cosine->setOmega(3.0);
- EXPECT_EQ(3.0, P_1d_cosine->omega());
}
TEST_F(FTDistributionsTest, FTDistribution1DCosineClone)
@@ -114,9 +99,6 @@ TEST_F(FTDistributionsTest, FTDistribution1DVoigtConstructor)
std::unique_ptr<IFTDistribution1D> P_1d_voigt{new FTDistribution1DVoigt(1.0, 1.7)};
EXPECT_EQ(1.0, P_1d_voigt->omega());
EXPECT_NEAR(0.993261, P_1d_voigt->evaluate(0.2), 0.000001);
-
- P_1d_voigt->setOmega(3.0);
- EXPECT_EQ(3.0, P_1d_voigt->omega());
}
TEST_F(FTDistributionsTest, FTDistribution1DVoigtClone)
@@ -141,9 +123,9 @@ TEST_F(FTDistributionsTest, FTDistribution2DCauchyConstructor)
EXPECT_EQ(0.0, P_2d_cauchy->gamma());
EXPECT_NEAR(0.343206, P_2d_cauchy->evaluate(0.2, 0.5), 0.000001);
- P_2d_cauchy->setGamma(3.0);
- EXPECT_EQ(3.0, P_2d_cauchy->gamma());
- EXPECT_EQ(3.0, P_2d_cauchy->parameter("Gamma")->value());
+ P_2d_cauchy->setParameterValue("Gamma", .123);
+ EXPECT_EQ(.123, P_2d_cauchy->gamma());
+ EXPECT_EQ(.123, P_2d_cauchy->parameter("Gamma")->value());
P_2d_cauchy->setParameterValue("OmegaX", 7.0);
P_2d_cauchy->setParameterValue("OmegaY", 5.3);
@@ -171,9 +153,6 @@ TEST_F(FTDistributionsTest, FTDistribution2DGaussConstructor)
EXPECT_EQ(M_PI / 2.0, P_2d_gauss->delta());
EXPECT_EQ(0.0, P_2d_gauss->gamma());
EXPECT_NEAR(0.5945205, P_2d_gauss->evaluate(0.2, 0.5), 0.000001);
-
- P_2d_gauss->setGamma(3.0);
- EXPECT_EQ(3.0, P_2d_gauss->gamma());
}
TEST_F(FTDistributionsTest, FTDistribution2DGaussClone)
@@ -196,9 +175,6 @@ TEST_F(FTDistributionsTest, FTDistribution2DGateConstructor)
EXPECT_EQ(M_PI / 2.0, P_2d_gate->delta());
EXPECT_EQ(0.0, P_2d_gate->gamma());
EXPECT_NEAR(0.875513, P_2d_gate->evaluate(0.2, 0.5), 0.000001);
-
- P_2d_gate->setGamma(3.0);
- EXPECT_EQ(3.0, P_2d_gate->gamma());
}
TEST_F(FTDistributionsTest, FTDistribution2DGateClone)
@@ -221,9 +197,6 @@ TEST_F(FTDistributionsTest, FTDistribution2DConeConstructor)
EXPECT_EQ(M_PI / 2.0, P_2d_cone->delta());
EXPECT_EQ(0.0, P_2d_cone->gamma());
EXPECT_NEAR(0.924374, P_2d_cone->evaluate(0.2, 0.5), 0.000001);
-
- P_2d_cone->setGamma(3.0);
- EXPECT_EQ(3.0, P_2d_cone->gamma());
}
TEST_F(FTDistributionsTest, FTDistribution2DConeClone)
@@ -246,9 +219,6 @@ TEST_F(FTDistributionsTest, FTDistribution2DVoigtConstructor)
EXPECT_EQ(M_PI / 2.0, P_2d_voigt->delta());
EXPECT_EQ(0.0, P_2d_voigt->gamma());
EXPECT_NEAR(1.2228072, P_2d_voigt->evaluate(0.2, 0.5), 0.000001);
-
- P_2d_voigt->setGamma(3.0);
- EXPECT_EQ(3.0, P_2d_voigt->gamma());
}
TEST_F(FTDistributionsTest, FTDistribution2DVoigtClone)
diff --git a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp b/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
index 6d94232d3bda73f4d4a8bdb38d080af207e5988d..ae176e8ef0b9a655083f8e469f7b9d402c078e64 100644
--- a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
+++ b/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp
@@ -428,14 +428,14 @@ TEST_F(FormFactorBasicTest, Tetrahedron)
test_ff(&particle);
}
-TEST_F(FormFactorBasicTest, Ripple1Box)
+TEST_F(FormFactorBasicTest, CosineRippleBox)
{
double width = 20.;
double height = 4.;
double length = 100.0;
double volume = 0.5 * height * width * length;
- FormFactorRipple1Box particle(length, width, height);
+ FormFactorCosineRippleBox particle(length, width, height);
EXPECT_EQ(height, particle.getHeight());
EXPECT_EQ(width, particle.getWidth());
EXPECT_EQ(length, particle.getLength());
@@ -462,7 +462,7 @@ TEST_F(FormFactorBasicTest, TruncatedCube)
test_ff(&particle);
}
-TEST_F(FormFactorBasicTest, Ripple2Box)
+TEST_F(FormFactorBasicTest, SawtoothRippleBox)
{
double width = 20.;
double height = 4.;
@@ -470,7 +470,7 @@ TEST_F(FormFactorBasicTest, Ripple2Box)
double d = 0.3; // asymmetry
double volume = 0.5 * height * width * length;
- FormFactorRipple2Box particle(length, width, height, d);
+ FormFactorSawtoothRippleBox particle(length, width, height, d);
EXPECT_EQ(height, particle.getHeight());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
diff --git a/Tests/UnitTests/Core/SimulationElement/SimulationElementTest.cpp b/Tests/UnitTests/Core/SimulationElement/SimulationElementTest.cpp
index 2ecc57eb1f75b2258bc4f9a3e39cc1ebe6d80c87..197149d7f3176a38f0437d011401bfdccdc5359a 100644
--- a/Tests/UnitTests/Core/SimulationElement/SimulationElementTest.cpp
+++ b/Tests/UnitTests/Core/SimulationElement/SimulationElementTest.cpp
@@ -1,7 +1,7 @@
#include "Core/SimulationElement/SimulationElement.h"
#include "Core/Basics/Units.h"
#include "Core/Binning/Bin.h"
-#include "Core/Detector/SphericalDetector.h"
+#include "Core/Detector/SphericalPixel.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
index 79959e4d0d5b597d680d69160df5e7fd806afcc4..e1a97876d949eebc8c074663ba76e6dac228b3c0 100644
--- a/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
+++ b/Tests/UnitTests/GUI/TestGUICoreObjectCorrespondence.cpp
@@ -135,17 +135,17 @@ TEST_F(TestGUICoreObjectCorrespondence, test_Pyramid)
GUICoreObjectCorrespondence(gui_pyramid, core_pyramid);
}
-TEST_F(TestGUICoreObjectCorrespondence, test_Ripple1Box)
+TEST_F(TestGUICoreObjectCorrespondence, test_CosineRippleBox)
{
- Ripple1BoxItem gui_ripple1;
- FormFactorRipple1Box core_ripple1(10.0, 2.0, 1.0);
+ CosineRippleBoxItem gui_ripple1;
+ FormFactorCosineRippleBox core_ripple1(10.0, 2.0, 1.0);
GUICoreObjectCorrespondence(gui_ripple1, core_ripple1);
}
-TEST_F(TestGUICoreObjectCorrespondence, test_Ripple2Box)
+TEST_F(TestGUICoreObjectCorrespondence, test_SawtoothRippleBox)
{
- Ripple2BoxItem gui_ripple2;
- FormFactorRipple2Box core_ripple2(10.0, 2.0, 1.0, 0.1);
+ SawtoothRippleBoxItem gui_ripple2;
+ FormFactorSawtoothRippleBox core_ripple2(10.0, 2.0, 1.0, 0.1);
GUICoreObjectCorrespondence(gui_ripple2, core_ripple2);
}
diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i
index 9ef016e94e8114cbae802339a5fcc9bf87a93cb5..e8c24f657e3137bdb5c19a31ed45f5153b7285fe 100644
--- a/Wrap/swig/libBornAgainCore.i
+++ b/Wrap/swig/libBornAgainCore.i
@@ -127,6 +127,7 @@
#include "Core/HardParticle/FormFactorCantellatedCube.h"
#include "Core/HardParticle/FormFactorCone.h"
#include "Core/HardParticle/FormFactorCone6.h"
+#include "Core/HardParticle/FormFactorCosineRipple.h"
#include "Core/HardParticle/FormFactorCuboctahedron.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorDodecahedron.h"
@@ -144,13 +145,11 @@
#include "Core/HardParticle/FormFactorPrism3.h"
#include "Core/HardParticle/FormFactorPrism6.h"
#include "Core/HardParticle/FormFactorPyramid.h"
-#include "Core/HardParticle/FormFactorRipple1.h"
-#include "Core/HardParticle/FormFactorRipple2.h"
+#include "Core/HardParticle/FormFactorSawtoothRipple.h"
#include "Core/HardParticle/FormFactorTetrahedron.h"
#include "Core/HardParticle/FormFactorTruncatedCube.h"
#include "Core/HardParticle/FormFactorTruncatedSphere.h"
#include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
-#include "Core/HardParticle/Ripples.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Instrument/ChiSquaredModule.h"
@@ -405,15 +404,14 @@
%include "Core/HardParticle/FormFactorPolyhedron.h"
%include "Core/HardParticle/FormFactorPolyhedron.h"
-%include "Core/HardParticle/ProfileBar.h"
-%include "Core/HardParticle/ProfileRipple1.h"
-%include "Core/HardParticle/ProfileRipple2.h"
+%include "Core/HardParticle/IProfileRipple.h"
%include "Core/HardParticle/FormFactorAnisoPyramid.h"
%include "Core/HardParticle/FormFactorBox.h"
%include "Core/HardParticle/FormFactorCantellatedCube.h"
%include "Core/HardParticle/FormFactorCone.h"
%include "Core/HardParticle/FormFactorCone6.h"
+%include "Core/HardParticle/FormFactorCosineRipple.h"
%include "Core/HardParticle/FormFactorCuboctahedron.h"
%include "Core/HardParticle/FormFactorCylinder.h"
%include "Core/HardParticle/FormFactorDodecahedron.h"
@@ -429,13 +427,11 @@
%include "Core/HardParticle/FormFactorPrism3.h"
%include "Core/HardParticle/FormFactorPrism6.h"
%include "Core/HardParticle/FormFactorPyramid.h"
-%include "Core/HardParticle/FormFactorRipple1.h"
-%include "Core/HardParticle/FormFactorRipple2.h"
+%include "Core/HardParticle/FormFactorSawtoothRipple.h"
%include "Core/HardParticle/FormFactorTetrahedron.h"
%include "Core/HardParticle/FormFactorTruncatedCube.h"
%include "Core/HardParticle/FormFactorTruncatedSphere.h"
%include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
-%include "Core/HardParticle/Ripples.h"
%include "Core/SoftParticle/FormFactorGauss.h"
%include "Core/SoftParticle/FormFactorSphereGaussianRadius.h"
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index d15774779998457cf9052881ef9b2d59354135ec..0cf0c748d5d6fbc77bfc1c7f860a4820cafb6295 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -6336,12 +6336,12 @@ class INodeVisitor(object):
visit(INodeVisitor self, FormFactorPrism3 arg2)
visit(INodeVisitor self, FormFactorPrism6 arg2)
visit(INodeVisitor self, FormFactorPyramid arg2)
- visit(INodeVisitor self, FormFactorRipple1Box arg2)
- visit(INodeVisitor self, FormFactorRipple1Gauss arg2)
- visit(INodeVisitor self, FormFactorRipple1Lorentz arg2)
- visit(INodeVisitor self, FormFactorRipple2Box arg2)
- visit(INodeVisitor self, FormFactorRipple2Gauss arg2)
- visit(INodeVisitor self, FormFactorRipple2Lorentz arg2)
+ visit(INodeVisitor self, FormFactorCosineRippleBox arg2)
+ visit(INodeVisitor self, FormFactorCosineRippleGauss arg2)
+ visit(INodeVisitor self, FormFactorCosineRippleLorentz arg2)
+ visit(INodeVisitor self, FormFactorSawtoothRippleBox arg2)
+ visit(INodeVisitor self, FormFactorSawtoothRippleGauss arg2)
+ visit(INodeVisitor self, FormFactorSawtoothRippleLorentz arg2)
visit(INodeVisitor self, FormFactorSphereGaussianRadius arg2)
visit(INodeVisitor self, FormFactorSphereLogNormalRadius arg2)
visit(INodeVisitor self, FormFactorTetrahedron arg2)
@@ -6693,8 +6693,9 @@ class DistributionGate(IDistribution1D):
def __init__(self, *args):
r"""
- __init__(DistributionGate self) -> DistributionGate
+ __init__(DistributionGate self, vdouble1d_t P) -> DistributionGate
__init__(DistributionGate self, double min, double max) -> DistributionGate
+ __init__(DistributionGate self) -> DistributionGate
DistributionGate::DistributionGate(double min, double max)
"""
@@ -6793,8 +6794,9 @@ class DistributionLorentz(IDistribution1D):
def __init__(self, *args):
r"""
- __init__(DistributionLorentz self) -> DistributionLorentz
+ __init__(DistributionLorentz self, vdouble1d_t P) -> DistributionLorentz
__init__(DistributionLorentz self, double mean, double hwhm) -> DistributionLorentz
+ __init__(DistributionLorentz self) -> DistributionLorentz
DistributionLorentz::DistributionLorentz(double mean, double hwhm)
"""
@@ -6885,8 +6887,9 @@ class DistributionGaussian(IDistribution1D):
def __init__(self, *args):
r"""
- __init__(DistributionGaussian self) -> DistributionGaussian
+ __init__(DistributionGaussian self, vdouble1d_t P) -> DistributionGaussian
__init__(DistributionGaussian self, double mean, double std_dev) -> DistributionGaussian
+ __init__(DistributionGaussian self) -> DistributionGaussian
DistributionGaussian::DistributionGaussian(double mean, double std_dev)
"""
@@ -6975,13 +6978,14 @@ class DistributionLogNormal(IDistribution1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, median, scale_param):
+ def __init__(self, *args):
r"""
+ __init__(DistributionLogNormal self, vdouble1d_t P) -> DistributionLogNormal
__init__(DistributionLogNormal self, double median, double scale_param) -> DistributionLogNormal
DistributionLogNormal::DistributionLogNormal(double median, double scale_param)
"""
- _libBornAgainCore.DistributionLogNormal_swiginit(self, _libBornAgainCore.new_DistributionLogNormal(median, scale_param))
+ _libBornAgainCore.DistributionLogNormal_swiginit(self, _libBornAgainCore.new_DistributionLogNormal(*args))
def clone(self):
r"""
@@ -7086,8 +7090,9 @@ class DistributionCosine(IDistribution1D):
def __init__(self, *args):
r"""
- __init__(DistributionCosine self) -> DistributionCosine
+ __init__(DistributionCosine self, vdouble1d_t P) -> DistributionCosine
__init__(DistributionCosine self, double mean, double sigma) -> DistributionCosine
+ __init__(DistributionCosine self) -> DistributionCosine
DistributionCosine::DistributionCosine(double mean, double sigma)
"""
@@ -7178,6 +7183,7 @@ class DistributionTrapezoid(IDistribution1D):
def __init__(self, *args):
r"""
+ __init__(DistributionTrapezoid self, vdouble1d_t P) -> DistributionTrapezoid
__init__(DistributionTrapezoid self, double center, double left, double middle, double right) -> DistributionTrapezoid
__init__(DistributionTrapezoid self) -> DistributionTrapezoid
DistributionTrapezoid::DistributionTrapezoid(double center, double left_width, double middle_width, double right_width)
@@ -8542,8 +8548,9 @@ class RotationX(IRotation):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, angle):
+ def __init__(self, *args):
r"""
+ __init__(RotationX self, vdouble1d_t P) -> RotationX
__init__(RotationX self, double angle) -> RotationX
RotationX::RotationX(double angle)
@@ -8556,7 +8563,7 @@ class RotationX(IRotation):
rotation angle around x-axis in radians
"""
- _libBornAgainCore.RotationX_swiginit(self, _libBornAgainCore.new_RotationX(angle))
+ _libBornAgainCore.RotationX_swiginit(self, _libBornAgainCore.new_RotationX(*args))
def clone(self):
r"""
@@ -8623,8 +8630,9 @@ class RotationY(IRotation):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, angle):
+ def __init__(self, *args):
r"""
+ __init__(RotationY self, vdouble1d_t P) -> RotationY
__init__(RotationY self, double angle) -> RotationY
RotationY::RotationY(double angle)
@@ -8637,7 +8645,7 @@ class RotationY(IRotation):
rotation angle around y-axis in radians
"""
- _libBornAgainCore.RotationY_swiginit(self, _libBornAgainCore.new_RotationY(angle))
+ _libBornAgainCore.RotationY_swiginit(self, _libBornAgainCore.new_RotationY(*args))
def clone(self):
r"""
@@ -8704,8 +8712,9 @@ class RotationZ(IRotation):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, angle):
+ def __init__(self, *args):
r"""
+ __init__(RotationZ self, vdouble1d_t P) -> RotationZ
__init__(RotationZ self, double angle) -> RotationZ
RotationZ::RotationZ(double angle=0.0)
@@ -8718,7 +8727,7 @@ class RotationZ(IRotation):
rotation angle around z-axis in radians
"""
- _libBornAgainCore.RotationZ_swiginit(self, _libBornAgainCore.new_RotationZ(angle))
+ _libBornAgainCore.RotationZ_swiginit(self, _libBornAgainCore.new_RotationZ(*args))
def clone(self):
r"""
@@ -8785,8 +8794,9 @@ class RotationEuler(IRotation):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, alpha, beta, gamma):
+ def __init__(self, *args):
r"""
+ __init__(RotationEuler self, vdouble1d_t P) -> RotationEuler
__init__(RotationEuler self, double alpha, double beta, double gamma) -> RotationEuler
RotationEuler::RotationEuler(double alpha, double beta, double gamma)
@@ -8805,7 +8815,7 @@ class RotationEuler(IRotation):
third Euler angle in radians
"""
- _libBornAgainCore.RotationEuler_swiginit(self, _libBornAgainCore.new_RotationEuler(alpha, beta, gamma))
+ _libBornAgainCore.RotationEuler_swiginit(self, _libBornAgainCore.new_RotationEuler(*args))
def clone(self):
r"""
@@ -10268,13 +10278,14 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, decay_length):
+ def __init__(self, *args):
r"""
+ __init__(FTDecayFunction1DCauchy self, vdouble1d_t P) -> FTDecayFunction1DCauchy
__init__(FTDecayFunction1DCauchy self, double decay_length) -> FTDecayFunction1DCauchy
FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(double decay_length)
"""
- _libBornAgainCore.FTDecayFunction1DCauchy_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DCauchy(decay_length))
+ _libBornAgainCore.FTDecayFunction1DCauchy_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DCauchy(*args))
def clone(self):
r"""
@@ -10319,13 +10330,14 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, decay_length):
+ def __init__(self, *args):
r"""
+ __init__(FTDecayFunction1DGauss self, vdouble1d_t P) -> FTDecayFunction1DGauss
__init__(FTDecayFunction1DGauss self, double decay_length) -> FTDecayFunction1DGauss
FTDecayFunction1DGauss::FTDecayFunction1DGauss(double decay_length)
"""
- _libBornAgainCore.FTDecayFunction1DGauss_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DGauss(decay_length))
+ _libBornAgainCore.FTDecayFunction1DGauss_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DGauss(*args))
def clone(self):
r"""
@@ -10370,13 +10382,14 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, decay_length):
+ def __init__(self, *args):
r"""
+ __init__(FTDecayFunction1DTriangle self, vdouble1d_t P) -> FTDecayFunction1DTriangle
__init__(FTDecayFunction1DTriangle self, double decay_length) -> FTDecayFunction1DTriangle
FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(double decay_length)
"""
- _libBornAgainCore.FTDecayFunction1DTriangle_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DTriangle(decay_length))
+ _libBornAgainCore.FTDecayFunction1DTriangle_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DTriangle(*args))
def clone(self):
r"""
@@ -10421,8 +10434,9 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, decay_length, eta):
+ def __init__(self, *args):
r"""
+ __init__(FTDecayFunction1DVoigt self, vdouble1d_t P) -> FTDecayFunction1DVoigt
__init__(FTDecayFunction1DVoigt self, double decay_length, double eta) -> FTDecayFunction1DVoigt
FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(double decay_length, double eta)
@@ -10438,7 +10452,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D):
parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)
"""
- _libBornAgainCore.FTDecayFunction1DVoigt_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DVoigt(decay_length, eta))
+ _libBornAgainCore.FTDecayFunction1DVoigt_swiginit(self, _libBornAgainCore.new_FTDecayFunction1DVoigt(*args))
def clone(self):
r"""
@@ -10502,26 +10516,6 @@ class IFTDecayFunction2D(ICloneable, INode):
"""
return _libBornAgainCore.IFTDecayFunction2D_clone(self)
- def setGamma(self, gamma):
- r"""
- setGamma(IFTDecayFunction2D self, double gamma)
- void IFTDecayFunction2D::setGamma(double gamma)
-
- set angle between first lattice vector and X-axis of distribution (both in direct space)
-
- """
- return _libBornAgainCore.IFTDecayFunction2D_setGamma(self, gamma)
-
- def gamma(self):
- r"""
- gamma(IFTDecayFunction2D self) -> double
- double IFTDecayFunction2D::gamma() const
-
- get angle between first lattice vector and X-axis of distribution (both in direct space)
-
- """
- return _libBornAgainCore.IFTDecayFunction2D_gamma(self)
-
def decayLengthX(self):
r"""
decayLengthX(IFTDecayFunction2D self) -> double
@@ -10542,6 +10536,16 @@ class IFTDecayFunction2D(ICloneable, INode):
"""
return _libBornAgainCore.IFTDecayFunction2D_decayLengthY(self)
+ def gamma(self):
+ r"""
+ gamma(IFTDecayFunction2D self) -> double
+ double IFTDecayFunction2D::gamma() const
+
+ get angle between first lattice vector and X-axis of distribution (both in direct space)
+
+ """
+ return _libBornAgainCore.IFTDecayFunction2D_gamma(self)
+
def evaluate(self, qx, qy):
r"""
evaluate(IFTDecayFunction2D self, double qx, double qy) -> double
@@ -10581,13 +10585,14 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, decay_length_x, decay_length_y, gamma):
+ def __init__(self, *args):
r"""
+ __init__(FTDecayFunction2DCauchy self, vdouble1d_t P) -> FTDecayFunction2DCauchy
__init__(FTDecayFunction2DCauchy self, double decay_length_x, double decay_length_y, double gamma) -> FTDecayFunction2DCauchy
FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0)
"""
- _libBornAgainCore.FTDecayFunction2DCauchy_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DCauchy(decay_length_x, decay_length_y, gamma))
+ _libBornAgainCore.FTDecayFunction2DCauchy_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DCauchy(*args))
def clone(self):
r"""
@@ -10634,13 +10639,14 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, decay_length_x, decay_length_y, gamma):
+ def __init__(self, *args):
r"""
+ __init__(FTDecayFunction2DGauss self, vdouble1d_t P) -> FTDecayFunction2DGauss
__init__(FTDecayFunction2DGauss self, double decay_length_x, double decay_length_y, double gamma) -> FTDecayFunction2DGauss
FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0)
"""
- _libBornAgainCore.FTDecayFunction2DGauss_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DGauss(decay_length_x, decay_length_y, gamma))
+ _libBornAgainCore.FTDecayFunction2DGauss_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DGauss(*args))
def clone(self):
r"""
@@ -10687,8 +10693,9 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, decay_length_x, decay_length_y, gamma, eta):
+ def __init__(self, *args):
r"""
+ __init__(FTDecayFunction2DVoigt self, vdouble1d_t P) -> FTDecayFunction2DVoigt
__init__(FTDecayFunction2DVoigt self, double decay_length_x, double decay_length_y, double gamma, double eta) -> FTDecayFunction2DVoigt
FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0)
@@ -10710,7 +10717,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D):
distribution orientation with respect to the first lattice vector in radians
"""
- _libBornAgainCore.FTDecayFunction2DVoigt_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DVoigt(decay_length_x, decay_length_y, gamma, eta))
+ _libBornAgainCore.FTDecayFunction2DVoigt_swiginit(self, _libBornAgainCore.new_FTDecayFunction2DVoigt(*args))
def clone(self):
r"""
@@ -10786,14 +10793,6 @@ class IFTDistribution1D(ICloneable, INode):
"""
return _libBornAgainCore.IFTDistribution1D_evaluate(self, q)
- def setOmega(self, omega):
- r"""
- setOmega(IFTDistribution1D self, double omega)
- void IFTDistribution1D::setOmega(double omega)
-
- """
- return _libBornAgainCore.IFTDistribution1D_setOmega(self, omega)
-
def omega(self):
r"""
omega(IFTDistribution1D self) -> double
@@ -10829,13 +10828,14 @@ class FTDistribution1DCauchy(IFTDistribution1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution1DCauchy self, vdouble1d_t P) -> FTDistribution1DCauchy
__init__(FTDistribution1DCauchy self, double omega) -> FTDistribution1DCauchy
FTDistribution1DCauchy::FTDistribution1DCauchy(double omega)
"""
- _libBornAgainCore.FTDistribution1DCauchy_swiginit(self, _libBornAgainCore.new_FTDistribution1DCauchy(omega))
+ _libBornAgainCore.FTDistribution1DCauchy_swiginit(self, _libBornAgainCore.new_FTDistribution1DCauchy(*args))
def clone(self):
r"""
@@ -10892,13 +10892,14 @@ class FTDistribution1DGauss(IFTDistribution1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution1DGauss self, vdouble1d_t P) -> FTDistribution1DGauss
__init__(FTDistribution1DGauss self, double omega) -> FTDistribution1DGauss
FTDistribution1DGauss::FTDistribution1DGauss(double omega)
"""
- _libBornAgainCore.FTDistribution1DGauss_swiginit(self, _libBornAgainCore.new_FTDistribution1DGauss(omega))
+ _libBornAgainCore.FTDistribution1DGauss_swiginit(self, _libBornAgainCore.new_FTDistribution1DGauss(*args))
def clone(self):
r"""
@@ -10955,13 +10956,14 @@ class FTDistribution1DGate(IFTDistribution1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution1DGate self, vdouble1d_t P) -> FTDistribution1DGate
__init__(FTDistribution1DGate self, double omega) -> FTDistribution1DGate
FTDistribution1DGate::FTDistribution1DGate(double omega)
"""
- _libBornAgainCore.FTDistribution1DGate_swiginit(self, _libBornAgainCore.new_FTDistribution1DGate(omega))
+ _libBornAgainCore.FTDistribution1DGate_swiginit(self, _libBornAgainCore.new_FTDistribution1DGate(*args))
def clone(self):
r"""
@@ -11018,13 +11020,14 @@ class FTDistribution1DTriangle(IFTDistribution1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution1DTriangle self, vdouble1d_t P) -> FTDistribution1DTriangle
__init__(FTDistribution1DTriangle self, double omega) -> FTDistribution1DTriangle
FTDistribution1DTriangle::FTDistribution1DTriangle(double omega)
"""
- _libBornAgainCore.FTDistribution1DTriangle_swiginit(self, _libBornAgainCore.new_FTDistribution1DTriangle(omega))
+ _libBornAgainCore.FTDistribution1DTriangle_swiginit(self, _libBornAgainCore.new_FTDistribution1DTriangle(*args))
def clone(self):
r"""
@@ -11081,13 +11084,14 @@ class FTDistribution1DCosine(IFTDistribution1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution1DCosine self, vdouble1d_t P) -> FTDistribution1DCosine
__init__(FTDistribution1DCosine self, double omega) -> FTDistribution1DCosine
FTDistribution1DCosine::FTDistribution1DCosine(double omega)
"""
- _libBornAgainCore.FTDistribution1DCosine_swiginit(self, _libBornAgainCore.new_FTDistribution1DCosine(omega))
+ _libBornAgainCore.FTDistribution1DCosine_swiginit(self, _libBornAgainCore.new_FTDistribution1DCosine(*args))
def clone(self):
r"""
@@ -11144,8 +11148,9 @@ class FTDistribution1DVoigt(IFTDistribution1D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega, eta):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution1DVoigt self, vdouble1d_t P) -> FTDistribution1DVoigt
__init__(FTDistribution1DVoigt self, double omega, double eta) -> FTDistribution1DVoigt
FTDistribution1DVoigt::FTDistribution1DVoigt(double omega, double eta)
@@ -11161,7 +11166,7 @@ class FTDistribution1DVoigt(IFTDistribution1D):
parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)
"""
- _libBornAgainCore.FTDistribution1DVoigt_swiginit(self, _libBornAgainCore.new_FTDistribution1DVoigt(omega, eta))
+ _libBornAgainCore.FTDistribution1DVoigt_swiginit(self, _libBornAgainCore.new_FTDistribution1DVoigt(*args))
def clone(self):
r"""
@@ -11237,13 +11242,21 @@ class IFTDistribution2D(ICloneable, INode):
"""
return _libBornAgainCore.IFTDistribution2D_clone(self)
- def setGamma(self, gamma):
+ def omegaX(self):
+ r"""
+ omegaX(IFTDistribution2D self) -> double
+ double IFTDistribution2D::omegaX() const
+
+ """
+ return _libBornAgainCore.IFTDistribution2D_omegaX(self)
+
+ def omegaY(self):
r"""
- setGamma(IFTDistribution2D self, double gamma)
- void IFTDistribution2D::setGamma(double gamma)
+ omegaY(IFTDistribution2D self) -> double
+ double IFTDistribution2D::omegaY() const
"""
- return _libBornAgainCore.IFTDistribution2D_setGamma(self, gamma)
+ return _libBornAgainCore.IFTDistribution2D_omegaY(self)
def gamma(self):
r"""
@@ -11261,22 +11274,6 @@ class IFTDistribution2D(ICloneable, INode):
"""
return _libBornAgainCore.IFTDistribution2D_delta(self)
- def omegaX(self):
- r"""
- omegaX(IFTDistribution2D self) -> double
- double IFTDistribution2D::omegaX() const
-
- """
- return _libBornAgainCore.IFTDistribution2D_omegaX(self)
-
- def omegaY(self):
- r"""
- omegaY(IFTDistribution2D self) -> double
- double IFTDistribution2D::omegaY() const
-
- """
- return _libBornAgainCore.IFTDistribution2D_omegaY(self)
-
def evaluate(self, qx, qy):
r"""
evaluate(IFTDistribution2D self, double qx, double qy) -> double
@@ -11304,13 +11301,14 @@ class FTDistribution2DCauchy(IFTDistribution2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega_x, omega_y, gamma):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution2DCauchy self, vdouble1d_t P) -> FTDistribution2DCauchy
__init__(FTDistribution2DCauchy self, double omega_x, double omega_y, double gamma) -> FTDistribution2DCauchy
FTDistribution2DCauchy::FTDistribution2DCauchy(double omega_x, double omega_y, double gamma=0)
"""
- _libBornAgainCore.FTDistribution2DCauchy_swiginit(self, _libBornAgainCore.new_FTDistribution2DCauchy(omega_x, omega_y, gamma))
+ _libBornAgainCore.FTDistribution2DCauchy_swiginit(self, _libBornAgainCore.new_FTDistribution2DCauchy(*args))
def clone(self):
r"""
@@ -11357,13 +11355,14 @@ class FTDistribution2DGauss(IFTDistribution2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega_x, omega_y, gamma):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution2DGauss self, vdouble1d_t P) -> FTDistribution2DGauss
__init__(FTDistribution2DGauss self, double omega_x, double omega_y, double gamma) -> FTDistribution2DGauss
FTDistribution2DGauss::FTDistribution2DGauss(double omega_x, double omega_y, double gamma=0)
"""
- _libBornAgainCore.FTDistribution2DGauss_swiginit(self, _libBornAgainCore.new_FTDistribution2DGauss(omega_x, omega_y, gamma))
+ _libBornAgainCore.FTDistribution2DGauss_swiginit(self, _libBornAgainCore.new_FTDistribution2DGauss(*args))
def clone(self):
r"""
@@ -11410,13 +11409,14 @@ class FTDistribution2DGate(IFTDistribution2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega_x, omega_y, gamma):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution2DGate self, vdouble1d_t P) -> FTDistribution2DGate
__init__(FTDistribution2DGate self, double omega_x, double omega_y, double gamma) -> FTDistribution2DGate
FTDistribution2DGate::FTDistribution2DGate(double omega_x, double omega_y, double gamma=0)
"""
- _libBornAgainCore.FTDistribution2DGate_swiginit(self, _libBornAgainCore.new_FTDistribution2DGate(omega_x, omega_y, gamma))
+ _libBornAgainCore.FTDistribution2DGate_swiginit(self, _libBornAgainCore.new_FTDistribution2DGate(*args))
def clone(self):
r"""
@@ -11463,13 +11463,14 @@ class FTDistribution2DCone(IFTDistribution2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega_x, omega_y, gamma):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution2DCone self, vdouble1d_t P) -> FTDistribution2DCone
__init__(FTDistribution2DCone self, double omega_x, double omega_y, double gamma) -> FTDistribution2DCone
FTDistribution2DCone::FTDistribution2DCone(double omega_x, double omega_y, double gamma=0)
"""
- _libBornAgainCore.FTDistribution2DCone_swiginit(self, _libBornAgainCore.new_FTDistribution2DCone(omega_x, omega_y, gamma))
+ _libBornAgainCore.FTDistribution2DCone_swiginit(self, _libBornAgainCore.new_FTDistribution2DCone(*args))
def clone(self):
r"""
@@ -11516,8 +11517,9 @@ class FTDistribution2DVoigt(IFTDistribution2D):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, omega_x, omega_y, gamma, eta):
+ def __init__(self, *args):
r"""
+ __init__(FTDistribution2DVoigt self, vdouble1d_t P) -> FTDistribution2DVoigt
__init__(FTDistribution2DVoigt self, double omega_x, double omega_y, double gamma, double eta) -> FTDistribution2DVoigt
FTDistribution2DVoigt::FTDistribution2DVoigt(double omega_x, double omega_y, double eta, double gamma=0)
@@ -11539,7 +11541,7 @@ class FTDistribution2DVoigt(IFTDistribution2D):
angle in direct space between first lattice vector and x-axis of the distribution in radians
"""
- _libBornAgainCore.FTDistribution2DVoigt_swiginit(self, _libBornAgainCore.new_FTDistribution2DVoigt(omega_x, omega_y, gamma, eta))
+ _libBornAgainCore.FTDistribution2DVoigt_swiginit(self, _libBornAgainCore.new_FTDistribution2DVoigt(*args))
def clone(self):
r"""
@@ -12114,7 +12116,6 @@ class IInterferenceFunction(ISample):
else:
_self = self
_libBornAgainCore.IInterferenceFunction_swiginit(self, _libBornAgainCore.new_IInterferenceFunction(_self, *args))
- __swig_destroy__ = _libBornAgainCore.delete_IInterferenceFunction
def clone(self):
r"""
@@ -12189,6 +12190,7 @@ class IInterferenceFunction(ISample):
def iff_without_dw(self, q):
r"""iff_without_dw(IInterferenceFunction self, kvector_t q) -> double"""
return _libBornAgainCore.IInterferenceFunction_iff_without_dw(self, q)
+ __swig_destroy__ = _libBornAgainCore.delete_IInterferenceFunction
def __disown__(self):
self.this.disown()
_libBornAgainCore.disown_IInterferenceFunction(self)
@@ -13906,13 +13908,14 @@ class FootprintGauss(IFootprintFactor):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, width_ratio):
+ def __init__(self, *args):
r"""
+ __init__(FootprintGauss self, vdouble1d_t P) -> FootprintGauss
__init__(FootprintGauss self, double width_ratio) -> FootprintGauss
FootprintGauss::FootprintGauss(double width_ratio)
"""
- _libBornAgainCore.FootprintGauss_swiginit(self, _libBornAgainCore.new_FootprintGauss(width_ratio))
+ _libBornAgainCore.FootprintGauss_swiginit(self, _libBornAgainCore.new_FootprintGauss(*args))
def accept(self, visitor):
r"""
@@ -13969,13 +13972,14 @@ class FootprintSquare(IFootprintFactor):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, width_ratio):
+ def __init__(self, *args):
r"""
+ __init__(FootprintSquare self, vdouble1d_t P) -> FootprintSquare
__init__(FootprintSquare self, double width_ratio) -> FootprintSquare
FootprintSquare::FootprintSquare(double width_ratio)
"""
- _libBornAgainCore.FootprintSquare_swiginit(self, _libBornAgainCore.new_FootprintSquare(width_ratio))
+ _libBornAgainCore.FootprintSquare_swiginit(self, _libBornAgainCore.new_FootprintSquare(*args))
def accept(self, visitor):
r"""
@@ -15076,15 +15080,8 @@ class FormFactorPolygonalSurface(IFormFactorBorn):
# Register FormFactorPolygonalSurface in _libBornAgainCore:
_libBornAgainCore.FormFactorPolygonalSurface_swigregister(FormFactorPolygonalSurface)
-class ProfileBar(IFormFactorBorn):
- r"""
-
-
- Base class for form factors with a cosine ripple profile in the yz plane.
-
- C++ includes: ProfileBar.h
-
- """
+class IProfileRipple(IFormFactorBorn):
+ r"""Proxy of C++ IProfileRipple class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
@@ -15093,188 +15090,83 @@ class ProfileBar(IFormFactorBorn):
__repr__ = _swig_repr
def getLength(self):
- r"""
- getLength(ProfileBar self) -> double
- double ProfileBar::getLength() const
-
- """
- return _libBornAgainCore.ProfileBar_getLength(self)
+ r"""getLength(IProfileRipple self) -> double"""
+ return _libBornAgainCore.IProfileRipple_getLength(self)
def getHeight(self):
- r"""
- getHeight(ProfileBar self) -> double
- double ProfileBar::getHeight() const
-
- """
- return _libBornAgainCore.ProfileBar_getHeight(self)
+ r"""getHeight(IProfileRipple self) -> double"""
+ return _libBornAgainCore.IProfileRipple_getHeight(self)
def getWidth(self):
- r"""
- getWidth(ProfileBar self) -> double
- double ProfileBar::getWidth() const
-
- """
- return _libBornAgainCore.ProfileBar_getWidth(self)
+ r"""getWidth(IProfileRipple self) -> double"""
+ return _libBornAgainCore.IProfileRipple_getWidth(self)
def radialExtension(self):
r"""
- radialExtension(ProfileBar self) -> double
- double ProfileBar::radialExtension() const override final
+ radialExtension(IProfileRipple self) -> double
+ virtual double IFormFactor::radialExtension() const =0
Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations
"""
- return _libBornAgainCore.ProfileBar_radialExtension(self)
+ return _libBornAgainCore.IProfileRipple_radialExtension(self)
def evaluate_for_q(self, q):
r"""
- evaluate_for_q(ProfileBar self, cvector_t q) -> complex_t
- complex_t ProfileBar::evaluate_for_q(cvector_t q) const override final
+ evaluate_for_q(IProfileRipple self, cvector_t q) -> complex_t
+ virtual complex_t IFormFactorBorn::evaluate_for_q(cvector_t q) const =0
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.
"""
- return _libBornAgainCore.ProfileBar_evaluate_for_q(self, q)
- __swig_destroy__ = _libBornAgainCore.delete_ProfileBar
+ return _libBornAgainCore.IProfileRipple_evaluate_for_q(self, q)
+ __swig_destroy__ = _libBornAgainCore.delete_IProfileRipple
-# Register ProfileBar in _libBornAgainCore:
-_libBornAgainCore.ProfileBar_swigregister(ProfileBar)
-
-class ProfileRipple1(IFormFactorBorn):
- r"""
+# Register IProfileRipple in _libBornAgainCore:
+_libBornAgainCore.IProfileRipple_swigregister(IProfileRipple)
-
- Base class for form factors with a cosine ripple profile in the yz plane.
-
- C++ includes: ProfileRipple1.h
-
- """
+class IProfileRectangularRipple(IProfileRipple):
+ r"""Proxy of C++ IProfileRectangularRipple class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
def __init__(self, *args, **kwargs):
raise AttributeError("No constructor defined - class is abstract")
__repr__ = _swig_repr
+ __swig_destroy__ = _libBornAgainCore.delete_IProfileRectangularRipple
- def getLength(self):
- r"""
- getLength(ProfileRipple1 self) -> double
- double ProfileRipple1::getLength() const
-
- """
- return _libBornAgainCore.ProfileRipple1_getLength(self)
-
- def getHeight(self):
- r"""
- getHeight(ProfileRipple1 self) -> double
- double ProfileRipple1::getHeight() const
-
- """
- return _libBornAgainCore.ProfileRipple1_getHeight(self)
-
- def getWidth(self):
- r"""
- getWidth(ProfileRipple1 self) -> double
- double ProfileRipple1::getWidth() const
-
- """
- return _libBornAgainCore.ProfileRipple1_getWidth(self)
-
- def radialExtension(self):
- r"""
- radialExtension(ProfileRipple1 self) -> double
- double ProfileRipple1::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
-
- """
- return _libBornAgainCore.ProfileRipple1_radialExtension(self)
-
- def evaluate_for_q(self, q):
- r"""
- evaluate_for_q(ProfileRipple1 self, cvector_t q) -> complex_t
- complex_t ProfileRipple1::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.
-
- """
- return _libBornAgainCore.ProfileRipple1_evaluate_for_q(self, q)
- __swig_destroy__ = _libBornAgainCore.delete_ProfileRipple1
-
-# Register ProfileRipple1 in _libBornAgainCore:
-_libBornAgainCore.ProfileRipple1_swigregister(ProfileRipple1)
-
-class ProfileRipple2(IFormFactorBorn):
- r"""
+# Register IProfileRectangularRipple in _libBornAgainCore:
+_libBornAgainCore.IProfileRectangularRipple_swigregister(IProfileRectangularRipple)
-
- Base class for form factors with a cosine ripple profile in the yz plane.
-
- C++ includes: ProfileRipple2.h
-
- """
+class ICosineRipple(IProfileRipple):
+ r"""Proxy of C++ ICosineRipple class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
def __init__(self, *args, **kwargs):
raise AttributeError("No constructor defined - class is abstract")
__repr__ = _swig_repr
+ __swig_destroy__ = _libBornAgainCore.delete_ICosineRipple
- def getLength(self):
- r"""
- getLength(ProfileRipple2 self) -> double
- double ProfileRipple2::getLength() const
-
- """
- return _libBornAgainCore.ProfileRipple2_getLength(self)
+# Register ICosineRipple in _libBornAgainCore:
+_libBornAgainCore.ICosineRipple_swigregister(ICosineRipple)
- def getHeight(self):
- r"""
- getHeight(ProfileRipple2 self) -> double
- double ProfileRipple2::getHeight() const
-
- """
- return _libBornAgainCore.ProfileRipple2_getHeight(self)
+class ISawtoothRipple(IProfileRipple):
+ r"""Proxy of C++ ISawtoothRipple class."""
- def getWidth(self):
- r"""
- getWidth(ProfileRipple2 self) -> double
- double ProfileRipple2::getWidth() const
+ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
- """
- return _libBornAgainCore.ProfileRipple2_getWidth(self)
+ def __init__(self, *args, **kwargs):
+ raise AttributeError("No constructor defined - class is abstract")
+ __repr__ = _swig_repr
def getAsymmetry(self):
- r"""
- getAsymmetry(ProfileRipple2 self) -> double
- double ProfileRipple2::getAsymmetry() const
+ r"""getAsymmetry(ISawtoothRipple self) -> double"""
+ return _libBornAgainCore.ISawtoothRipple_getAsymmetry(self)
+ __swig_destroy__ = _libBornAgainCore.delete_ISawtoothRipple
- """
- return _libBornAgainCore.ProfileRipple2_getAsymmetry(self)
-
- def radialExtension(self):
- r"""
- radialExtension(ProfileRipple2 self) -> double
- double ProfileRipple2::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
-
- """
- return _libBornAgainCore.ProfileRipple2_radialExtension(self)
-
- def evaluate_for_q(self, q):
- r"""
- evaluate_for_q(ProfileRipple2 self, cvector_t q) -> complex_t
- complex_t ProfileRipple2::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.
-
- """
- return _libBornAgainCore.ProfileRipple2_evaluate_for_q(self, q)
- __swig_destroy__ = _libBornAgainCore.delete_ProfileRipple2
-
-# Register ProfileRipple2 in _libBornAgainCore:
-_libBornAgainCore.ProfileRipple2_swigregister(ProfileRipple2)
+# Register ISawtoothRipple in _libBornAgainCore:
+_libBornAgainCore.ISawtoothRipple_swigregister(ISawtoothRipple)
class FormFactorAnisoPyramid(FormFactorPolyhedron):
r"""
@@ -15289,8 +15181,9 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, width, height, alpha):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorAnisoPyramid self, vdouble1d_t P) -> FormFactorAnisoPyramid
__init__(FormFactorAnisoPyramid self, double length, double width, double height, double alpha) -> FormFactorAnisoPyramid
FormFactorAnisoPyramid::FormFactorAnisoPyramid(double length, double width, double height, double alpha)
@@ -15312,7 +15205,7 @@ class FormFactorAnisoPyramid(FormFactorPolyhedron):
dihedral angle in radians between base and facet
"""
- _libBornAgainCore.FormFactorAnisoPyramid_swiginit(self, _libBornAgainCore.new_FormFactorAnisoPyramid(length, width, height, alpha))
+ _libBornAgainCore.FormFactorAnisoPyramid_swiginit(self, _libBornAgainCore.new_FormFactorAnisoPyramid(*args))
def clone(self):
r"""
@@ -15383,8 +15276,9 @@ class FormFactorBox(FormFactorPolygonalPrism):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, width, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorBox self, vdouble1d_t P) -> FormFactorBox
__init__(FormFactorBox self, double length, double width, double height) -> FormFactorBox
FormFactorBox::FormFactorBox(double length, double width, double height)
@@ -15403,7 +15297,7 @@ class FormFactorBox(FormFactorPolygonalPrism):
height of the box in nanometers
"""
- _libBornAgainCore.FormFactorBox_swiginit(self, _libBornAgainCore.new_FormFactorBox(length, width, height))
+ _libBornAgainCore.FormFactorBox_swiginit(self, _libBornAgainCore.new_FormFactorBox(*args))
def clone(self):
r"""
@@ -15488,8 +15382,9 @@ class FormFactorCantellatedCube(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, removed_length):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorCantellatedCube self, vdouble1d_t P) -> FormFactorCantellatedCube
__init__(FormFactorCantellatedCube self, double length, double removed_length) -> FormFactorCantellatedCube
FormFactorCantellatedCube::FormFactorCantellatedCube(double length, double removed_length)
@@ -15505,7 +15400,7 @@ class FormFactorCantellatedCube(FormFactorPolyhedron):
removed length from each edge of the cube in nanometers
"""
- _libBornAgainCore.FormFactorCantellatedCube_swiginit(self, _libBornAgainCore.new_FormFactorCantellatedCube(length, removed_length))
+ _libBornAgainCore.FormFactorCantellatedCube_swiginit(self, _libBornAgainCore.new_FormFactorCantellatedCube(*args))
def clone(self):
r"""
@@ -15560,8 +15455,9 @@ class FormFactorCone(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius, height, alpha):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorCone self, vdouble1d_t P) -> FormFactorCone
__init__(FormFactorCone self, double radius, double height, double alpha) -> FormFactorCone
FormFactorCone::FormFactorCone(double radius, double height, double alpha)
@@ -15580,7 +15476,7 @@ class FormFactorCone(IFormFactorBorn):
angle between the base and the side surface in radians
"""
- _libBornAgainCore.FormFactorCone_swiginit(self, _libBornAgainCore.new_FormFactorCone(radius, height, alpha))
+ _libBornAgainCore.FormFactorCone_swiginit(self, _libBornAgainCore.new_FormFactorCone(*args))
def clone(self):
r"""
@@ -15663,8 +15559,9 @@ class FormFactorCone6(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, base_edge, height, alpha):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorCone6 self, vdouble1d_t P) -> FormFactorCone6
__init__(FormFactorCone6 self, double base_edge, double height, double alpha) -> FormFactorCone6
FormFactorCone6::FormFactorCone6(double base_edge, double height, double alpha)
@@ -15683,7 +15580,7 @@ class FormFactorCone6(FormFactorPolyhedron):
dihedral angle in radians between base and facet
"""
- _libBornAgainCore.FormFactorCone6_swiginit(self, _libBornAgainCore.new_FormFactorCone6(base_edge, height, alpha))
+ _libBornAgainCore.FormFactorCone6_swiginit(self, _libBornAgainCore.new_FormFactorCone6(*args))
def clone(self):
r"""
@@ -15733,6 +15630,117 @@ class FormFactorCone6(FormFactorPolyhedron):
# Register FormFactorCone6 in _libBornAgainCore:
_libBornAgainCore.FormFactorCone6_swigregister(FormFactorCone6)
+class FormFactorCosineRippleBox(ICosineRipple):
+ r"""Proxy of C++ FormFactorCosineRippleBox class."""
+
+ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
+ __repr__ = _swig_repr
+
+ def __init__(self, *args):
+ r"""
+ __init__(FormFactorCosineRippleBox self, vdouble1d_t P) -> FormFactorCosineRippleBox
+ __init__(FormFactorCosineRippleBox self, double length, double width, double height) -> FormFactorCosineRippleBox
+ """
+ _libBornAgainCore.FormFactorCosineRippleBox_swiginit(self, _libBornAgainCore.new_FormFactorCosineRippleBox(*args))
+
+ def clone(self):
+ r"""
+ clone(FormFactorCosineRippleBox self) -> FormFactorCosineRippleBox
+ IFormFactorBorn* IFormFactorBorn::clone() const override=0
+
+ Returns a clone of this ISample object.
+
+ """
+ return _libBornAgainCore.FormFactorCosineRippleBox_clone(self)
+
+ def accept(self, visitor):
+ r"""
+ accept(FormFactorCosineRippleBox self, INodeVisitor visitor)
+ virtual void INode::accept(INodeVisitor *visitor) const =0
+
+ Calls the INodeVisitor's visit method.
+
+ """
+ return _libBornAgainCore.FormFactorCosineRippleBox_accept(self, visitor)
+ __swig_destroy__ = _libBornAgainCore.delete_FormFactorCosineRippleBox
+
+# Register FormFactorCosineRippleBox in _libBornAgainCore:
+_libBornAgainCore.FormFactorCosineRippleBox_swigregister(FormFactorCosineRippleBox)
+
+class FormFactorCosineRippleGauss(ICosineRipple):
+ r"""Proxy of C++ FormFactorCosineRippleGauss class."""
+
+ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
+ __repr__ = _swig_repr
+
+ def __init__(self, *args):
+ r"""
+ __init__(FormFactorCosineRippleGauss self, vdouble1d_t P) -> FormFactorCosineRippleGauss
+ __init__(FormFactorCosineRippleGauss self, double length, double width, double height) -> FormFactorCosineRippleGauss
+ """
+ _libBornAgainCore.FormFactorCosineRippleGauss_swiginit(self, _libBornAgainCore.new_FormFactorCosineRippleGauss(*args))
+
+ def clone(self):
+ r"""
+ clone(FormFactorCosineRippleGauss self) -> FormFactorCosineRippleGauss
+ IFormFactorBorn* IFormFactorBorn::clone() const override=0
+
+ Returns a clone of this ISample object.
+
+ """
+ return _libBornAgainCore.FormFactorCosineRippleGauss_clone(self)
+
+ def accept(self, visitor):
+ r"""
+ accept(FormFactorCosineRippleGauss self, INodeVisitor visitor)
+ virtual void INode::accept(INodeVisitor *visitor) const =0
+
+ Calls the INodeVisitor's visit method.
+
+ """
+ return _libBornAgainCore.FormFactorCosineRippleGauss_accept(self, visitor)
+ __swig_destroy__ = _libBornAgainCore.delete_FormFactorCosineRippleGauss
+
+# Register FormFactorCosineRippleGauss in _libBornAgainCore:
+_libBornAgainCore.FormFactorCosineRippleGauss_swigregister(FormFactorCosineRippleGauss)
+
+class FormFactorCosineRippleLorentz(ICosineRipple):
+ r"""Proxy of C++ FormFactorCosineRippleLorentz class."""
+
+ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
+ __repr__ = _swig_repr
+
+ def __init__(self, *args):
+ r"""
+ __init__(FormFactorCosineRippleLorentz self, vdouble1d_t P) -> FormFactorCosineRippleLorentz
+ __init__(FormFactorCosineRippleLorentz self, double length, double width, double height) -> FormFactorCosineRippleLorentz
+ """
+ _libBornAgainCore.FormFactorCosineRippleLorentz_swiginit(self, _libBornAgainCore.new_FormFactorCosineRippleLorentz(*args))
+
+ def clone(self):
+ r"""
+ clone(FormFactorCosineRippleLorentz self) -> FormFactorCosineRippleLorentz
+ IFormFactorBorn* IFormFactorBorn::clone() const override=0
+
+ Returns a clone of this ISample object.
+
+ """
+ return _libBornAgainCore.FormFactorCosineRippleLorentz_clone(self)
+
+ def accept(self, visitor):
+ r"""
+ accept(FormFactorCosineRippleLorentz self, INodeVisitor visitor)
+ virtual void INode::accept(INodeVisitor *visitor) const =0
+
+ Calls the INodeVisitor's visit method.
+
+ """
+ return _libBornAgainCore.FormFactorCosineRippleLorentz_accept(self, visitor)
+ __swig_destroy__ = _libBornAgainCore.delete_FormFactorCosineRippleLorentz
+
+# Register FormFactorCosineRippleLorentz in _libBornAgainCore:
+_libBornAgainCore.FormFactorCosineRippleLorentz_swigregister(FormFactorCosineRippleLorentz)
+
class FormFactorCuboctahedron(FormFactorPolyhedron):
r"""
@@ -15746,8 +15754,9 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, height, height_ratio, alpha):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorCuboctahedron self, vdouble1d_t P) -> FormFactorCuboctahedron
__init__(FormFactorCuboctahedron self, double length, double height, double height_ratio, double alpha) -> FormFactorCuboctahedron
FormFactorCuboctahedron::FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha)
@@ -15769,7 +15778,7 @@ class FormFactorCuboctahedron(FormFactorPolyhedron):
dihedral angle in radians between base and facet
"""
- _libBornAgainCore.FormFactorCuboctahedron_swiginit(self, _libBornAgainCore.new_FormFactorCuboctahedron(length, height, height_ratio, alpha))
+ _libBornAgainCore.FormFactorCuboctahedron_swiginit(self, _libBornAgainCore.new_FormFactorCuboctahedron(*args))
def clone(self):
r"""
@@ -15840,8 +15849,9 @@ class FormFactorCylinder(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorCylinder self, vdouble1d_t P) -> FormFactorCylinder
__init__(FormFactorCylinder self, double radius, double height) -> FormFactorCylinder
FormFactorCylinder::FormFactorCylinder(double radius, double height)
@@ -15857,7 +15867,7 @@ class FormFactorCylinder(IFormFactorBorn):
height of the cylinder in nanometers
"""
- _libBornAgainCore.FormFactorCylinder_swiginit(self, _libBornAgainCore.new_FormFactorCylinder(radius, height))
+ _libBornAgainCore.FormFactorCylinder_swiginit(self, _libBornAgainCore.new_FormFactorCylinder(*args))
def clone(self):
r"""
@@ -15932,8 +15942,9 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, edge):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorDodecahedron self, vdouble1d_t P) -> FormFactorDodecahedron
__init__(FormFactorDodecahedron self, double edge) -> FormFactorDodecahedron
FormFactorDodecahedron::FormFactorDodecahedron(double edge)
@@ -15954,7 +15965,7 @@ class FormFactorDodecahedron(FormFactorPolyhedron):
length of the edge in nanometers
"""
- _libBornAgainCore.FormFactorDodecahedron_swiginit(self, _libBornAgainCore.new_FormFactorDodecahedron(edge))
+ _libBornAgainCore.FormFactorDodecahedron_swiginit(self, _libBornAgainCore.new_FormFactorDodecahedron(*args))
def clone(self):
r"""
@@ -16001,8 +16012,9 @@ class FormFactorDot(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorDot self, vdouble1d_t P) -> FormFactorDot
__init__(FormFactorDot self, double radius) -> FormFactorDot
FormFactorDot::FormFactorDot(double radius)
@@ -16015,7 +16027,7 @@ class FormFactorDot(IFormFactorBorn):
radius of a sphere with same forward scattering power, in nanometers
"""
- _libBornAgainCore.FormFactorDot_swiginit(self, _libBornAgainCore.new_FormFactorDot(radius))
+ _libBornAgainCore.FormFactorDot_swiginit(self, _libBornAgainCore.new_FormFactorDot(*args))
def clone(self):
r"""
@@ -16102,8 +16114,9 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius_x, radius_y, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorEllipsoidalCylinder self, vdouble1d_t P) -> FormFactorEllipsoidalCylinder
__init__(FormFactorEllipsoidalCylinder self, double radius_x, double radius_y, double height) -> FormFactorEllipsoidalCylinder
FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height)
@@ -16122,7 +16135,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn):
height of the ellipsoidal cylinder in nanometers
"""
- _libBornAgainCore.FormFactorEllipsoidalCylinder_swiginit(self, _libBornAgainCore.new_FormFactorEllipsoidalCylinder(radius_x, radius_y, height))
+ _libBornAgainCore.FormFactorEllipsoidalCylinder_swiginit(self, _libBornAgainCore.new_FormFactorEllipsoidalCylinder(*args))
def clone(self):
r"""
@@ -16205,8 +16218,9 @@ class FormFactorFullSphere(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius, position_at_center=False):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorFullSphere self, vdouble1d_t P, bool position_at_center=False) -> FormFactorFullSphere
__init__(FormFactorFullSphere self, double radius, bool position_at_center=False) -> FormFactorFullSphere
FormFactorFullSphere::FormFactorFullSphere(double radius, bool position_at_center=false)
@@ -16219,7 +16233,7 @@ class FormFactorFullSphere(IFormFactorBorn):
radius of the sphere in nanometers
"""
- _libBornAgainCore.FormFactorFullSphere_swiginit(self, _libBornAgainCore.new_FormFactorFullSphere(radius, position_at_center))
+ _libBornAgainCore.FormFactorFullSphere_swiginit(self, _libBornAgainCore.new_FormFactorFullSphere(*args))
def clone(self):
r"""
@@ -16306,8 +16320,9 @@ class FormFactorFullSpheroid(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorFullSpheroid self, vdouble1d_t P) -> FormFactorFullSpheroid
__init__(FormFactorFullSpheroid self, double radius, double height) -> FormFactorFullSpheroid
FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height)
@@ -16323,7 +16338,7 @@ class FormFactorFullSpheroid(IFormFactorBorn):
height of the full spheroid in nanometers
"""
- _libBornAgainCore.FormFactorFullSpheroid_swiginit(self, _libBornAgainCore.new_FormFactorFullSpheroid(radius, height))
+ _libBornAgainCore.FormFactorFullSpheroid_swiginit(self, _libBornAgainCore.new_FormFactorFullSpheroid(*args))
def clone(self):
r"""
@@ -16398,8 +16413,9 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius_x, radius_y, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorHemiEllipsoid self, vdouble1d_t P) -> FormFactorHemiEllipsoid
__init__(FormFactorHemiEllipsoid self, double radius_x, double radius_y, double height) -> FormFactorHemiEllipsoid
FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double radius_x, double radius_y, double height)
@@ -16418,7 +16434,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn):
height of the hemi ellipsoid in nanometers
"""
- _libBornAgainCore.FormFactorHemiEllipsoid_swiginit(self, _libBornAgainCore.new_FormFactorHemiEllipsoid(radius_x, radius_y, height))
+ _libBornAgainCore.FormFactorHemiEllipsoid_swiginit(self, _libBornAgainCore.new_FormFactorHemiEllipsoid(*args))
__swig_destroy__ = _libBornAgainCore.delete_FormFactorHemiEllipsoid
def clone(self):
@@ -16501,13 +16517,14 @@ class FormFactorHollowSphere(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, mean, full_width):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorHollowSphere self, vdouble1d_t P) -> FormFactorHollowSphere
__init__(FormFactorHollowSphere self, double mean, double full_width) -> FormFactorHollowSphere
FormFactorHollowSphere::FormFactorHollowSphere(double mean, double full_width)
"""
- _libBornAgainCore.FormFactorHollowSphere_swiginit(self, _libBornAgainCore.new_FormFactorHollowSphere(mean, full_width))
+ _libBornAgainCore.FormFactorHollowSphere_swiginit(self, _libBornAgainCore.new_FormFactorHollowSphere(*args))
def clone(self):
r"""
@@ -16566,8 +16583,9 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, edge):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorIcosahedron self, vdouble1d_t P) -> FormFactorIcosahedron
__init__(FormFactorIcosahedron self, double edge) -> FormFactorIcosahedron
FormFactorIcosahedron::FormFactorIcosahedron(double edge)
@@ -16580,7 +16598,7 @@ class FormFactorIcosahedron(FormFactorPolyhedron):
length of the edge in nanometers
"""
- _libBornAgainCore.FormFactorIcosahedron_swiginit(self, _libBornAgainCore.new_FormFactorIcosahedron(edge))
+ _libBornAgainCore.FormFactorIcosahedron_swiginit(self, _libBornAgainCore.new_FormFactorIcosahedron(*args))
def clone(self):
r"""
@@ -16627,8 +16645,9 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, width, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorLongBoxGauss self, vdouble1d_t P) -> FormFactorLongBoxGauss
__init__(FormFactorLongBoxGauss self, double length, double width, double height) -> FormFactorLongBoxGauss
FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, double height)
@@ -16647,7 +16666,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn):
of Box
"""
- _libBornAgainCore.FormFactorLongBoxGauss_swiginit(self, _libBornAgainCore.new_FormFactorLongBoxGauss(length, width, height))
+ _libBornAgainCore.FormFactorLongBoxGauss_swiginit(self, _libBornAgainCore.new_FormFactorLongBoxGauss(*args))
def clone(self):
r"""
@@ -16730,8 +16749,9 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, width, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorLongBoxLorentz self, vdouble1d_t P) -> FormFactorLongBoxLorentz
__init__(FormFactorLongBoxLorentz self, double length, double width, double height) -> FormFactorLongBoxLorentz
FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width, double height)
@@ -16750,7 +16770,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn):
of Box
"""
- _libBornAgainCore.FormFactorLongBoxLorentz_swiginit(self, _libBornAgainCore.new_FormFactorLongBoxLorentz(length, width, height))
+ _libBornAgainCore.FormFactorLongBoxLorentz_swiginit(self, _libBornAgainCore.new_FormFactorLongBoxLorentz(*args))
def clone(self):
r"""
@@ -16833,8 +16853,9 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, base_edge, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorPrism3 self, vdouble1d_t P) -> FormFactorPrism3
__init__(FormFactorPrism3 self, double base_edge, double height) -> FormFactorPrism3
FormFactorPrism3::FormFactorPrism3(double base_edge, double height)
@@ -16850,7 +16871,7 @@ class FormFactorPrism3(FormFactorPolygonalPrism):
height in nanometers
"""
- _libBornAgainCore.FormFactorPrism3_swiginit(self, _libBornAgainCore.new_FormFactorPrism3(base_edge, height))
+ _libBornAgainCore.FormFactorPrism3_swiginit(self, _libBornAgainCore.new_FormFactorPrism3(*args))
def clone(self):
r"""
@@ -16897,8 +16918,9 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, base_edge, height):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorPrism6 self, vdouble1d_t P) -> FormFactorPrism6
__init__(FormFactorPrism6 self, double base_edge, double height) -> FormFactorPrism6
FormFactorPrism6::FormFactorPrism6(double base_edge, double height)
@@ -16914,7 +16936,7 @@ class FormFactorPrism6(FormFactorPolygonalPrism):
height in nanometers
"""
- _libBornAgainCore.FormFactorPrism6_swiginit(self, _libBornAgainCore.new_FormFactorPrism6(base_edge, height))
+ _libBornAgainCore.FormFactorPrism6_swiginit(self, _libBornAgainCore.new_FormFactorPrism6(*args))
def clone(self):
r"""
@@ -16961,8 +16983,9 @@ class FormFactorPyramid(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, base_edge, height, alpha):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorPyramid self, vdouble1d_t P) -> FormFactorPyramid
__init__(FormFactorPyramid self, double base_edge, double height, double alpha) -> FormFactorPyramid
FormFactorPyramid::FormFactorPyramid(double base_edge, double height, double alpha)
@@ -16981,7 +17004,7 @@ class FormFactorPyramid(FormFactorPolyhedron):
dihedral angle between the base and a side face in radians
"""
- _libBornAgainCore.FormFactorPyramid_swiginit(self, _libBornAgainCore.new_FormFactorPyramid(base_edge, height, alpha))
+ _libBornAgainCore.FormFactorPyramid_swiginit(self, _libBornAgainCore.new_FormFactorPyramid(*args))
def clone(self):
r"""
@@ -17031,275 +17054,116 @@ class FormFactorPyramid(FormFactorPolyhedron):
# Register FormFactorPyramid in _libBornAgainCore:
_libBornAgainCore.FormFactorPyramid_swigregister(FormFactorPyramid)
-class FormFactorRipple1Box(ProfileRipple1):
- r"""
-
-
- The form factor for a cosine ripple, with box profile in elongation direction.
-
- C++ includes: FormFactorRipple1.h
-
- """
-
- thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
- __repr__ = _swig_repr
-
- def __init__(self, length, width, height):
- r"""
- __init__(FormFactorRipple1Box self, double length, double width, double height) -> FormFactorRipple1Box
- FormFactorRipple1Box::FormFactorRipple1Box(double length, double width, double height)
-
- """
- _libBornAgainCore.FormFactorRipple1Box_swiginit(self, _libBornAgainCore.new_FormFactorRipple1Box(length, width, height))
-
- def clone(self):
- r"""
- clone(FormFactorRipple1Box self) -> FormFactorRipple1Box
- FormFactorRipple1Box * FormFactorRipple1Box::clone() const override final
-
- Returns a clone of this ISample object.
-
- """
- return _libBornAgainCore.FormFactorRipple1Box_clone(self)
-
- def accept(self, visitor):
- r"""
- accept(FormFactorRipple1Box self, INodeVisitor visitor)
- void FormFactorRipple1Box::accept(INodeVisitor *visitor) const override final
-
- Calls the INodeVisitor's visit method.
-
- """
- return _libBornAgainCore.FormFactorRipple1Box_accept(self, visitor)
- __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple1Box
-
-# Register FormFactorRipple1Box in _libBornAgainCore:
-_libBornAgainCore.FormFactorRipple1Box_swigregister(FormFactorRipple1Box)
-
-class FormFactorRipple1Gauss(ProfileRipple1):
- r"""
-
-
- The form factor for a cosine ripple, with Gaussian profile in elongation direction.
-
- C++ includes: FormFactorRipple1.h
-
- """
-
- thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
- __repr__ = _swig_repr
-
- def __init__(self, length, width, height):
- r"""
- __init__(FormFactorRipple1Gauss self, double length, double width, double height) -> FormFactorRipple1Gauss
- FormFactorRipple1Gauss::FormFactorRipple1Gauss(double length, double width, double height)
-
- """
- _libBornAgainCore.FormFactorRipple1Gauss_swiginit(self, _libBornAgainCore.new_FormFactorRipple1Gauss(length, width, height))
-
- def clone(self):
- r"""
- clone(FormFactorRipple1Gauss self) -> FormFactorRipple1Gauss
- FormFactorRipple1Gauss * FormFactorRipple1Gauss::clone() const override final
-
- Returns a clone of this ISample object.
-
- """
- return _libBornAgainCore.FormFactorRipple1Gauss_clone(self)
-
- def accept(self, visitor):
- r"""
- accept(FormFactorRipple1Gauss self, INodeVisitor visitor)
- void FormFactorRipple1Gauss::accept(INodeVisitor *visitor) const override final
-
- Calls the INodeVisitor's visit method.
-
- """
- return _libBornAgainCore.FormFactorRipple1Gauss_accept(self, visitor)
- __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple1Gauss
-
-# Register FormFactorRipple1Gauss in _libBornAgainCore:
-_libBornAgainCore.FormFactorRipple1Gauss_swigregister(FormFactorRipple1Gauss)
-
-class FormFactorRipple1Lorentz(ProfileRipple1):
- r"""
-
-
- The form factor for a cosine ripple, with Lorentz form factor in elongation direction.
-
- C++ includes: FormFactorRipple1.h
-
- """
+class FormFactorSawtoothRippleBox(ISawtoothRipple):
+ r"""Proxy of C++ FormFactorSawtoothRippleBox class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, width, height):
- r"""
- __init__(FormFactorRipple1Lorentz self, double length, double width, double height) -> FormFactorRipple1Lorentz
- FormFactorRipple1Lorentz::FormFactorRipple1Lorentz(double length, double width, double height)
-
- """
- _libBornAgainCore.FormFactorRipple1Lorentz_swiginit(self, _libBornAgainCore.new_FormFactorRipple1Lorentz(length, width, height))
-
- def clone(self):
- r"""
- clone(FormFactorRipple1Lorentz self) -> FormFactorRipple1Lorentz
- FormFactorRipple1Lorentz * FormFactorRipple1Lorentz::clone() const override final
-
- Returns a clone of this ISample object.
-
- """
- return _libBornAgainCore.FormFactorRipple1Lorentz_clone(self)
-
- def accept(self, visitor):
- r"""
- accept(FormFactorRipple1Lorentz self, INodeVisitor visitor)
- void FormFactorRipple1Lorentz::accept(INodeVisitor *visitor) const override final
-
- Calls the INodeVisitor's visit method.
-
- """
- return _libBornAgainCore.FormFactorRipple1Lorentz_accept(self, visitor)
- __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple1Lorentz
-
-# Register FormFactorRipple1Lorentz in _libBornAgainCore:
-_libBornAgainCore.FormFactorRipple1Lorentz_swigregister(FormFactorRipple1Lorentz)
-
-class FormFactorRipple2Box(ProfileRipple2):
- r"""
-
-
- The form factor for a cosine ripple, with box profile in elongation direction.
-
- C++ includes: FormFactorRipple2.h
-
- """
-
- thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
- __repr__ = _swig_repr
-
- def __init__(self, length, width, height, asymmetry):
+ def __init__(self, *args):
r"""
- __init__(FormFactorRipple2Box self, double length, double width, double height, double asymmetry) -> FormFactorRipple2Box
- FormFactorRipple2Box::FormFactorRipple2Box(double length, double width, double height, double asymmetry)
-
+ __init__(FormFactorSawtoothRippleBox self, vdouble1d_t P) -> FormFactorSawtoothRippleBox
+ __init__(FormFactorSawtoothRippleBox self, double length, double width, double height, double asymmetry) -> FormFactorSawtoothRippleBox
"""
- _libBornAgainCore.FormFactorRipple2Box_swiginit(self, _libBornAgainCore.new_FormFactorRipple2Box(length, width, height, asymmetry))
+ _libBornAgainCore.FormFactorSawtoothRippleBox_swiginit(self, _libBornAgainCore.new_FormFactorSawtoothRippleBox(*args))
def clone(self):
r"""
- clone(FormFactorRipple2Box self) -> FormFactorRipple2Box
- FormFactorRipple2Box * FormFactorRipple2Box::clone() const override final
+ clone(FormFactorSawtoothRippleBox self) -> FormFactorSawtoothRippleBox
+ IFormFactorBorn* IFormFactorBorn::clone() const override=0
Returns a clone of this ISample object.
"""
- return _libBornAgainCore.FormFactorRipple2Box_clone(self)
+ return _libBornAgainCore.FormFactorSawtoothRippleBox_clone(self)
def accept(self, visitor):
r"""
- accept(FormFactorRipple2Box self, INodeVisitor visitor)
- void FormFactorRipple2Box::accept(INodeVisitor *visitor) const override final
+ accept(FormFactorSawtoothRippleBox self, INodeVisitor visitor)
+ virtual void INode::accept(INodeVisitor *visitor) const =0
Calls the INodeVisitor's visit method.
"""
- return _libBornAgainCore.FormFactorRipple2Box_accept(self, visitor)
- __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple2Box
-
-# Register FormFactorRipple2Box in _libBornAgainCore:
-_libBornAgainCore.FormFactorRipple2Box_swigregister(FormFactorRipple2Box)
-
-class FormFactorRipple2Gauss(ProfileRipple2):
- r"""
-
+ return _libBornAgainCore.FormFactorSawtoothRippleBox_accept(self, visitor)
+ __swig_destroy__ = _libBornAgainCore.delete_FormFactorSawtoothRippleBox
- The form factor for a cosine ripple, with Gaussian profile in elongation direction.
+# Register FormFactorSawtoothRippleBox in _libBornAgainCore:
+_libBornAgainCore.FormFactorSawtoothRippleBox_swigregister(FormFactorSawtoothRippleBox)
- C++ includes: FormFactorRipple2.h
-
- """
+class FormFactorSawtoothRippleGauss(ISawtoothRipple):
+ r"""Proxy of C++ FormFactorSawtoothRippleGauss class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, width, height, asymmetry):
+ def __init__(self, *args):
r"""
- __init__(FormFactorRipple2Gauss self, double length, double width, double height, double asymmetry) -> FormFactorRipple2Gauss
- FormFactorRipple2Gauss::FormFactorRipple2Gauss(double length, double width, double height, double asymmetry)
-
+ __init__(FormFactorSawtoothRippleGauss self, vdouble1d_t P) -> FormFactorSawtoothRippleGauss
+ __init__(FormFactorSawtoothRippleGauss self, double length, double width, double height, double asymmetry) -> FormFactorSawtoothRippleGauss
"""
- _libBornAgainCore.FormFactorRipple2Gauss_swiginit(self, _libBornAgainCore.new_FormFactorRipple2Gauss(length, width, height, asymmetry))
+ _libBornAgainCore.FormFactorSawtoothRippleGauss_swiginit(self, _libBornAgainCore.new_FormFactorSawtoothRippleGauss(*args))
def clone(self):
r"""
- clone(FormFactorRipple2Gauss self) -> FormFactorRipple2Gauss
- FormFactorRipple2Gauss * FormFactorRipple2Gauss::clone() const override final
+ clone(FormFactorSawtoothRippleGauss self) -> FormFactorSawtoothRippleGauss
+ IFormFactorBorn* IFormFactorBorn::clone() const override=0
Returns a clone of this ISample object.
"""
- return _libBornAgainCore.FormFactorRipple2Gauss_clone(self)
+ return _libBornAgainCore.FormFactorSawtoothRippleGauss_clone(self)
def accept(self, visitor):
r"""
- accept(FormFactorRipple2Gauss self, INodeVisitor visitor)
- void FormFactorRipple2Gauss::accept(INodeVisitor *visitor) const override final
+ accept(FormFactorSawtoothRippleGauss self, INodeVisitor visitor)
+ virtual void INode::accept(INodeVisitor *visitor) const =0
Calls the INodeVisitor's visit method.
"""
- return _libBornAgainCore.FormFactorRipple2Gauss_accept(self, visitor)
- __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple2Gauss
-
-# Register FormFactorRipple2Gauss in _libBornAgainCore:
-_libBornAgainCore.FormFactorRipple2Gauss_swigregister(FormFactorRipple2Gauss)
-
-class FormFactorRipple2Lorentz(ProfileRipple2):
- r"""
-
+ return _libBornAgainCore.FormFactorSawtoothRippleGauss_accept(self, visitor)
+ __swig_destroy__ = _libBornAgainCore.delete_FormFactorSawtoothRippleGauss
- The form factor for a cosine ripple, with Lorentz form factor in elongation direction.
+# Register FormFactorSawtoothRippleGauss in _libBornAgainCore:
+_libBornAgainCore.FormFactorSawtoothRippleGauss_swigregister(FormFactorSawtoothRippleGauss)
- C++ includes: FormFactorRipple2.h
-
- """
+class FormFactorSawtoothRippleLorentz(ISawtoothRipple):
+ r"""Proxy of C++ FormFactorSawtoothRippleLorentz class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, width, height, asymmetry):
+ def __init__(self, *args):
r"""
- __init__(FormFactorRipple2Lorentz self, double length, double width, double height, double asymmetry) -> FormFactorRipple2Lorentz
- FormFactorRipple2Lorentz::FormFactorRipple2Lorentz(double length, double width, double height, double asymmetry)
-
+ __init__(FormFactorSawtoothRippleLorentz self, vdouble1d_t P) -> FormFactorSawtoothRippleLorentz
+ __init__(FormFactorSawtoothRippleLorentz self, double length, double width, double height, double asymmetry) -> FormFactorSawtoothRippleLorentz
"""
- _libBornAgainCore.FormFactorRipple2Lorentz_swiginit(self, _libBornAgainCore.new_FormFactorRipple2Lorentz(length, width, height, asymmetry))
+ _libBornAgainCore.FormFactorSawtoothRippleLorentz_swiginit(self, _libBornAgainCore.new_FormFactorSawtoothRippleLorentz(*args))
def clone(self):
r"""
- clone(FormFactorRipple2Lorentz self) -> FormFactorRipple2Lorentz
- FormFactorRipple2Lorentz * FormFactorRipple2Lorentz::clone() const override final
+ clone(FormFactorSawtoothRippleLorentz self) -> FormFactorSawtoothRippleLorentz
+ IFormFactorBorn* IFormFactorBorn::clone() const override=0
Returns a clone of this ISample object.
"""
- return _libBornAgainCore.FormFactorRipple2Lorentz_clone(self)
+ return _libBornAgainCore.FormFactorSawtoothRippleLorentz_clone(self)
def accept(self, visitor):
r"""
- accept(FormFactorRipple2Lorentz self, INodeVisitor visitor)
- void FormFactorRipple2Lorentz::accept(INodeVisitor *visitor) const override final
+ accept(FormFactorSawtoothRippleLorentz self, INodeVisitor visitor)
+ virtual void INode::accept(INodeVisitor *visitor) const =0
Calls the INodeVisitor's visit method.
"""
- return _libBornAgainCore.FormFactorRipple2Lorentz_accept(self, visitor)
- __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple2Lorentz
+ return _libBornAgainCore.FormFactorSawtoothRippleLorentz_accept(self, visitor)
+ __swig_destroy__ = _libBornAgainCore.delete_FormFactorSawtoothRippleLorentz
-# Register FormFactorRipple2Lorentz in _libBornAgainCore:
-_libBornAgainCore.FormFactorRipple2Lorentz_swigregister(FormFactorRipple2Lorentz)
+# Register FormFactorSawtoothRippleLorentz in _libBornAgainCore:
+_libBornAgainCore.FormFactorSawtoothRippleLorentz_swigregister(FormFactorSawtoothRippleLorentz)
class FormFactorTetrahedron(FormFactorPolyhedron):
r"""
@@ -17314,8 +17178,9 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, base_edge, height, alpha):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorTetrahedron self, vdouble1d_t P) -> FormFactorTetrahedron
__init__(FormFactorTetrahedron self, double base_edge, double height, double alpha) -> FormFactorTetrahedron
FormFactorTetrahedron::FormFactorTetrahedron(double base_edge, double height, double alpha)
@@ -17334,7 +17199,7 @@ class FormFactorTetrahedron(FormFactorPolyhedron):
dihedral angle in radians between base and facet
"""
- _libBornAgainCore.FormFactorTetrahedron_swiginit(self, _libBornAgainCore.new_FormFactorTetrahedron(base_edge, height, alpha))
+ _libBornAgainCore.FormFactorTetrahedron_swiginit(self, _libBornAgainCore.new_FormFactorTetrahedron(*args))
def clone(self):
r"""
@@ -17397,8 +17262,9 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, length, removed_length):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorTruncatedCube self, vdouble1d_t P) -> FormFactorTruncatedCube
__init__(FormFactorTruncatedCube self, double length, double removed_length) -> FormFactorTruncatedCube
FormFactorTruncatedCube::FormFactorTruncatedCube(double length, double removed_length)
@@ -17414,7 +17280,7 @@ class FormFactorTruncatedCube(FormFactorPolyhedron):
removed length from each edge of the cube in nanometers
"""
- _libBornAgainCore.FormFactorTruncatedCube_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedCube(length, removed_length))
+ _libBornAgainCore.FormFactorTruncatedCube_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedCube(*args))
def clone(self):
r"""
@@ -17469,8 +17335,9 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius, height, dh):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorTruncatedSphere self, vdouble1d_t P) -> FormFactorTruncatedSphere
__init__(FormFactorTruncatedSphere self, double radius, double height, double dh) -> FormFactorTruncatedSphere
FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height, double dh=0.0)
@@ -17489,7 +17356,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn):
length of cup truncated from the top
"""
- _libBornAgainCore.FormFactorTruncatedSphere_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedSphere(radius, height, dh))
+ _libBornAgainCore.FormFactorTruncatedSphere_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedSphere(*args))
def clone(self):
r"""
@@ -17572,8 +17439,9 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, radius, height, height_flattening, dh):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorTruncatedSpheroid self, vdouble1d_t P) -> FormFactorTruncatedSpheroid
__init__(FormFactorTruncatedSpheroid self, double radius, double height, double height_flattening, double dh) -> FormFactorTruncatedSpheroid
FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double radius, double height, double height_flattening, double dh=0.0)
@@ -17595,7 +17463,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
length of cup truncated from the top
"""
- _libBornAgainCore.FormFactorTruncatedSpheroid_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedSpheroid(radius, height, height_flattening, dh))
+ _libBornAgainCore.FormFactorTruncatedSpheroid_swiginit(self, _libBornAgainCore.new_FormFactorTruncatedSpheroid(*args))
def clone(self):
r"""
@@ -17673,39 +17541,18 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn):
# Register FormFactorTruncatedSpheroid in _libBornAgainCore:
_libBornAgainCore.FormFactorTruncatedSpheroid_swigregister(FormFactorTruncatedSpheroid)
-
-def factor_x_box(q, l):
- r"""
- factor_x_box(complex_t q, double l) -> complex_t
- complex_t ripples::factor_x_box(complex_t q, double l)
-
- """
- return _libBornAgainCore.factor_x_box(q, l)
-
-def factor_x_Gauss(q, l):
- r"""
- factor_x_Gauss(complex_t q, double l) -> complex_t
- complex_t ripples::factor_x_Gauss(complex_t q, double l)
-
- """
- return _libBornAgainCore.factor_x_Gauss(q, l)
-
-def factor_x_Lorentz(q, l):
- r"""
- factor_x_Lorentz(complex_t q, double l) -> complex_t
- complex_t ripples::factor_x_Lorentz(complex_t q, double l)
-
- """
- return _libBornAgainCore.factor_x_Lorentz(q, l)
class FormFactorGaussSphere(IFormFactorBorn):
r"""Proxy of C++ FormFactorGaussSphere class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, mean_radius):
- r"""__init__(FormFactorGaussSphere self, double mean_radius) -> FormFactorGaussSphere"""
- _libBornAgainCore.FormFactorGaussSphere_swiginit(self, _libBornAgainCore.new_FormFactorGaussSphere(mean_radius))
+ def __init__(self, *args):
+ r"""
+ __init__(FormFactorGaussSphere self, vdouble1d_t P) -> FormFactorGaussSphere
+ __init__(FormFactorGaussSphere self, double mean_radius) -> FormFactorGaussSphere
+ """
+ _libBornAgainCore.FormFactorGaussSphere_swiginit(self, _libBornAgainCore.new_FormFactorGaussSphere(*args))
def clone(self):
r"""
@@ -17768,13 +17615,14 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, mean, sigma):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorSphereGaussianRadius self, vdouble1d_t P) -> FormFactorSphereGaussianRadius
__init__(FormFactorSphereGaussianRadius self, double mean, double sigma) -> FormFactorSphereGaussianRadius
FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)
"""
- _libBornAgainCore.FormFactorSphereGaussianRadius_swiginit(self, _libBornAgainCore.new_FormFactorSphereGaussianRadius(mean, sigma))
+ _libBornAgainCore.FormFactorSphereGaussianRadius_swiginit(self, _libBornAgainCore.new_FormFactorSphereGaussianRadius(*args))
def clone(self):
r"""
@@ -17833,13 +17681,14 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, mean, scale_param, n_samples):
+ def __init__(self, *args):
r"""
+ __init__(FormFactorSphereLogNormalRadius self, vdouble1d_t P, size_t n_samples=0) -> FormFactorSphereLogNormalRadius
__init__(FormFactorSphereLogNormalRadius self, double mean, double scale_param, size_t n_samples) -> FormFactorSphereLogNormalRadius
FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples)
"""
- _libBornAgainCore.FormFactorSphereLogNormalRadius_swiginit(self, _libBornAgainCore.new_FormFactorSphereLogNormalRadius(mean, scale_param, n_samples))
+ _libBornAgainCore.FormFactorSphereLogNormalRadius_swiginit(self, _libBornAgainCore.new_FormFactorSphereLogNormalRadius(*args))
def clone(self):
r"""
@@ -18712,13 +18561,14 @@ class ConstantBackground(IBackground):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, background_value):
+ def __init__(self, *args):
r"""
+ __init__(ConstantBackground self, vdouble1d_t P) -> ConstantBackground
__init__(ConstantBackground self, double background_value) -> ConstantBackground
ConstantBackground::ConstantBackground(double background_value)
"""
- _libBornAgainCore.ConstantBackground_swiginit(self, _libBornAgainCore.new_ConstantBackground(background_value))
+ _libBornAgainCore.ConstantBackground_swiginit(self, _libBornAgainCore.new_ConstantBackground(*args))
def clone(self):
r"""
@@ -18778,7 +18628,6 @@ class PoissonNoiseBackground(IBackground):
"""
_libBornAgainCore.PoissonNoiseBackground_swiginit(self, _libBornAgainCore.new_PoissonNoiseBackground())
- __swig_destroy__ = _libBornAgainCore.delete_PoissonNoiseBackground
def clone(self):
r"""
@@ -18805,6 +18654,7 @@ class PoissonNoiseBackground(IBackground):
"""
return _libBornAgainCore.PoissonNoiseBackground_addBackGround(self, intensity)
+ __swig_destroy__ = _libBornAgainCore.delete_PoissonNoiseBackground
# Register PoissonNoiseBackground in _libBornAgainCore:
_libBornAgainCore.PoissonNoiseBackground_swigregister(PoissonNoiseBackground)
@@ -19321,71 +19171,6 @@ class IDetector2D(IDetector):
# Register IDetector2D in _libBornAgainCore:
_libBornAgainCore.IDetector2D_swigregister(IDetector2D)
-class SphericalPixel(IPixel):
- r"""
-
-
- A pixel in a SphericalDetector.
-
- C++ includes: SphericalDetector.h
-
- """
-
- thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
- __repr__ = _swig_repr
-
- def __init__(self, alpha_bin, phi_bin):
- r"""
- __init__(SphericalPixel self, Bin1D alpha_bin, Bin1D phi_bin) -> SphericalPixel
- SphericalPixel::SphericalPixel(const Bin1D &alpha_bin, const Bin1D &phi_bin)
-
- """
- _libBornAgainCore.SphericalPixel_swiginit(self, _libBornAgainCore.new_SphericalPixel(alpha_bin, phi_bin))
-
- def clone(self):
- r"""
- clone(SphericalPixel self) -> SphericalPixel
- SphericalPixel * SphericalPixel::clone() const override
-
- """
- return _libBornAgainCore.SphericalPixel_clone(self)
-
- def createZeroSizePixel(self, x, y):
- r"""
- createZeroSizePixel(SphericalPixel self, double x, double y) -> SphericalPixel
- SphericalPixel * SphericalPixel::createZeroSizePixel(double x, double y) const override
-
- """
- return _libBornAgainCore.SphericalPixel_createZeroSizePixel(self, x, y)
-
- def getK(self, x, y, wavelength):
- r"""
- getK(SphericalPixel self, double x, double y, double wavelength) -> kvector_t
- kvector_t SphericalPixel::getK(double x, double y, double wavelength) const override
-
- """
- return _libBornAgainCore.SphericalPixel_getK(self, x, y, wavelength)
-
- def getIntegrationFactor(self, x, y):
- r"""
- getIntegrationFactor(SphericalPixel self, double x, double y) -> double
- double SphericalPixel::getIntegrationFactor(double x, double y) const override
-
- """
- return _libBornAgainCore.SphericalPixel_getIntegrationFactor(self, x, y)
-
- def getSolidAngle(self):
- r"""
- getSolidAngle(SphericalPixel self) -> double
- double SphericalPixel::getSolidAngle() const override
-
- """
- return _libBornAgainCore.SphericalPixel_getSolidAngle(self)
- __swig_destroy__ = _libBornAgainCore.delete_SphericalPixel
-
-# Register SphericalPixel in _libBornAgainCore:
-_libBornAgainCore.SphericalPixel_swigregister(SphericalPixel)
-
class SphericalDetector(IDetector2D):
r"""
@@ -19608,79 +19393,6 @@ class IsGISAXSDetector(SphericalDetector):
# Register IsGISAXSDetector in _libBornAgainCore:
_libBornAgainCore.IsGISAXSDetector_swigregister(IsGISAXSDetector)
-class RectangularPixel(IPixel):
- r"""
-
-
- A pixel in a RectangularDetector.
-
- C++ includes: RectangularDetector.h
-
- """
-
- thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
- __repr__ = _swig_repr
-
- def __init__(self, corner_pos, width, height):
- r"""
- __init__(RectangularPixel self, kvector_t corner_pos, kvector_t width, kvector_t height) -> RectangularPixel
- RectangularPixel::RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height)
-
- """
- _libBornAgainCore.RectangularPixel_swiginit(self, _libBornAgainCore.new_RectangularPixel(corner_pos, width, height))
-
- def clone(self):
- r"""
- clone(RectangularPixel self) -> RectangularPixel
- RectangularPixel * RectangularPixel::clone() const override
-
- """
- return _libBornAgainCore.RectangularPixel_clone(self)
-
- def createZeroSizePixel(self, x, y):
- r"""
- createZeroSizePixel(RectangularPixel self, double x, double y) -> RectangularPixel
- RectangularPixel * RectangularPixel::createZeroSizePixel(double x, double y) const override
-
- """
- return _libBornAgainCore.RectangularPixel_createZeroSizePixel(self, x, y)
-
- def getK(self, x, y, wavelength):
- r"""
- getK(RectangularPixel self, double x, double y, double wavelength) -> kvector_t
- kvector_t RectangularPixel::getK(double x, double y, double wavelength) const override
-
- """
- return _libBornAgainCore.RectangularPixel_getK(self, x, y, wavelength)
-
- def getPosition(self, x, y):
- r"""
- getPosition(RectangularPixel self, double x, double y) -> kvector_t
- kvector_t RectangularPixel::getPosition(double x, double y) const
-
- """
- return _libBornAgainCore.RectangularPixel_getPosition(self, x, y)
-
- def getIntegrationFactor(self, x, y):
- r"""
- getIntegrationFactor(RectangularPixel self, double x, double y) -> double
- double RectangularPixel::getIntegrationFactor(double x, double y) const override
-
- """
- return _libBornAgainCore.RectangularPixel_getIntegrationFactor(self, x, y)
-
- def getSolidAngle(self):
- r"""
- getSolidAngle(RectangularPixel self) -> double
- double RectangularPixel::getSolidAngle() const override
-
- """
- return _libBornAgainCore.RectangularPixel_getSolidAngle(self)
- __swig_destroy__ = _libBornAgainCore.delete_RectangularPixel
-
-# Register RectangularPixel in _libBornAgainCore:
-_libBornAgainCore.RectangularPixel_swigregister(RectangularPixel)
-
class RectangularDetector(IDetector2D):
r"""
@@ -19890,7 +19602,7 @@ class RectangularDetector(IDetector2D):
def regionOfInterestPixel(self):
r"""
- regionOfInterestPixel(RectangularDetector self) -> RectangularPixel
+ regionOfInterestPixel(RectangularDetector self) -> RectangularPixel *
RectangularPixel * RectangularDetector::regionOfInterestPixel() const
"""
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 882186ae3922c4af43dc4c163d7db40cbf94b41a..c65e2a55c3d8bd95f25c9bb03c96ec4ce9ab91b5 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -3130,37 +3130,37 @@ namespace Swig {
#define SWIGTYPE_p_FormFactorCone swig_types[62]
#define SWIGTYPE_p_FormFactorCone6 swig_types[63]
#define SWIGTYPE_p_FormFactorCoreShell swig_types[64]
-#define SWIGTYPE_p_FormFactorCrystal swig_types[65]
-#define SWIGTYPE_p_FormFactorCuboctahedron swig_types[66]
-#define SWIGTYPE_p_FormFactorCylinder swig_types[67]
-#define SWIGTYPE_p_FormFactorDWBA swig_types[68]
-#define SWIGTYPE_p_FormFactorDWBAPol swig_types[69]
-#define SWIGTYPE_p_FormFactorDecoratorMaterial swig_types[70]
-#define SWIGTYPE_p_FormFactorDecoratorPositionFactor swig_types[71]
-#define SWIGTYPE_p_FormFactorDecoratorRotation swig_types[72]
-#define SWIGTYPE_p_FormFactorDodecahedron swig_types[73]
-#define SWIGTYPE_p_FormFactorDot swig_types[74]
-#define SWIGTYPE_p_FormFactorEllipsoidalCylinder swig_types[75]
-#define SWIGTYPE_p_FormFactorFullSphere swig_types[76]
-#define SWIGTYPE_p_FormFactorFullSpheroid swig_types[77]
-#define SWIGTYPE_p_FormFactorGaussSphere swig_types[78]
-#define SWIGTYPE_p_FormFactorHemiEllipsoid swig_types[79]
-#define SWIGTYPE_p_FormFactorHollowSphere swig_types[80]
-#define SWIGTYPE_p_FormFactorIcosahedron swig_types[81]
-#define SWIGTYPE_p_FormFactorLongBoxGauss swig_types[82]
-#define SWIGTYPE_p_FormFactorLongBoxLorentz swig_types[83]
-#define SWIGTYPE_p_FormFactorPolygonalPrism swig_types[84]
-#define SWIGTYPE_p_FormFactorPolygonalSurface swig_types[85]
-#define SWIGTYPE_p_FormFactorPolyhedron swig_types[86]
-#define SWIGTYPE_p_FormFactorPrism3 swig_types[87]
-#define SWIGTYPE_p_FormFactorPrism6 swig_types[88]
-#define SWIGTYPE_p_FormFactorPyramid swig_types[89]
-#define SWIGTYPE_p_FormFactorRipple1Box swig_types[90]
-#define SWIGTYPE_p_FormFactorRipple1Gauss swig_types[91]
-#define SWIGTYPE_p_FormFactorRipple1Lorentz swig_types[92]
-#define SWIGTYPE_p_FormFactorRipple2Box swig_types[93]
-#define SWIGTYPE_p_FormFactorRipple2Gauss swig_types[94]
-#define SWIGTYPE_p_FormFactorRipple2Lorentz swig_types[95]
+#define SWIGTYPE_p_FormFactorCosineRippleBox swig_types[65]
+#define SWIGTYPE_p_FormFactorCosineRippleGauss swig_types[66]
+#define SWIGTYPE_p_FormFactorCosineRippleLorentz swig_types[67]
+#define SWIGTYPE_p_FormFactorCrystal swig_types[68]
+#define SWIGTYPE_p_FormFactorCuboctahedron swig_types[69]
+#define SWIGTYPE_p_FormFactorCylinder swig_types[70]
+#define SWIGTYPE_p_FormFactorDWBA swig_types[71]
+#define SWIGTYPE_p_FormFactorDWBAPol swig_types[72]
+#define SWIGTYPE_p_FormFactorDecoratorMaterial swig_types[73]
+#define SWIGTYPE_p_FormFactorDecoratorPositionFactor swig_types[74]
+#define SWIGTYPE_p_FormFactorDecoratorRotation swig_types[75]
+#define SWIGTYPE_p_FormFactorDodecahedron swig_types[76]
+#define SWIGTYPE_p_FormFactorDot swig_types[77]
+#define SWIGTYPE_p_FormFactorEllipsoidalCylinder swig_types[78]
+#define SWIGTYPE_p_FormFactorFullSphere swig_types[79]
+#define SWIGTYPE_p_FormFactorFullSpheroid swig_types[80]
+#define SWIGTYPE_p_FormFactorGaussSphere swig_types[81]
+#define SWIGTYPE_p_FormFactorHemiEllipsoid swig_types[82]
+#define SWIGTYPE_p_FormFactorHollowSphere swig_types[83]
+#define SWIGTYPE_p_FormFactorIcosahedron swig_types[84]
+#define SWIGTYPE_p_FormFactorLongBoxGauss swig_types[85]
+#define SWIGTYPE_p_FormFactorLongBoxLorentz swig_types[86]
+#define SWIGTYPE_p_FormFactorPolygonalPrism swig_types[87]
+#define SWIGTYPE_p_FormFactorPolygonalSurface swig_types[88]
+#define SWIGTYPE_p_FormFactorPolyhedron swig_types[89]
+#define SWIGTYPE_p_FormFactorPrism3 swig_types[90]
+#define SWIGTYPE_p_FormFactorPrism6 swig_types[91]
+#define SWIGTYPE_p_FormFactorPyramid swig_types[92]
+#define SWIGTYPE_p_FormFactorSawtoothRippleBox swig_types[93]
+#define SWIGTYPE_p_FormFactorSawtoothRippleGauss swig_types[94]
+#define SWIGTYPE_p_FormFactorSawtoothRippleLorentz swig_types[95]
#define SWIGTYPE_p_FormFactorSphereGaussianRadius swig_types[96]
#define SWIGTYPE_p_FormFactorSphereLogNormalRadius swig_types[97]
#define SWIGTYPE_p_FormFactorTetrahedron swig_types[98]
@@ -3180,143 +3180,143 @@ namespace Swig {
#define SWIGTYPE_p_IChiSquaredModule swig_types[112]
#define SWIGTYPE_p_ICloneable swig_types[113]
#define SWIGTYPE_p_IClusteredParticles swig_types[114]
-#define SWIGTYPE_p_IDetector swig_types[115]
-#define SWIGTYPE_p_IDetector2D swig_types[116]
-#define SWIGTYPE_p_IDetectorResolution swig_types[117]
-#define SWIGTYPE_p_IDistribution1D swig_types[118]
-#define SWIGTYPE_p_IFTDecayFunction1D swig_types[119]
-#define SWIGTYPE_p_IFTDecayFunction2D swig_types[120]
-#define SWIGTYPE_p_IFTDistribution1D swig_types[121]
-#define SWIGTYPE_p_IFTDistribution2D swig_types[122]
-#define SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t swig_types[123]
-#define SWIGTYPE_p_IFactoryT_std__string_Simulation_t swig_types[124]
-#define SWIGTYPE_p_IFootprintFactor swig_types[125]
-#define SWIGTYPE_p_IFormFactor swig_types[126]
-#define SWIGTYPE_p_IFormFactorBorn swig_types[127]
-#define SWIGTYPE_p_IFormFactorDecorator swig_types[128]
-#define SWIGTYPE_p_IHistogram swig_types[129]
-#define SWIGTYPE_p_IIntensityFunction swig_types[130]
-#define SWIGTYPE_p_IInterferenceFunction swig_types[131]
-#define SWIGTYPE_p_ILatticeOrientation swig_types[132]
-#define SWIGTYPE_p_ILayout swig_types[133]
-#define SWIGTYPE_p_IMultiLayerBuilder swig_types[134]
-#define SWIGTYPE_p_INode swig_types[135]
-#define SWIGTYPE_p_INodeVisitor swig_types[136]
-#define SWIGTYPE_p_IObservable swig_types[137]
-#define SWIGTYPE_p_IObserver swig_types[138]
-#define SWIGTYPE_p_IParameterT_double_t swig_types[139]
-#define SWIGTYPE_p_IParameterized swig_types[140]
-#define SWIGTYPE_p_IParticle swig_types[141]
-#define SWIGTYPE_p_IPeakShape swig_types[142]
-#define SWIGTYPE_p_IPixel swig_types[143]
-#define SWIGTYPE_p_IResolutionFunction2D swig_types[144]
-#define SWIGTYPE_p_IRotation swig_types[145]
-#define SWIGTYPE_p_ISample swig_types[146]
-#define SWIGTYPE_p_ISelectionRule swig_types[147]
-#define SWIGTYPE_p_IShape2D swig_types[148]
-#define SWIGTYPE_p_ISpecularScan swig_types[149]
-#define SWIGTYPE_p_IUnitConverter swig_types[150]
-#define SWIGTYPE_p_IVarianceFunction swig_types[151]
-#define SWIGTYPE_p_IdentityRotation swig_types[152]
-#define SWIGTYPE_p_Instrument swig_types[153]
-#define SWIGTYPE_p_IntensityDataIOFactory swig_types[154]
-#define SWIGTYPE_p_IntensityFunctionLog swig_types[155]
-#define SWIGTYPE_p_IntensityFunctionSqrt swig_types[156]
-#define SWIGTYPE_p_InterferenceFunction1DLattice swig_types[157]
-#define SWIGTYPE_p_InterferenceFunction2DLattice swig_types[158]
-#define SWIGTYPE_p_InterferenceFunction2DParaCrystal swig_types[159]
-#define SWIGTYPE_p_InterferenceFunction2DSuperLattice swig_types[160]
-#define SWIGTYPE_p_InterferenceFunction3DLattice swig_types[161]
-#define SWIGTYPE_p_InterferenceFunctionFinite2DLattice swig_types[162]
-#define SWIGTYPE_p_InterferenceFunctionFinite3DLattice swig_types[163]
-#define SWIGTYPE_p_InterferenceFunctionHardDisk swig_types[164]
-#define SWIGTYPE_p_InterferenceFunctionNone swig_types[165]
-#define SWIGTYPE_p_InterferenceFunctionRadialParaCrystal swig_types[166]
-#define SWIGTYPE_p_InterferenceFunctionTwin swig_types[167]
-#define SWIGTYPE_p_IsGISAXSDetector swig_types[168]
-#define SWIGTYPE_p_IsotropicGaussPeakShape swig_types[169]
-#define SWIGTYPE_p_IsotropicLorentzPeakShape swig_types[170]
-#define SWIGTYPE_p_IterationInfo swig_types[171]
-#define SWIGTYPE_p_Lattice swig_types[172]
-#define SWIGTYPE_p_Lattice2D swig_types[173]
-#define SWIGTYPE_p_Lattice2D__ReciprocalBases swig_types[174]
-#define SWIGTYPE_p_Layer swig_types[175]
-#define SWIGTYPE_p_LayerInterface swig_types[176]
-#define SWIGTYPE_p_LayerRoughness swig_types[177]
-#define SWIGTYPE_p_Line swig_types[178]
-#define SWIGTYPE_p_LorentzFisherPeakShape swig_types[179]
-#define SWIGTYPE_p_Material swig_types[180]
-#define SWIGTYPE_p_MesoCrystal swig_types[181]
-#define SWIGTYPE_p_MillerIndex swig_types[182]
-#define SWIGTYPE_p_MillerIndexOrientation swig_types[183]
-#define SWIGTYPE_p_MisesFisherGaussPeakShape swig_types[184]
-#define SWIGTYPE_p_MisesGaussPeakShape swig_types[185]
-#define SWIGTYPE_p_MultiLayer swig_types[186]
-#define SWIGTYPE_p_NodeMeta swig_types[187]
-#define SWIGTYPE_p_OffSpecSimulation swig_types[188]
-#define SWIGTYPE_p_OutputDataIteratorT_double_OutputDataT_double_t_t swig_types[189]
-#define SWIGTYPE_p_OutputDataIteratorT_double_const_OutputDataT_double_t_const_t swig_types[190]
-#define SWIGTYPE_p_OutputDataT_CumulativeValue_t swig_types[191]
-#define SWIGTYPE_p_OutputDataT_bool_t swig_types[192]
-#define SWIGTYPE_p_OutputDataT_double_t swig_types[193]
-#define SWIGTYPE_p_ParaMeta swig_types[194]
-#define SWIGTYPE_p_ParameterDistribution swig_types[195]
-#define SWIGTYPE_p_ParameterPool swig_types[196]
-#define SWIGTYPE_p_ParameterSample swig_types[197]
-#define SWIGTYPE_p_Particle swig_types[198]
-#define SWIGTYPE_p_ParticleComposition swig_types[199]
-#define SWIGTYPE_p_ParticleCoreShell swig_types[200]
-#define SWIGTYPE_p_ParticleDistribution swig_types[201]
-#define SWIGTYPE_p_ParticleLayout swig_types[202]
-#define SWIGTYPE_p_ParticleLimits swig_types[203]
-#define SWIGTYPE_p_PoissonNoiseBackground swig_types[204]
-#define SWIGTYPE_p_Polygon swig_types[205]
-#define SWIGTYPE_p_PolygonPrivate swig_types[206]
-#define SWIGTYPE_p_PolygonalTopology swig_types[207]
-#define SWIGTYPE_p_PolyhedralEdge swig_types[208]
-#define SWIGTYPE_p_PolyhedralFace swig_types[209]
-#define SWIGTYPE_p_PolyhedralTopology swig_types[210]
-#define SWIGTYPE_p_ProfileBar swig_types[211]
-#define SWIGTYPE_p_ProfileRipple1 swig_types[212]
-#define SWIGTYPE_p_ProfileRipple2 swig_types[213]
-#define SWIGTYPE_p_ProgressHandler__Callback_t swig_types[214]
-#define SWIGTYPE_p_PyBuilderCallback swig_types[215]
-#define SWIGTYPE_p_PyObserverCallback swig_types[216]
-#define SWIGTYPE_p_QSpecScan swig_types[217]
-#define SWIGTYPE_p_RangedDistribution swig_types[218]
-#define SWIGTYPE_p_RangedDistributionCosine swig_types[219]
-#define SWIGTYPE_p_RangedDistributionGate swig_types[220]
-#define SWIGTYPE_p_RangedDistributionGaussian swig_types[221]
-#define SWIGTYPE_p_RangedDistributionLogNormal swig_types[222]
-#define SWIGTYPE_p_RangedDistributionLorentz swig_types[223]
-#define SWIGTYPE_p_RealLimits swig_types[224]
-#define SWIGTYPE_p_RealParameter swig_types[225]
-#define SWIGTYPE_p_Rectangle swig_types[226]
-#define SWIGTYPE_p_RectangularDetector swig_types[227]
-#define SWIGTYPE_p_RectangularPixel swig_types[228]
-#define SWIGTYPE_p_RegionOfInterest swig_types[229]
-#define SWIGTYPE_p_ResolutionFunction2DGaussian swig_types[230]
-#define SWIGTYPE_p_RotationEuler swig_types[231]
-#define SWIGTYPE_p_RotationX swig_types[232]
-#define SWIGTYPE_p_RotationY swig_types[233]
-#define SWIGTYPE_p_RotationZ swig_types[234]
-#define SWIGTYPE_p_RoughnessModelWrap swig_types[235]
-#define SWIGTYPE_p_RoughnessModelWrap__RoughnessModel swig_types[236]
-#define SWIGTYPE_p_SafePointerVectorT_IParticle_t swig_types[237]
-#define SWIGTYPE_p_SampleBuilderFactory swig_types[238]
-#define SWIGTYPE_p_ScanResolution swig_types[239]
-#define SWIGTYPE_p_SimpleSelectionRule swig_types[240]
-#define SWIGTYPE_p_Simulation swig_types[241]
-#define SWIGTYPE_p_Simulation2D swig_types[242]
-#define SWIGTYPE_p_SimulationFactory swig_types[243]
-#define SWIGTYPE_p_SimulationOptions swig_types[244]
-#define SWIGTYPE_p_SimulationResult swig_types[245]
-#define SWIGTYPE_p_SlicedParticle swig_types[246]
-#define SWIGTYPE_p_SlicingEffects swig_types[247]
-#define SWIGTYPE_p_SpecularDetector1D swig_types[248]
-#define SWIGTYPE_p_SpecularSimulation swig_types[249]
-#define SWIGTYPE_p_SphericalDetector swig_types[250]
-#define SWIGTYPE_p_SphericalPixel swig_types[251]
+#define SWIGTYPE_p_ICosineRipple swig_types[115]
+#define SWIGTYPE_p_IDetector swig_types[116]
+#define SWIGTYPE_p_IDetector2D swig_types[117]
+#define SWIGTYPE_p_IDetectorResolution swig_types[118]
+#define SWIGTYPE_p_IDistribution1D swig_types[119]
+#define SWIGTYPE_p_IFTDecayFunction1D swig_types[120]
+#define SWIGTYPE_p_IFTDecayFunction2D swig_types[121]
+#define SWIGTYPE_p_IFTDistribution1D swig_types[122]
+#define SWIGTYPE_p_IFTDistribution2D swig_types[123]
+#define SWIGTYPE_p_IFactoryT_std__string_IMultiLayerBuilder_t swig_types[124]
+#define SWIGTYPE_p_IFactoryT_std__string_Simulation_t swig_types[125]
+#define SWIGTYPE_p_IFootprintFactor swig_types[126]
+#define SWIGTYPE_p_IFormFactor swig_types[127]
+#define SWIGTYPE_p_IFormFactorBorn swig_types[128]
+#define SWIGTYPE_p_IFormFactorDecorator swig_types[129]
+#define SWIGTYPE_p_IHistogram swig_types[130]
+#define SWIGTYPE_p_IIntensityFunction swig_types[131]
+#define SWIGTYPE_p_IInterferenceFunction swig_types[132]
+#define SWIGTYPE_p_ILatticeOrientation swig_types[133]
+#define SWIGTYPE_p_ILayout swig_types[134]
+#define SWIGTYPE_p_IMultiLayerBuilder swig_types[135]
+#define SWIGTYPE_p_INode swig_types[136]
+#define SWIGTYPE_p_INodeVisitor swig_types[137]
+#define SWIGTYPE_p_IObservable swig_types[138]
+#define SWIGTYPE_p_IObserver swig_types[139]
+#define SWIGTYPE_p_IParameterT_double_t swig_types[140]
+#define SWIGTYPE_p_IParameterized swig_types[141]
+#define SWIGTYPE_p_IParticle swig_types[142]
+#define SWIGTYPE_p_IPeakShape swig_types[143]
+#define SWIGTYPE_p_IPixel swig_types[144]
+#define SWIGTYPE_p_IProfileRectangularRipple swig_types[145]
+#define SWIGTYPE_p_IProfileRipple swig_types[146]
+#define SWIGTYPE_p_IResolutionFunction2D swig_types[147]
+#define SWIGTYPE_p_IRotation swig_types[148]
+#define SWIGTYPE_p_ISample swig_types[149]
+#define SWIGTYPE_p_ISawtoothRipple swig_types[150]
+#define SWIGTYPE_p_ISelectionRule swig_types[151]
+#define SWIGTYPE_p_IShape2D swig_types[152]
+#define SWIGTYPE_p_ISpecularScan swig_types[153]
+#define SWIGTYPE_p_IUnitConverter swig_types[154]
+#define SWIGTYPE_p_IVarianceFunction swig_types[155]
+#define SWIGTYPE_p_IdentityRotation swig_types[156]
+#define SWIGTYPE_p_Instrument swig_types[157]
+#define SWIGTYPE_p_IntensityDataIOFactory swig_types[158]
+#define SWIGTYPE_p_IntensityFunctionLog swig_types[159]
+#define SWIGTYPE_p_IntensityFunctionSqrt swig_types[160]
+#define SWIGTYPE_p_InterferenceFunction1DLattice swig_types[161]
+#define SWIGTYPE_p_InterferenceFunction2DLattice swig_types[162]
+#define SWIGTYPE_p_InterferenceFunction2DParaCrystal swig_types[163]
+#define SWIGTYPE_p_InterferenceFunction2DSuperLattice swig_types[164]
+#define SWIGTYPE_p_InterferenceFunction3DLattice swig_types[165]
+#define SWIGTYPE_p_InterferenceFunctionFinite2DLattice swig_types[166]
+#define SWIGTYPE_p_InterferenceFunctionFinite3DLattice swig_types[167]
+#define SWIGTYPE_p_InterferenceFunctionHardDisk swig_types[168]
+#define SWIGTYPE_p_InterferenceFunctionNone swig_types[169]
+#define SWIGTYPE_p_InterferenceFunctionRadialParaCrystal swig_types[170]
+#define SWIGTYPE_p_InterferenceFunctionTwin swig_types[171]
+#define SWIGTYPE_p_IsGISAXSDetector swig_types[172]
+#define SWIGTYPE_p_IsotropicGaussPeakShape swig_types[173]
+#define SWIGTYPE_p_IsotropicLorentzPeakShape swig_types[174]
+#define SWIGTYPE_p_IterationInfo swig_types[175]
+#define SWIGTYPE_p_Lattice swig_types[176]
+#define SWIGTYPE_p_Lattice2D swig_types[177]
+#define SWIGTYPE_p_Lattice2D__ReciprocalBases swig_types[178]
+#define SWIGTYPE_p_Layer swig_types[179]
+#define SWIGTYPE_p_LayerInterface swig_types[180]
+#define SWIGTYPE_p_LayerRoughness swig_types[181]
+#define SWIGTYPE_p_Line swig_types[182]
+#define SWIGTYPE_p_LorentzFisherPeakShape swig_types[183]
+#define SWIGTYPE_p_Material swig_types[184]
+#define SWIGTYPE_p_MesoCrystal swig_types[185]
+#define SWIGTYPE_p_MillerIndex swig_types[186]
+#define SWIGTYPE_p_MillerIndexOrientation swig_types[187]
+#define SWIGTYPE_p_MisesFisherGaussPeakShape swig_types[188]
+#define SWIGTYPE_p_MisesGaussPeakShape swig_types[189]
+#define SWIGTYPE_p_MultiLayer swig_types[190]
+#define SWIGTYPE_p_NodeMeta swig_types[191]
+#define SWIGTYPE_p_OffSpecSimulation swig_types[192]
+#define SWIGTYPE_p_OutputDataIteratorT_double_OutputDataT_double_t_t swig_types[193]
+#define SWIGTYPE_p_OutputDataIteratorT_double_const_OutputDataT_double_t_const_t swig_types[194]
+#define SWIGTYPE_p_OutputDataT_CumulativeValue_t swig_types[195]
+#define SWIGTYPE_p_OutputDataT_bool_t swig_types[196]
+#define SWIGTYPE_p_OutputDataT_double_t swig_types[197]
+#define SWIGTYPE_p_ParaMeta swig_types[198]
+#define SWIGTYPE_p_ParameterDistribution swig_types[199]
+#define SWIGTYPE_p_ParameterPool swig_types[200]
+#define SWIGTYPE_p_ParameterSample swig_types[201]
+#define SWIGTYPE_p_Particle swig_types[202]
+#define SWIGTYPE_p_ParticleComposition swig_types[203]
+#define SWIGTYPE_p_ParticleCoreShell swig_types[204]
+#define SWIGTYPE_p_ParticleDistribution swig_types[205]
+#define SWIGTYPE_p_ParticleLayout swig_types[206]
+#define SWIGTYPE_p_ParticleLimits swig_types[207]
+#define SWIGTYPE_p_PoissonNoiseBackground swig_types[208]
+#define SWIGTYPE_p_Polygon swig_types[209]
+#define SWIGTYPE_p_PolygonPrivate swig_types[210]
+#define SWIGTYPE_p_PolygonalTopology swig_types[211]
+#define SWIGTYPE_p_PolyhedralEdge swig_types[212]
+#define SWIGTYPE_p_PolyhedralFace swig_types[213]
+#define SWIGTYPE_p_PolyhedralTopology swig_types[214]
+#define SWIGTYPE_p_ProgressHandler__Callback_t swig_types[215]
+#define SWIGTYPE_p_PyBuilderCallback swig_types[216]
+#define SWIGTYPE_p_PyObserverCallback swig_types[217]
+#define SWIGTYPE_p_QSpecScan swig_types[218]
+#define SWIGTYPE_p_RangedDistribution swig_types[219]
+#define SWIGTYPE_p_RangedDistributionCosine swig_types[220]
+#define SWIGTYPE_p_RangedDistributionGate swig_types[221]
+#define SWIGTYPE_p_RangedDistributionGaussian swig_types[222]
+#define SWIGTYPE_p_RangedDistributionLogNormal swig_types[223]
+#define SWIGTYPE_p_RangedDistributionLorentz swig_types[224]
+#define SWIGTYPE_p_RealLimits swig_types[225]
+#define SWIGTYPE_p_RealParameter swig_types[226]
+#define SWIGTYPE_p_Rectangle swig_types[227]
+#define SWIGTYPE_p_RectangularDetector swig_types[228]
+#define SWIGTYPE_p_RectangularPixel swig_types[229]
+#define SWIGTYPE_p_RegionOfInterest swig_types[230]
+#define SWIGTYPE_p_ResolutionFunction2DGaussian swig_types[231]
+#define SWIGTYPE_p_RotationEuler swig_types[232]
+#define SWIGTYPE_p_RotationX swig_types[233]
+#define SWIGTYPE_p_RotationY swig_types[234]
+#define SWIGTYPE_p_RotationZ swig_types[235]
+#define SWIGTYPE_p_RoughnessModelWrap swig_types[236]
+#define SWIGTYPE_p_RoughnessModelWrap__RoughnessModel swig_types[237]
+#define SWIGTYPE_p_SafePointerVectorT_IParticle_t swig_types[238]
+#define SWIGTYPE_p_SampleBuilderFactory swig_types[239]
+#define SWIGTYPE_p_ScanResolution swig_types[240]
+#define SWIGTYPE_p_SimpleSelectionRule swig_types[241]
+#define SWIGTYPE_p_Simulation swig_types[242]
+#define SWIGTYPE_p_Simulation2D swig_types[243]
+#define SWIGTYPE_p_SimulationFactory swig_types[244]
+#define SWIGTYPE_p_SimulationOptions swig_types[245]
+#define SWIGTYPE_p_SimulationResult swig_types[246]
+#define SWIGTYPE_p_SlicedParticle swig_types[247]
+#define SWIGTYPE_p_SlicingEffects swig_types[248]
+#define SWIGTYPE_p_SpecularDetector1D swig_types[249]
+#define SWIGTYPE_p_SpecularSimulation swig_types[250]
+#define SWIGTYPE_p_SphericalDetector swig_types[251]
#define SWIGTYPE_p_SquareLattice swig_types[252]
#define SWIGTYPE_p_ThreadInfo swig_types[253]
#define SWIGTYPE_p_Transform3D swig_types[254]
@@ -6942,6 +6942,7 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Core/HardParticle/FormFactorCantellatedCube.h"
#include "Core/HardParticle/FormFactorCone.h"
#include "Core/HardParticle/FormFactorCone6.h"
+#include "Core/HardParticle/FormFactorCosineRipple.h"
#include "Core/HardParticle/FormFactorCuboctahedron.h"
#include "Core/HardParticle/FormFactorCylinder.h"
#include "Core/HardParticle/FormFactorDodecahedron.h"
@@ -6959,13 +6960,11 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Core/HardParticle/FormFactorPrism3.h"
#include "Core/HardParticle/FormFactorPrism6.h"
#include "Core/HardParticle/FormFactorPyramid.h"
-#include "Core/HardParticle/FormFactorRipple1.h"
-#include "Core/HardParticle/FormFactorRipple2.h"
+#include "Core/HardParticle/FormFactorSawtoothRipple.h"
#include "Core/HardParticle/FormFactorTetrahedron.h"
#include "Core/HardParticle/FormFactorTruncatedCube.h"
#include "Core/HardParticle/FormFactorTruncatedSphere.h"
#include "Core/HardParticle/FormFactorTruncatedSpheroid.h"
-#include "Core/HardParticle/Ripples.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/AngularSpecScan.h"
#include "Core/Instrument/ChiSquaredModule.h"
@@ -56092,7 +56091,7 @@ fail:
SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_43(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
INodeVisitor *arg1 = (INodeVisitor *) 0 ;
- FormFactorRipple1Box *arg2 = (FormFactorRipple1Box *) 0 ;
+ FormFactorCosineRippleBox *arg2 = (FormFactorCosineRippleBox *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -56104,12 +56103,12 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_43(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'");
}
arg1 = reinterpret_cast< INodeVisitor * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple1Box, 0 | 0 );
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCosineRippleBox, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple1Box const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCosineRippleBox const *""'");
}
- arg2 = reinterpret_cast< FormFactorRipple1Box * >(argp2);
- (arg1)->visit((FormFactorRipple1Box const *)arg2);
+ arg2 = reinterpret_cast< FormFactorCosineRippleBox * >(argp2);
+ (arg1)->visit((FormFactorCosineRippleBox const *)arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -56120,7 +56119,7 @@ fail:
SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_44(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
INodeVisitor *arg1 = (INodeVisitor *) 0 ;
- FormFactorRipple1Gauss *arg2 = (FormFactorRipple1Gauss *) 0 ;
+ FormFactorCosineRippleGauss *arg2 = (FormFactorCosineRippleGauss *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -56132,12 +56131,12 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_44(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'");
}
arg1 = reinterpret_cast< INodeVisitor * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple1Gauss, 0 | 0 );
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCosineRippleGauss, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple1Gauss const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCosineRippleGauss const *""'");
}
- arg2 = reinterpret_cast< FormFactorRipple1Gauss * >(argp2);
- (arg1)->visit((FormFactorRipple1Gauss const *)arg2);
+ arg2 = reinterpret_cast< FormFactorCosineRippleGauss * >(argp2);
+ (arg1)->visit((FormFactorCosineRippleGauss const *)arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -56148,7 +56147,7 @@ fail:
SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_45(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
INodeVisitor *arg1 = (INodeVisitor *) 0 ;
- FormFactorRipple1Lorentz *arg2 = (FormFactorRipple1Lorentz *) 0 ;
+ FormFactorCosineRippleLorentz *arg2 = (FormFactorCosineRippleLorentz *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -56160,12 +56159,12 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_45(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'");
}
arg1 = reinterpret_cast< INodeVisitor * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple1Lorentz, 0 | 0 );
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorCosineRippleLorentz, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple1Lorentz const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorCosineRippleLorentz const *""'");
}
- arg2 = reinterpret_cast< FormFactorRipple1Lorentz * >(argp2);
- (arg1)->visit((FormFactorRipple1Lorentz const *)arg2);
+ arg2 = reinterpret_cast< FormFactorCosineRippleLorentz * >(argp2);
+ (arg1)->visit((FormFactorCosineRippleLorentz const *)arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -56176,7 +56175,7 @@ fail:
SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_46(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
INodeVisitor *arg1 = (INodeVisitor *) 0 ;
- FormFactorRipple2Box *arg2 = (FormFactorRipple2Box *) 0 ;
+ FormFactorSawtoothRippleBox *arg2 = (FormFactorSawtoothRippleBox *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -56188,12 +56187,12 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_46(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'");
}
arg1 = reinterpret_cast< INodeVisitor * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple2Box, 0 | 0 );
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorSawtoothRippleBox, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple2Box const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorSawtoothRippleBox const *""'");
}
- arg2 = reinterpret_cast< FormFactorRipple2Box * >(argp2);
- (arg1)->visit((FormFactorRipple2Box const *)arg2);
+ arg2 = reinterpret_cast< FormFactorSawtoothRippleBox * >(argp2);
+ (arg1)->visit((FormFactorSawtoothRippleBox const *)arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -56204,7 +56203,7 @@ fail:
SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_47(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
INodeVisitor *arg1 = (INodeVisitor *) 0 ;
- FormFactorRipple2Gauss *arg2 = (FormFactorRipple2Gauss *) 0 ;
+ FormFactorSawtoothRippleGauss *arg2 = (FormFactorSawtoothRippleGauss *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -56216,12 +56215,12 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_47(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'");
}
arg1 = reinterpret_cast< INodeVisitor * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple2Gauss, 0 | 0 );
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorSawtoothRippleGauss, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple2Gauss const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorSawtoothRippleGauss const *""'");
}
- arg2 = reinterpret_cast< FormFactorRipple2Gauss * >(argp2);
- (arg1)->visit((FormFactorRipple2Gauss const *)arg2);
+ arg2 = reinterpret_cast< FormFactorSawtoothRippleGauss * >(argp2);
+ (arg1)->visit((FormFactorSawtoothRippleGauss const *)arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -56232,7 +56231,7 @@ fail:
SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_48(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
INodeVisitor *arg1 = (INodeVisitor *) 0 ;
- FormFactorRipple2Lorentz *arg2 = (FormFactorRipple2Lorentz *) 0 ;
+ FormFactorSawtoothRippleLorentz *arg2 = (FormFactorSawtoothRippleLorentz *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -56244,12 +56243,12 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit__SWIG_48(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INodeVisitor_visit" "', argument " "1"" of type '" "INodeVisitor *""'");
}
arg1 = reinterpret_cast< INodeVisitor * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorRipple2Lorentz, 0 | 0 );
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_FormFactorSawtoothRippleLorentz, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorRipple2Lorentz const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INodeVisitor_visit" "', argument " "2"" of type '" "FormFactorSawtoothRippleLorentz const *""'");
}
- arg2 = reinterpret_cast< FormFactorRipple2Lorentz * >(argp2);
- (arg1)->visit((FormFactorRipple2Lorentz const *)arg2);
+ arg2 = reinterpret_cast< FormFactorSawtoothRippleLorentz * >(argp2);
+ (arg1)->visit((FormFactorSawtoothRippleLorentz const *)arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -58974,7 +58973,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
if (_v) {
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple1Box, 0);
+ int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCosineRippleBox, 0);
_v = SWIG_CheckState(res);
if (_v) {
return _wrap_INodeVisitor_visit__SWIG_43(self, argc, argv);
@@ -58988,7 +58987,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
if (_v) {
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple1Gauss, 0);
+ int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCosineRippleGauss, 0);
_v = SWIG_CheckState(res);
if (_v) {
return _wrap_INodeVisitor_visit__SWIG_44(self, argc, argv);
@@ -59002,7 +59001,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
if (_v) {
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple1Lorentz, 0);
+ int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorCosineRippleLorentz, 0);
_v = SWIG_CheckState(res);
if (_v) {
return _wrap_INodeVisitor_visit__SWIG_45(self, argc, argv);
@@ -59016,7 +59015,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
if (_v) {
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple2Box, 0);
+ int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorSawtoothRippleBox, 0);
_v = SWIG_CheckState(res);
if (_v) {
return _wrap_INodeVisitor_visit__SWIG_46(self, argc, argv);
@@ -59030,7 +59029,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
if (_v) {
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple2Gauss, 0);
+ int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorSawtoothRippleGauss, 0);
_v = SWIG_CheckState(res);
if (_v) {
return _wrap_INodeVisitor_visit__SWIG_47(self, argc, argv);
@@ -59044,7 +59043,7 @@ SWIGINTERN PyObject *_wrap_INodeVisitor_visit(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
if (_v) {
void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorRipple2Lorentz, 0);
+ int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FormFactorSawtoothRippleLorentz, 0);
_v = SWIG_CheckState(res);
if (_v) {
return _wrap_INodeVisitor_visit__SWIG_48(self, argc, argv);
@@ -60148,12 +60147,12 @@ fail:
" INodeVisitor::visit(FormFactorPrism3 const *)\n"
" INodeVisitor::visit(FormFactorPrism6 const *)\n"
" INodeVisitor::visit(FormFactorPyramid const *)\n"
- " INodeVisitor::visit(FormFactorRipple1Box const *)\n"
- " INodeVisitor::visit(FormFactorRipple1Gauss const *)\n"
- " INodeVisitor::visit(FormFactorRipple1Lorentz const *)\n"
- " INodeVisitor::visit(FormFactorRipple2Box const *)\n"
- " INodeVisitor::visit(FormFactorRipple2Gauss const *)\n"
- " INodeVisitor::visit(FormFactorRipple2Lorentz const *)\n"
+ " INodeVisitor::visit(FormFactorCosineRippleBox const *)\n"
+ " INodeVisitor::visit(FormFactorCosineRippleGauss const *)\n"
+ " INodeVisitor::visit(FormFactorCosineRippleLorentz const *)\n"
+ " INodeVisitor::visit(FormFactorSawtoothRippleBox const *)\n"
+ " INodeVisitor::visit(FormFactorSawtoothRippleGauss const *)\n"
+ " INodeVisitor::visit(FormFactorSawtoothRippleLorentz const *)\n"
" INodeVisitor::visit(FormFactorSphereGaussianRadius const *)\n"
" INodeVisitor::visit(FormFactorSphereLogNormalRadius const *)\n"
" INodeVisitor::visit(FormFactorTetrahedron const *)\n"
@@ -61779,12 +61778,22 @@ SWIGINTERN PyObject *IDistribution1D_swigregister(PyObject *SWIGUNUSEDPARM(self)
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
DistributionGate *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
- result = (DistributionGate *)new DistributionGate();
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_DistributionGate" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (DistributionGate *)new DistributionGate(arg1);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionGate, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
@@ -61821,6 +61830,19 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_DistributionGate__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+ PyObject *resultobj = 0;
+ DistributionGate *result = 0 ;
+
+ if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ result = (DistributionGate *)new DistributionGate();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionGate, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_new_DistributionGate(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
@@ -61830,7 +61852,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionGate(PyObject *self, PyObject *args)
if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionGate", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_DistributionGate__SWIG_0(self, argc, argv);
+ return _wrap_new_DistributionGate__SWIG_2(self, argc, argv);
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_DistributionGate__SWIG_0(self, argc, argv);
+ }
}
if (argc == 2) {
int _v;
@@ -61852,8 +61882,9 @@ SWIGINTERN PyObject *_wrap_new_DistributionGate(PyObject *self, PyObject *args)
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionGate'.\n"
" Possible C/C++ prototypes are:\n"
- " DistributionGate::DistributionGate()\n"
- " DistributionGate::DistributionGate(double,double)\n");
+ " DistributionGate::DistributionGate(std::vector< double,std::allocator< double > > const)\n"
+ " DistributionGate::DistributionGate(double,double)\n"
+ " DistributionGate::DistributionGate()\n");
return 0;
}
@@ -62214,12 +62245,22 @@ SWIGINTERN PyObject *DistributionGate_swiginit(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
DistributionLorentz *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
- result = (DistributionLorentz *)new DistributionLorentz();
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_DistributionLorentz" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (DistributionLorentz *)new DistributionLorentz(arg1);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionLorentz, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
@@ -62256,6 +62297,19 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_DistributionLorentz__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+ PyObject *resultobj = 0;
+ DistributionLorentz *result = 0 ;
+
+ if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ result = (DistributionLorentz *)new DistributionLorentz();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionLorentz, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_new_DistributionLorentz(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
@@ -62265,7 +62319,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionLorentz(PyObject *self, PyObject *arg
if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionLorentz", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_DistributionLorentz__SWIG_0(self, argc, argv);
+ return _wrap_new_DistributionLorentz__SWIG_2(self, argc, argv);
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_DistributionLorentz__SWIG_0(self, argc, argv);
+ }
}
if (argc == 2) {
int _v;
@@ -62287,8 +62349,9 @@ SWIGINTERN PyObject *_wrap_new_DistributionLorentz(PyObject *self, PyObject *arg
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionLorentz'.\n"
" Possible C/C++ prototypes are:\n"
- " DistributionLorentz::DistributionLorentz()\n"
- " DistributionLorentz::DistributionLorentz(double,double)\n");
+ " DistributionLorentz::DistributionLorentz(std::vector< double,std::allocator< double > > const)\n"
+ " DistributionLorentz::DistributionLorentz(double,double)\n"
+ " DistributionLorentz::DistributionLorentz()\n");
return 0;
}
@@ -62626,12 +62689,22 @@ SWIGINTERN PyObject *DistributionLorentz_swiginit(PyObject *SWIGUNUSEDPARM(self)
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
DistributionGaussian *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
- result = (DistributionGaussian *)new DistributionGaussian();
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_DistributionGaussian" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (DistributionGaussian *)new DistributionGaussian(arg1);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionGaussian, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
@@ -62668,6 +62741,19 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_DistributionGaussian__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+ PyObject *resultobj = 0;
+ DistributionGaussian *result = 0 ;
+
+ if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ result = (DistributionGaussian *)new DistributionGaussian();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionGaussian, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_new_DistributionGaussian(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
@@ -62677,7 +62763,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionGaussian(PyObject *self, PyObject *ar
if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionGaussian", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_DistributionGaussian__SWIG_0(self, argc, argv);
+ return _wrap_new_DistributionGaussian__SWIG_2(self, argc, argv);
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_DistributionGaussian__SWIG_0(self, argc, argv);
+ }
}
if (argc == 2) {
int _v;
@@ -62699,8 +62793,9 @@ SWIGINTERN PyObject *_wrap_new_DistributionGaussian(PyObject *self, PyObject *ar
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionGaussian'.\n"
" Possible C/C++ prototypes are:\n"
- " DistributionGaussian::DistributionGaussian()\n"
- " DistributionGaussian::DistributionGaussian(double,double)\n");
+ " DistributionGaussian::DistributionGaussian(std::vector< double,std::allocator< double > > const)\n"
+ " DistributionGaussian::DistributionGaussian(double,double)\n"
+ " DistributionGaussian::DistributionGaussian()\n");
return 0;
}
@@ -63038,7 +63133,30 @@ SWIGINTERN PyObject *DistributionGaussian_swiginit(PyObject *SWIGUNUSEDPARM(self
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_DistributionLogNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_DistributionLogNormal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ DistributionLogNormal *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_DistributionLogNormal" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (DistributionLogNormal *)new DistributionLogNormal(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionLogNormal, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DistributionLogNormal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -63046,10 +63164,9 @@ SWIGINTERN PyObject *_wrap_new_DistributionLogNormal(PyObject *SWIGUNUSEDPARM(se
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
DistributionLogNormal *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_DistributionLogNormal", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DistributionLogNormal" "', argument " "1"" of type '" "double""'");
@@ -63068,6 +63185,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_DistributionLogNormal(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionLogNormal", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_DistributionLogNormal__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_DistributionLogNormal__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionLogNormal'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " DistributionLogNormal::DistributionLogNormal(std::vector< double,std::allocator< double > > const)\n"
+ " DistributionLogNormal::DistributionLogNormal(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_DistributionLogNormal_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
DistributionLogNormal *arg1 = (DistributionLogNormal *) 0 ;
@@ -63460,12 +63619,22 @@ SWIGINTERN PyObject *DistributionLogNormal_swiginit(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
DistributionCosine *result = 0 ;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
- result = (DistributionCosine *)new DistributionCosine();
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_DistributionCosine" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (DistributionCosine *)new DistributionCosine(arg1);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionCosine, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
@@ -63502,6 +63671,19 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_DistributionCosine__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+ PyObject *resultobj = 0;
+ DistributionCosine *result = 0 ;
+
+ if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ result = (DistributionCosine *)new DistributionCosine();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionCosine, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_new_DistributionCosine(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
@@ -63511,7 +63693,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionCosine(PyObject *self, PyObject *args
if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionCosine", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_DistributionCosine__SWIG_0(self, argc, argv);
+ return _wrap_new_DistributionCosine__SWIG_2(self, argc, argv);
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_DistributionCosine__SWIG_0(self, argc, argv);
+ }
}
if (argc == 2) {
int _v;
@@ -63533,8 +63723,9 @@ SWIGINTERN PyObject *_wrap_new_DistributionCosine(PyObject *self, PyObject *args
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionCosine'.\n"
" Possible C/C++ prototypes are:\n"
- " DistributionCosine::DistributionCosine()\n"
- " DistributionCosine::DistributionCosine(double,double)\n");
+ " DistributionCosine::DistributionCosine(std::vector< double,std::allocator< double > > const)\n"
+ " DistributionCosine::DistributionCosine(double,double)\n"
+ " DistributionCosine::DistributionCosine()\n");
return 0;
}
@@ -63873,6 +64064,29 @@ SWIGINTERN PyObject *DistributionCosine_swiginit(PyObject *SWIGUNUSEDPARM(self),
}
SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ DistributionTrapezoid *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_DistributionTrapezoid" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (DistributionTrapezoid *)new DistributionTrapezoid(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DistributionTrapezoid, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -63917,7 +64131,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
PyObject *resultobj = 0;
DistributionTrapezoid *result = 0 ;
@@ -63939,7 +64153,15 @@ SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid(PyObject *self, PyObject *a
if (!(argc = SWIG_Python_UnpackTuple(args, "new_DistributionTrapezoid", 0, 4, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_DistributionTrapezoid__SWIG_1(self, argc, argv);
+ return _wrap_new_DistributionTrapezoid__SWIG_2(self, argc, argv);
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_DistributionTrapezoid__SWIG_0(self, argc, argv);
+ }
}
if (argc == 4) {
int _v;
@@ -63963,7 +64185,7 @@ SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid(PyObject *self, PyObject *a
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_new_DistributionTrapezoid__SWIG_0(self, argc, argv);
+ return _wrap_new_DistributionTrapezoid__SWIG_1(self, argc, argv);
}
}
}
@@ -63973,6 +64195,7 @@ SWIGINTERN PyObject *_wrap_new_DistributionTrapezoid(PyObject *self, PyObject *a
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_DistributionTrapezoid'.\n"
" Possible C/C++ prototypes are:\n"
+ " DistributionTrapezoid::DistributionTrapezoid(std::vector< double,std::allocator< double > > const)\n"
" DistributionTrapezoid::DistributionTrapezoid(double,double,double,double)\n"
" DistributionTrapezoid::DistributionTrapezoid()\n");
return 0;
@@ -70220,16 +70443,37 @@ SWIGINTERN PyObject *IdentityRotation_swiginit(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_RotationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RotationX__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ RotationX *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_RotationX" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (RotationX *)new RotationX(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RotationX, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RotationX__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
RotationX *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RotationX" "', argument " "1"" of type '" "double""'");
@@ -70243,6 +70487,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_RotationX(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_RotationX", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_RotationX__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_RotationX__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RotationX'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " RotationX::RotationX(std::vector< double,std::allocator< double > > const)\n"
+ " RotationX::RotationX(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_RotationX_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
RotationX *arg1 = (RotationX *) 0 ;
@@ -70397,16 +70677,37 @@ SWIGINTERN PyObject *RotationX_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_RotationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RotationY__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ RotationY *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_RotationY" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (RotationY *)new RotationY(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RotationY, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RotationY__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
RotationY *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RotationY" "', argument " "1"" of type '" "double""'");
@@ -70420,6 +70721,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_RotationY(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_RotationY", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_RotationY__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_RotationY__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RotationY'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " RotationY::RotationY(std::vector< double,std::allocator< double > > const)\n"
+ " RotationY::RotationY(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_RotationY_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
RotationY *arg1 = (RotationY *) 0 ;
@@ -70574,16 +70911,37 @@ SWIGINTERN PyObject *RotationY_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_RotationZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RotationZ__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ RotationZ *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_RotationZ" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (RotationZ *)new RotationZ(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RotationZ, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RotationZ__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
RotationZ *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RotationZ" "', argument " "1"" of type '" "double""'");
@@ -70597,6 +70955,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_RotationZ(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_RotationZ", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_RotationZ__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_RotationZ__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RotationZ'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " RotationZ::RotationZ(std::vector< double,std::allocator< double > > const)\n"
+ " RotationZ::RotationZ(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_RotationZ_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
RotationZ *arg1 = (RotationZ *) 0 ;
@@ -70751,7 +71145,30 @@ SWIGINTERN PyObject *RotationZ_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_RotationEuler(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_RotationEuler__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ RotationEuler *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_RotationEuler" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (RotationEuler *)new RotationEuler(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RotationEuler, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RotationEuler__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -70762,10 +71179,9 @@ SWIGINTERN PyObject *_wrap_new_RotationEuler(PyObject *SWIGUNUSEDPARM(self), PyO
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
RotationEuler *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_RotationEuler", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RotationEuler" "', argument " "1"" of type '" "double""'");
@@ -70789,6 +71205,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_RotationEuler(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_RotationEuler", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_RotationEuler__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_RotationEuler__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RotationEuler'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " RotationEuler::RotationEuler(std::vector< double,std::allocator< double > > const)\n"
+ " RotationEuler::RotationEuler(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_RotationEuler_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
RotationEuler *arg1 = (RotationEuler *) 0 ;
@@ -75686,16 +76150,37 @@ SWIGINTERN PyObject *IFTDecayFunction1D_swigregister(PyObject *SWIGUNUSEDPARM(se
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DCauchy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDecayFunction1DCauchy *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDecayFunction1DCauchy" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDecayFunction1DCauchy *)new FTDecayFunction1DCauchy(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDecayFunction1DCauchy, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDecayFunction1DCauchy *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction1DCauchy" "', argument " "1"" of type '" "double""'");
@@ -75709,6 +76194,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DCauchy(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction1DCauchy", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DCauchy__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DCauchy__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction1DCauchy'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(std::vector< double,std::allocator< double > > const)\n"
+ " FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDecayFunction1DCauchy_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDecayFunction1DCauchy *arg1 = (FTDecayFunction1DCauchy *) 0 ;
@@ -75824,16 +76345,37 @@ SWIGINTERN PyObject *FTDecayFunction1DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(s
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDecayFunction1DGauss *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDecayFunction1DGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDecayFunction1DGauss *)new FTDecayFunction1DGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDecayFunction1DGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDecayFunction1DGauss *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction1DGauss" "', argument " "1"" of type '" "double""'");
@@ -75847,6 +76389,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction1DGauss", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DGauss__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction1DGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDecayFunction1DGauss::FTDecayFunction1DGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FTDecayFunction1DGauss::FTDecayFunction1DGauss(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDecayFunction1DGauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDecayFunction1DGauss *arg1 = (FTDecayFunction1DGauss *) 0 ;
@@ -75962,16 +76540,37 @@ SWIGINTERN PyObject *FTDecayFunction1DGauss_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DTriangle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DTriangle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDecayFunction1DTriangle *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDecayFunction1DTriangle" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDecayFunction1DTriangle *)new FTDecayFunction1DTriangle(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDecayFunction1DTriangle, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DTriangle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDecayFunction1DTriangle *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction1DTriangle" "', argument " "1"" of type '" "double""'");
@@ -75985,6 +76584,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DTriangle(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction1DTriangle", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DTriangle__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DTriangle__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction1DTriangle'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(std::vector< double,std::allocator< double > > const)\n"
+ " FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDecayFunction1DTriangle_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDecayFunction1DTriangle *arg1 = (FTDecayFunction1DTriangle *) 0 ;
@@ -76100,7 +76735,30 @@ SWIGINTERN PyObject *FTDecayFunction1DTriangle_swiginit(PyObject *SWIGUNUSEDPARM
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DVoigt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDecayFunction1DVoigt *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDecayFunction1DVoigt" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDecayFunction1DVoigt *)new FTDecayFunction1DVoigt(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDecayFunction1DVoigt, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -76108,10 +76766,9 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DVoigt(PyObject *SWIGUNUSEDPARM(s
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FTDecayFunction1DVoigt *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDecayFunction1DVoigt", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction1DVoigt" "', argument " "1"" of type '" "double""'");
@@ -76130,6 +76787,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction1DVoigt(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction1DVoigt", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DVoigt__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDecayFunction1DVoigt__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction1DVoigt'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(std::vector< double,std::allocator< double > > const)\n"
+ " FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDecayFunction1DVoigt_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDecayFunction1DVoigt *arg1 = (FTDecayFunction1DVoigt *) 0 ;
@@ -76291,36 +76990,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_setGamma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
- double arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "IFTDecayFunction2D_setGamma", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_setGamma" "', argument " "1"" of type '" "IFTDecayFunction2D *""'");
- }
- arg1 = reinterpret_cast< IFTDecayFunction2D * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDecayFunction2D_setGamma" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- (arg1)->setGamma(arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_gamma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
void *argp1 = 0 ;
@@ -76332,10 +77002,10 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_gamma(PyObject *SWIGUNUSEDPARM(sel
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_gamma" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_decayLengthX" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'");
}
arg1 = reinterpret_cast< IFTDecayFunction2D * >(argp1);
- result = (double)((IFTDecayFunction2D const *)arg1)->gamma();
+ result = (double)((IFTDecayFunction2D const *)arg1)->decayLengthX();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -76343,7 +77013,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
void *argp1 = 0 ;
@@ -76355,10 +77025,10 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthX(PyObject *SWIGUNUSEDP
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_decayLengthX" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_decayLengthY" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'");
}
arg1 = reinterpret_cast< IFTDecayFunction2D * >(argp1);
- result = (double)((IFTDecayFunction2D const *)arg1)->decayLengthX();
+ result = (double)((IFTDecayFunction2D const *)arg1)->decayLengthY();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -76366,7 +77036,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_gamma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDecayFunction2D *arg1 = (IFTDecayFunction2D *) 0 ;
void *argp1 = 0 ;
@@ -76378,10 +77048,10 @@ SWIGINTERN PyObject *_wrap_IFTDecayFunction2D_decayLengthY(PyObject *SWIGUNUSEDP
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDecayFunction2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_decayLengthY" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDecayFunction2D_gamma" "', argument " "1"" of type '" "IFTDecayFunction2D const *""'");
}
arg1 = reinterpret_cast< IFTDecayFunction2D * >(argp1);
- result = (double)((IFTDecayFunction2D const *)arg1)->decayLengthY();
+ result = (double)((IFTDecayFunction2D const *)arg1)->gamma();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -76518,7 +77188,30 @@ SWIGINTERN PyObject *IFTDecayFunction2D_swigregister(PyObject *SWIGUNUSEDPARM(se
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDecayFunction2DCauchy *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDecayFunction2DCauchy" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDecayFunction2DCauchy *)new FTDecayFunction2DCauchy(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDecayFunction2DCauchy, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -76529,10 +77222,9 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy(PyObject *SWIGUNUSEDPARM(
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FTDecayFunction2DCauchy *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DCauchy", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DCauchy" "', argument " "1"" of type '" "double""'");
@@ -76556,6 +77248,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DCauchy(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DCauchy", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDecayFunction2DCauchy__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FTDecayFunction2DCauchy__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DCauchy'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(std::vector< double,std::allocator< double > > const)\n"
+ " FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDecayFunction2DCauchy_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDecayFunction2DCauchy *arg1 = (FTDecayFunction2DCauchy *) 0 ;
@@ -76679,7 +77419,30 @@ SWIGINTERN PyObject *FTDecayFunction2DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(s
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDecayFunction2DGauss *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDecayFunction2DGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDecayFunction2DGauss *)new FTDecayFunction2DGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDecayFunction2DGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -76690,10 +77453,9 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss(PyObject *SWIGUNUSEDPARM(s
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FTDecayFunction2DGauss *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DGauss", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DGauss" "', argument " "1"" of type '" "double""'");
@@ -76717,6 +77479,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DGauss", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDecayFunction2DGauss__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FTDecayFunction2DGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDecayFunction2DGauss::FTDecayFunction2DGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FTDecayFunction2DGauss::FTDecayFunction2DGauss(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDecayFunction2DGauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDecayFunction2DGauss *arg1 = (FTDecayFunction2DGauss *) 0 ;
@@ -76840,7 +77650,30 @@ SWIGINTERN PyObject *FTDecayFunction2DGauss_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDecayFunction2DVoigt *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDecayFunction2DVoigt *)new FTDecayFunction2DVoigt(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDecayFunction2DVoigt, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -76854,10 +77687,9 @@ SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt(PyObject *SWIGUNUSEDPARM(s
int ecode3 = 0 ;
double val4 ;
int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
FTDecayFunction2DVoigt *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DVoigt", 4, 4, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDecayFunction2DVoigt" "', argument " "1"" of type '" "double""'");
@@ -76886,6 +77718,60 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDecayFunction2DVoigt(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDecayFunction2DVoigt", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDecayFunction2DVoigt__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDecayFunction2DVoigt__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDecayFunction2DVoigt'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(std::vector< double,std::allocator< double > > const)\n"
+ " FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double,double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDecayFunction2DVoigt_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDecayFunction2DVoigt *arg1 = (FTDecayFunction2DVoigt *) 0 ;
@@ -77085,35 +77971,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDistribution1D_setOmega(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- IFTDistribution1D *arg1 = (IFTDistribution1D *) 0 ;
- double arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "IFTDistribution1D_setOmega", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution1D, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution1D_setOmega" "', argument " "1"" of type '" "IFTDistribution1D *""'");
- }
- arg1 = reinterpret_cast< IFTDistribution1D * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDistribution1D_setOmega" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- (arg1)->setOmega(arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_IFTDistribution1D_omega(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDistribution1D *arg1 = (IFTDistribution1D *) 0 ;
@@ -77189,16 +78046,37 @@ SWIGINTERN PyObject *IFTDistribution1D_swigregister(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution1DCauchy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution1DCauchy *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution1DCauchy" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution1DCauchy *)new FTDistribution1DCauchy(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution1DCauchy, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDistribution1DCauchy *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution1DCauchy" "', argument " "1"" of type '" "double""'");
@@ -77212,6 +78090,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DCauchy(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution1DCauchy", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDistribution1DCauchy__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution1DCauchy__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution1DCauchy'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution1DCauchy::FTDistribution1DCauchy(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution1DCauchy::FTDistribution1DCauchy(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution1DCauchy_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution1DCauchy *arg1 = (FTDistribution1DCauchy *) 0 ;
@@ -77350,16 +78264,37 @@ SWIGINTERN PyObject *FTDistribution1DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution1DGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution1DGauss *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution1DGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution1DGauss *)new FTDistribution1DGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution1DGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDistribution1DGauss *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution1DGauss" "', argument " "1"" of type '" "double""'");
@@ -77373,6 +78308,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution1DGauss", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDistribution1DGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution1DGauss__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution1DGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution1DGauss::FTDistribution1DGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution1DGauss::FTDistribution1DGauss(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution1DGauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution1DGauss *arg1 = (FTDistribution1DGauss *) 0 ;
@@ -77511,16 +78482,37 @@ SWIGINTERN PyObject *FTDistribution1DGauss_swiginit(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution1DGate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution1DGate *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution1DGate" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution1DGate *)new FTDistribution1DGate(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution1DGate, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDistribution1DGate *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution1DGate" "', argument " "1"" of type '" "double""'");
@@ -77534,6 +78526,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DGate(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution1DGate", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDistribution1DGate__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution1DGate__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution1DGate'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution1DGate::FTDistribution1DGate(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution1DGate::FTDistribution1DGate(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution1DGate_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution1DGate *arg1 = (FTDistribution1DGate *) 0 ;
@@ -77672,16 +78700,37 @@ SWIGINTERN PyObject *FTDistribution1DGate_swiginit(PyObject *SWIGUNUSEDPARM(self
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution1DTriangle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DTriangle__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution1DTriangle *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution1DTriangle" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution1DTriangle *)new FTDistribution1DTriangle(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution1DTriangle, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DTriangle__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDistribution1DTriangle *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution1DTriangle" "', argument " "1"" of type '" "double""'");
@@ -77695,6 +78744,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DTriangle(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution1DTriangle", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDistribution1DTriangle__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution1DTriangle__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution1DTriangle'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution1DTriangle::FTDistribution1DTriangle(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution1DTriangle::FTDistribution1DTriangle(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution1DTriangle_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution1DTriangle *arg1 = (FTDistribution1DTriangle *) 0 ;
@@ -77833,16 +78918,37 @@ SWIGINTERN PyObject *FTDistribution1DTriangle_swiginit(PyObject *SWIGUNUSEDPARM(
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution1DCosine(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DCosine__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution1DCosine *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution1DCosine" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution1DCosine *)new FTDistribution1DCosine(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution1DCosine, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DCosine__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FTDistribution1DCosine *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution1DCosine" "', argument " "1"" of type '" "double""'");
@@ -77856,6 +78962,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DCosine(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution1DCosine", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDistribution1DCosine__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution1DCosine__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution1DCosine'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution1DCosine::FTDistribution1DCosine(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution1DCosine::FTDistribution1DCosine(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution1DCosine_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution1DCosine *arg1 = (FTDistribution1DCosine *) 0 ;
@@ -77994,7 +79136,30 @@ SWIGINTERN PyObject *FTDistribution1DCosine_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution1DVoigt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution1DVoigt *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution1DVoigt" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution1DVoigt *)new FTDistribution1DVoigt(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution1DVoigt, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -78002,10 +79167,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution1DVoigt(PyObject *SWIGUNUSEDPARM(se
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FTDistribution1DVoigt *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDistribution1DVoigt", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution1DVoigt" "', argument " "1"" of type '" "double""'");
@@ -78024,6 +79188,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution1DVoigt(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution1DVoigt", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution1DVoigt__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDistribution1DVoigt__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution1DVoigt'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution1DVoigt::FTDistribution1DVoigt(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution1DVoigt::FTDistribution1DVoigt(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution1DVoigt_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution1DVoigt *arg1 = (FTDistribution1DVoigt *) 0 ;
@@ -78208,36 +79414,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDistribution2D_setGamma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
- double arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "IFTDistribution2D_setGamma", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_setGamma" "', argument " "1"" of type '" "IFTDistribution2D *""'");
- }
- arg1 = reinterpret_cast< IFTDistribution2D * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IFTDistribution2D_setGamma" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- (arg1)->setGamma(arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_IFTDistribution2D_gamma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
void *argp1 = 0 ;
@@ -78249,10 +79426,10 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_gamma(PyObject *SWIGUNUSEDPARM(self
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_gamma" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_omegaX" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
}
arg1 = reinterpret_cast< IFTDistribution2D * >(argp1);
- result = (double)((IFTDistribution2D const *)arg1)->gamma();
+ result = (double)((IFTDistribution2D const *)arg1)->omegaX();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -78260,7 +79437,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDistribution2D_delta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
void *argp1 = 0 ;
@@ -78272,10 +79449,10 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_delta(PyObject *SWIGUNUSEDPARM(self
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_delta" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_omegaY" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
}
arg1 = reinterpret_cast< IFTDistribution2D * >(argp1);
- result = (double)((IFTDistribution2D const *)arg1)->delta();
+ result = (double)((IFTDistribution2D const *)arg1)->omegaY();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -78283,7 +79460,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFTDistribution2D_gamma(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
void *argp1 = 0 ;
@@ -78295,10 +79472,10 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaX(PyObject *SWIGUNUSEDPARM(sel
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_omegaX" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_gamma" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
}
arg1 = reinterpret_cast< IFTDistribution2D * >(argp1);
- result = (double)((IFTDistribution2D const *)arg1)->omegaX();
+ result = (double)((IFTDistribution2D const *)arg1)->gamma();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -78306,7 +79483,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IFTDistribution2D_delta(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IFTDistribution2D *arg1 = (IFTDistribution2D *) 0 ;
void *argp1 = 0 ;
@@ -78318,10 +79495,10 @@ SWIGINTERN PyObject *_wrap_IFTDistribution2D_omegaY(PyObject *SWIGUNUSEDPARM(sel
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IFTDistribution2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_omegaY" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFTDistribution2D_delta" "', argument " "1"" of type '" "IFTDistribution2D const *""'");
}
arg1 = reinterpret_cast< IFTDistribution2D * >(argp1);
- result = (double)((IFTDistribution2D const *)arg1)->omegaY();
+ result = (double)((IFTDistribution2D const *)arg1)->delta();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -78396,7 +79573,30 @@ SWIGINTERN PyObject *IFTDistribution2D_swigregister(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution2DCauchy *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution2DCauchy" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution2DCauchy *)new FTDistribution2DCauchy(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution2DCauchy, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -78407,10 +79607,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy(PyObject *SWIGUNUSEDPARM(s
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FTDistribution2DCauchy *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDistribution2DCauchy", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DCauchy" "', argument " "1"" of type '" "double""'");
@@ -78434,6 +79633,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCauchy(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DCauchy", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution2DCauchy__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FTDistribution2DCauchy__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DCauchy'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution2DCauchy::FTDistribution2DCauchy(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution2DCauchy::FTDistribution2DCauchy(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution2DCauchy_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution2DCauchy *arg1 = (FTDistribution2DCauchy *) 0 ;
@@ -78557,7 +79804,30 @@ SWIGINTERN PyObject *FTDistribution2DCauchy_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution2DGauss *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution2DGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution2DGauss *)new FTDistribution2DGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution2DGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -78568,10 +79838,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss(PyObject *SWIGUNUSEDPARM(se
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FTDistribution2DGauss *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDistribution2DGauss", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DGauss" "', argument " "1"" of type '" "double""'");
@@ -78595,6 +79864,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DGauss", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution2DGauss__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FTDistribution2DGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution2DGauss::FTDistribution2DGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution2DGauss::FTDistribution2DGauss(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution2DGauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution2DGauss *arg1 = (FTDistribution2DGauss *) 0 ;
@@ -78718,7 +80035,30 @@ SWIGINTERN PyObject *FTDistribution2DGauss_swiginit(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution2DGate *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution2DGate" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution2DGate *)new FTDistribution2DGate(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution2DGate, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -78729,10 +80069,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate(PyObject *SWIGUNUSEDPARM(sel
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FTDistribution2DGate *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDistribution2DGate", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DGate" "', argument " "1"" of type '" "double""'");
@@ -78756,6 +80095,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DGate(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DGate", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution2DGate__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FTDistribution2DGate__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DGate'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution2DGate::FTDistribution2DGate(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution2DGate::FTDistribution2DGate(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution2DGate_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution2DGate *arg1 = (FTDistribution2DGate *) 0 ;
@@ -78879,7 +80266,30 @@ SWIGINTERN PyObject *FTDistribution2DGate_swiginit(PyObject *SWIGUNUSEDPARM(self
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution2DCone *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution2DCone" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution2DCone *)new FTDistribution2DCone(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution2DCone, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -78890,10 +80300,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone(PyObject *SWIGUNUSEDPARM(sel
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FTDistribution2DCone *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDistribution2DCone", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DCone" "', argument " "1"" of type '" "double""'");
@@ -78917,6 +80326,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DCone(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DCone", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution2DCone__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FTDistribution2DCone__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DCone'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution2DCone::FTDistribution2DCone(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution2DCone::FTDistribution2DCone(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution2DCone_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution2DCone *arg1 = (FTDistribution2DCone *) 0 ;
@@ -79040,7 +80497,30 @@ SWIGINTERN PyObject *FTDistribution2DCone_swiginit(PyObject *SWIGUNUSEDPARM(self
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FTDistribution2DVoigt *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FTDistribution2DVoigt" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FTDistribution2DVoigt *)new FTDistribution2DVoigt(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FTDistribution2DVoigt, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -79054,10 +80534,9 @@ SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt(PyObject *SWIGUNUSEDPARM(se
int ecode3 = 0 ;
double val4 ;
int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
FTDistribution2DVoigt *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FTDistribution2DVoigt", 4, 4, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FTDistribution2DVoigt" "', argument " "1"" of type '" "double""'");
@@ -79086,6 +80565,60 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FTDistribution2DVoigt(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FTDistribution2DVoigt", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FTDistribution2DVoigt__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FTDistribution2DVoigt__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FTDistribution2DVoigt'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FTDistribution2DVoigt::FTDistribution2DVoigt(std::vector< double,std::allocator< double > > const)\n"
+ " FTDistribution2DVoigt::FTDistribution2DVoigt(double,double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FTDistribution2DVoigt_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FTDistribution2DVoigt *arg1 = (FTDistribution2DVoigt *) 0 ;
@@ -80917,28 +82450,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_IInterferenceFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IInterferenceFunction" "', argument " "1"" of type '" "IInterferenceFunction *""'");
- }
- arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_IInterferenceFunction_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
@@ -81355,6 +82866,28 @@ fail:
}
+SWIGINTERN PyObject *_wrap_delete_IInterferenceFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IInterferenceFunction, SWIG_POINTER_DISOWN | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IInterferenceFunction" "', argument " "1"" of type '" "IInterferenceFunction *""'");
+ }
+ arg1 = reinterpret_cast< IInterferenceFunction * >(argp1);
+ delete arg1;
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_disown_IInterferenceFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IInterferenceFunction *arg1 = (IInterferenceFunction *) 0 ;
@@ -86779,16 +88312,37 @@ SWIGINTERN PyObject *IFootprintFactor_swigregister(PyObject *SWIGUNUSEDPARM(self
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_FootprintGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FootprintGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FootprintGauss *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FootprintGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FootprintGauss *)new FootprintGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FootprintGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FootprintGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FootprintGauss *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FootprintGauss" "', argument " "1"" of type '" "double""'");
@@ -86802,6 +88356,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FootprintGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FootprintGauss", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FootprintGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FootprintGauss__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FootprintGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FootprintGauss::FootprintGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FootprintGauss::FootprintGauss(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FootprintGauss_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FootprintGauss *arg1 = (FootprintGauss *) 0 ;
@@ -86940,16 +88530,37 @@ SWIGINTERN PyObject *FootprintGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FootprintSquare(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FootprintSquare__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FootprintSquare *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FootprintSquare" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FootprintSquare *)new FootprintSquare(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FootprintSquare, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FootprintSquare__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FootprintSquare *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FootprintSquare" "', argument " "1"" of type '" "double""'");
@@ -86963,6 +88574,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FootprintSquare(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FootprintSquare", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FootprintSquare__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FootprintSquare__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FootprintSquare'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FootprintSquare::FootprintSquare(std::vector< double,std::allocator< double > > const)\n"
+ " FootprintSquare::FootprintSquare(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FootprintSquare_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FootprintSquare *arg1 = (FootprintSquare *) 0 ;
@@ -90694,9 +92341,9 @@ SWIGINTERN PyObject *FormFactorPolygonalSurface_swigregister(PyObject *SWIGUNUSE
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_ProfileBar_getLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IProfileRipple_getLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileBar *arg1 = (ProfileBar *) 0 ;
+ IProfileRipple *arg1 = (IProfileRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -90704,12 +92351,12 @@ SWIGINTERN PyObject *_wrap_ProfileBar_getLength(PyObject *SWIGUNUSEDPARM(self),
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileBar, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRipple, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileBar_getLength" "', argument " "1"" of type '" "ProfileBar const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IProfileRipple_getLength" "', argument " "1"" of type '" "IProfileRipple const *""'");
}
- arg1 = reinterpret_cast< ProfileBar * >(argp1);
- result = (double)((ProfileBar const *)arg1)->getLength();
+ arg1 = reinterpret_cast< IProfileRipple * >(argp1);
+ result = (double)((IProfileRipple const *)arg1)->getLength();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -90717,9 +92364,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ProfileBar_getHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IProfileRipple_getHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileBar *arg1 = (ProfileBar *) 0 ;
+ IProfileRipple *arg1 = (IProfileRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -90727,12 +92374,12 @@ SWIGINTERN PyObject *_wrap_ProfileBar_getHeight(PyObject *SWIGUNUSEDPARM(self),
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileBar, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRipple, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileBar_getHeight" "', argument " "1"" of type '" "ProfileBar const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IProfileRipple_getHeight" "', argument " "1"" of type '" "IProfileRipple const *""'");
}
- arg1 = reinterpret_cast< ProfileBar * >(argp1);
- result = (double)((ProfileBar const *)arg1)->getHeight();
+ arg1 = reinterpret_cast< IProfileRipple * >(argp1);
+ result = (double)((IProfileRipple const *)arg1)->getHeight();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -90740,9 +92387,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ProfileBar_getWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IProfileRipple_getWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileBar *arg1 = (ProfileBar *) 0 ;
+ IProfileRipple *arg1 = (IProfileRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -90750,12 +92397,12 @@ SWIGINTERN PyObject *_wrap_ProfileBar_getWidth(PyObject *SWIGUNUSEDPARM(self), P
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileBar, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRipple, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileBar_getWidth" "', argument " "1"" of type '" "ProfileBar const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IProfileRipple_getWidth" "', argument " "1"" of type '" "IProfileRipple const *""'");
}
- arg1 = reinterpret_cast< ProfileBar * >(argp1);
- result = (double)((ProfileBar const *)arg1)->getWidth();
+ arg1 = reinterpret_cast< IProfileRipple * >(argp1);
+ result = (double)((IProfileRipple const *)arg1)->getWidth();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -90763,9 +92410,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ProfileBar_radialExtension(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IProfileRipple_radialExtension(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileBar *arg1 = (ProfileBar *) 0 ;
+ IProfileRipple *arg1 = (IProfileRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -90773,12 +92420,12 @@ SWIGINTERN PyObject *_wrap_ProfileBar_radialExtension(PyObject *SWIGUNUSEDPARM(s
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileBar, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRipple, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileBar_radialExtension" "', argument " "1"" of type '" "ProfileBar const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IProfileRipple_radialExtension" "', argument " "1"" of type '" "IProfileRipple const *""'");
}
- arg1 = reinterpret_cast< ProfileBar * >(argp1);
- result = (double)((ProfileBar const *)arg1)->radialExtension();
+ arg1 = reinterpret_cast< IProfileRipple * >(argp1);
+ result = (double)((IProfileRipple const *)arg1)->radialExtension();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -90786,9 +92433,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ProfileBar_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IProfileRipple_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileBar *arg1 = (ProfileBar *) 0 ;
+ IProfileRipple *arg1 = (IProfileRipple *) 0 ;
cvector_t arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -90797,26 +92444,26 @@ SWIGINTERN PyObject *_wrap_ProfileBar_evaluate_for_q(PyObject *SWIGUNUSEDPARM(se
PyObject *swig_obj[2] ;
complex_t result;
- if (!SWIG_Python_UnpackTuple(args, "ProfileBar_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileBar, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "IProfileRipple_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRipple, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileBar_evaluate_for_q" "', argument " "1"" of type '" "ProfileBar const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IProfileRipple_evaluate_for_q" "', argument " "1"" of type '" "IProfileRipple const *""'");
}
- arg1 = reinterpret_cast< ProfileBar * >(argp1);
+ arg1 = reinterpret_cast< IProfileRipple * >(argp1);
{
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 | 0);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ProfileBar_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IProfileRipple_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
}
if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ProfileBar_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IProfileRipple_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
} else {
cvector_t * temp = reinterpret_cast< cvector_t * >(argp2);
arg2 = *temp;
if (SWIG_IsNewObj(res2)) delete temp;
}
}
- result = ((ProfileBar const *)arg1)->evaluate_for_q(arg2);
+ result = ((IProfileRipple const *)arg1)->evaluate_for_q(arg2);
resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
return resultobj;
fail:
@@ -90824,20 +92471,20 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_ProfileBar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_IProfileRipple(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileBar *arg1 = (ProfileBar *) 0 ;
+ IProfileRipple *arg1 = (IProfileRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileBar, SWIG_POINTER_DISOWN | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRipple, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ProfileBar" "', argument " "1"" of type '" "ProfileBar *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IProfileRipple" "', argument " "1"" of type '" "IProfileRipple *""'");
}
- arg1 = reinterpret_cast< ProfileBar * >(argp1);
+ arg1 = reinterpret_cast< IProfileRipple * >(argp1);
delete arg1;
resultobj = SWIG_Py_Void();
return resultobj;
@@ -90846,157 +92493,27 @@ fail:
}
-SWIGINTERN PyObject *ProfileBar_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IProfileRipple_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_ProfileBar, SWIG_NewClientData(obj));
+ SWIG_TypeNewClientData(SWIGTYPE_p_IProfileRipple, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_ProfileRipple1_getLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_IProfileRectangularRipple(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileRipple1 *arg1 = (ProfileRipple1 *) 0 ;
+ IProfileRectangularRipple *arg1 = (IProfileRectangularRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
- double result;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple1, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IProfileRectangularRipple, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple1_getLength" "', argument " "1"" of type '" "ProfileRipple1 const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IProfileRectangularRipple" "', argument " "1"" of type '" "IProfileRectangularRipple *""'");
}
- arg1 = reinterpret_cast< ProfileRipple1 * >(argp1);
- result = (double)((ProfileRipple1 const *)arg1)->getLength();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ProfileRipple1_getHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple1 *arg1 = (ProfileRipple1 *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple1, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple1_getHeight" "', argument " "1"" of type '" "ProfileRipple1 const *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple1 * >(argp1);
- result = (double)((ProfileRipple1 const *)arg1)->getHeight();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ProfileRipple1_getWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple1 *arg1 = (ProfileRipple1 *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple1, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple1_getWidth" "', argument " "1"" of type '" "ProfileRipple1 const *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple1 * >(argp1);
- result = (double)((ProfileRipple1 const *)arg1)->getWidth();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ProfileRipple1_radialExtension(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple1 *arg1 = (ProfileRipple1 *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple1, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple1_radialExtension" "', argument " "1"" of type '" "ProfileRipple1 const *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple1 * >(argp1);
- result = (double)((ProfileRipple1 const *)arg1)->radialExtension();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ProfileRipple1_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple1 *arg1 = (ProfileRipple1 *) 0 ;
- cvector_t arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
- complex_t result;
-
- if (!SWIG_Python_UnpackTuple(args, "ProfileRipple1_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple1, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple1_evaluate_for_q" "', argument " "1"" of type '" "ProfileRipple1 const *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple1 * >(argp1);
- {
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ProfileRipple1_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ProfileRipple1_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
- } else {
- cvector_t * temp = reinterpret_cast< cvector_t * >(argp2);
- arg2 = *temp;
- if (SWIG_IsNewObj(res2)) delete temp;
- }
- }
- result = ((ProfileRipple1 const *)arg1)->evaluate_for_q(arg2);
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_ProfileRipple1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple1 *arg1 = (ProfileRipple1 *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple1, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ProfileRipple1" "', argument " "1"" of type '" "ProfileRipple1 *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple1 * >(argp1);
+ arg1 = reinterpret_cast< IProfileRectangularRipple * >(argp1);
delete arg1;
resultobj = SWIG_Py_Void();
return resultobj;
@@ -91005,62 +92522,45 @@ fail:
}
-SWIGINTERN PyObject *ProfileRipple1_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *IProfileRectangularRipple_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_ProfileRipple1, SWIG_NewClientData(obj));
+ SWIG_TypeNewClientData(SWIGTYPE_p_IProfileRectangularRipple, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_ProfileRipple2_getLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ICosineRipple(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileRipple2 *arg1 = (ProfileRipple2 *) 0 ;
+ ICosineRipple *arg1 = (ICosineRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
- double result;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple2, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ICosineRipple, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple2_getLength" "', argument " "1"" of type '" "ProfileRipple2 const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ICosineRipple" "', argument " "1"" of type '" "ICosineRipple *""'");
}
- arg1 = reinterpret_cast< ProfileRipple2 * >(argp1);
- result = (double)((ProfileRipple2 const *)arg1)->getLength();
- resultobj = SWIG_From_double(static_cast< double >(result));
+ arg1 = reinterpret_cast< ICosineRipple * >(argp1);
+ delete arg1;
+ resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_ProfileRipple2_getHeight(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple2 *arg1 = (ProfileRipple2 *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple2, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple2_getHeight" "', argument " "1"" of type '" "ProfileRipple2 const *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple2 * >(argp1);
- result = (double)((ProfileRipple2 const *)arg1)->getHeight();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
+SWIGINTERN PyObject *ICosineRipple_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *obj;
+ if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
+ SWIG_TypeNewClientData(SWIGTYPE_p_ICosineRipple, SWIG_NewClientData(obj));
+ return SWIG_Py_Void();
}
-
-SWIGINTERN PyObject *_wrap_ProfileRipple2_getWidth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ISawtoothRipple_getAsymmetry(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileRipple2 *arg1 = (ProfileRipple2 *) 0 ;
+ ISawtoothRipple *arg1 = (ISawtoothRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -91068,12 +92568,12 @@ SWIGINTERN PyObject *_wrap_ProfileRipple2_getWidth(PyObject *SWIGUNUSEDPARM(self
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple2, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISawtoothRipple, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple2_getWidth" "', argument " "1"" of type '" "ProfileRipple2 const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISawtoothRipple_getAsymmetry" "', argument " "1"" of type '" "ISawtoothRipple const *""'");
}
- arg1 = reinterpret_cast< ProfileRipple2 * >(argp1);
- result = (double)((ProfileRipple2 const *)arg1)->getWidth();
+ arg1 = reinterpret_cast< ISawtoothRipple * >(argp1);
+ result = (double)((ISawtoothRipple const *)arg1)->getAsymmetry();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -91081,120 +92581,59 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ProfileRipple2_getAsymmetry(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_ISawtoothRipple(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- ProfileRipple2 *arg1 = (ProfileRipple2 *) 0 ;
+ ISawtoothRipple *arg1 = (ISawtoothRipple *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
- double result;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple2, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISawtoothRipple, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple2_getAsymmetry" "', argument " "1"" of type '" "ProfileRipple2 const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ISawtoothRipple" "', argument " "1"" of type '" "ISawtoothRipple *""'");
}
- arg1 = reinterpret_cast< ProfileRipple2 * >(argp1);
- result = (double)((ProfileRipple2 const *)arg1)->getAsymmetry();
- resultobj = SWIG_From_double(static_cast< double >(result));
+ arg1 = reinterpret_cast< ISawtoothRipple * >(argp1);
+ delete arg1;
+ resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_ProfileRipple2_radialExtension(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple2 *arg1 = (ProfileRipple2 *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple2, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple2_radialExtension" "', argument " "1"" of type '" "ProfileRipple2 const *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple2 * >(argp1);
- result = (double)((ProfileRipple2 const *)arg1)->radialExtension();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
+SWIGINTERN PyObject *ISawtoothRipple_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *obj;
+ if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
+ SWIG_TypeNewClientData(SWIGTYPE_p_ISawtoothRipple, SWIG_NewClientData(obj));
+ return SWIG_Py_Void();
}
-
-SWIGINTERN PyObject *_wrap_ProfileRipple2_evaluate_for_q(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorAnisoPyramid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
- ProfileRipple2 *arg1 = (ProfileRipple2 *) 0 ;
- cvector_t arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
- complex_t result;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorAnisoPyramid *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "ProfileRipple2_evaluate_for_q", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple2, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProfileRipple2_evaluate_for_q" "', argument " "1"" of type '" "ProfileRipple2 const *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple2 * >(argp1);
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
{
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_std__complexT_double_t_t, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ProfileRipple2_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ProfileRipple2_evaluate_for_q" "', argument " "2"" of type '" "cvector_t""'");
- } else {
- cvector_t * temp = reinterpret_cast< cvector_t * >(argp2);
- arg2 = *temp;
- if (SWIG_IsNewObj(res2)) delete temp;
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorAnisoPyramid" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
}
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
}
- result = ((ProfileRipple2 const *)arg1)->evaluate_for_q(arg2);
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_ProfileRipple2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ProfileRipple2 *arg1 = (ProfileRipple2 *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ProfileRipple2, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ProfileRipple2" "', argument " "1"" of type '" "ProfileRipple2 *""'");
- }
- arg1 = reinterpret_cast< ProfileRipple2 * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
+ result = (FormFactorAnisoPyramid *)new FormFactorAnisoPyramid(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorAnisoPyramid, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *ProfileRipple2_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_ProfileRipple2, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_FormFactorAnisoPyramid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorAnisoPyramid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -91208,10 +92647,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorAnisoPyramid(PyObject *SWIGUNUSEDPARM(s
int ecode3 = 0 ;
double val4 ;
int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
FormFactorAnisoPyramid *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorAnisoPyramid", 4, 4, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorAnisoPyramid" "', argument " "1"" of type '" "double""'");
@@ -91240,6 +92678,60 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorAnisoPyramid(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorAnisoPyramid", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorAnisoPyramid__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorAnisoPyramid__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorAnisoPyramid'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorAnisoPyramid::FormFactorAnisoPyramid(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorAnisoPyramid::FormFactorAnisoPyramid(double,double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
@@ -91417,7 +92909,30 @@ SWIGINTERN PyObject *FormFactorAnisoPyramid_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorBox__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorBox *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorBox" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorBox *)new FormFactorBox(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorBox, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorBox__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -91428,10 +92943,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorBox(PyObject *SWIGUNUSEDPARM(self), PyO
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorBox *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorBox", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorBox" "', argument " "1"" of type '" "double""'");
@@ -91455,6 +92969,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorBox(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorBox", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorBox__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorBox__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorBox'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorBox::FormFactorBox(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorBox::FormFactorBox(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorBox_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorBox *arg1 = (FormFactorBox *) 0 ;
@@ -91670,7 +93232,30 @@ SWIGINTERN PyObject *FormFactorBox_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorCantellatedCube(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorCantellatedCube__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCantellatedCube *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCantellatedCube" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCantellatedCube *)new FormFactorCantellatedCube(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCantellatedCube, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCantellatedCube__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -91678,10 +93263,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCantellatedCube(PyObject *SWIGUNUSEDPAR
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorCantellatedCube *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCantellatedCube", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCantellatedCube" "', argument " "1"" of type '" "double""'");
@@ -91700,6 +93284,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorCantellatedCube(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCantellatedCube", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCantellatedCube__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorCantellatedCube__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCantellatedCube'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCantellatedCube::FormFactorCantellatedCube(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCantellatedCube::FormFactorCantellatedCube(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorCantellatedCube_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCantellatedCube *arg1 = (FormFactorCantellatedCube *) 0 ;
@@ -91831,7 +93457,30 @@ SWIGINTERN PyObject *FormFactorCantellatedCube_swiginit(PyObject *SWIGUNUSEDPARM
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorCone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorCone__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCone *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCone" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCone *)new FormFactorCone(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCone, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCone__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -91842,10 +93491,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCone(PyObject *SWIGUNUSEDPARM(self), Py
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorCone *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCone", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCone" "', argument " "1"" of type '" "double""'");
@@ -91869,6 +93517,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorCone(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCone", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCone__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorCone__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCone'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCone::FormFactorCone(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCone::FormFactorCone(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorCone_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCone *arg1 = (FormFactorCone *) 0 ;
@@ -92084,7 +93780,30 @@ SWIGINTERN PyObject *FormFactorCone_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorCone6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorCone6__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCone6 *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCone6" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCone6 *)new FormFactorCone6(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCone6, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCone6__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -92095,10 +93814,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCone6(PyObject *SWIGUNUSEDPARM(self), P
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorCone6 *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCone6", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCone6" "', argument " "1"" of type '" "double""'");
@@ -92122,6 +93840,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorCone6(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCone6", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCone6__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorCone6__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCone6'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCone6::FormFactorCone6(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCone6::FormFactorCone6(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorCone6_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCone6 *arg1 = (FormFactorCone6 *) 0 ;
@@ -92276,7 +94042,609 @@ SWIGINTERN PyObject *FormFactorCone6_swiginit(PyObject *SWIGUNUSEDPARM(self), Py
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorCuboctahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleBox__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCosineRippleBox *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCosineRippleBox" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCosineRippleBox *)new FormFactorCosineRippleBox(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleBox, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleBox__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ double arg1 ;
+ double arg2 ;
+ double arg3 ;
+ double val1 ;
+ int ecode1 = 0 ;
+ double val2 ;
+ int ecode2 = 0 ;
+ double val3 ;
+ int ecode3 = 0 ;
+ FormFactorCosineRippleBox *result = 0 ;
+
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+ ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
+ if (!SWIG_IsOK(ecode1)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCosineRippleBox" "', argument " "1"" of type '" "double""'");
+ }
+ arg1 = static_cast< double >(val1);
+ ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorCosineRippleBox" "', argument " "2"" of type '" "double""'");
+ }
+ arg2 = static_cast< double >(val2);
+ ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
+ if (!SWIG_IsOK(ecode3)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorCosineRippleBox" "', argument " "3"" of type '" "double""'");
+ }
+ arg3 = static_cast< double >(val3);
+ result = (FormFactorCosineRippleBox *)new FormFactorCosineRippleBox(arg1,arg2,arg3);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleBox, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleBox(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCosineRippleBox", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCosineRippleBox__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorCosineRippleBox__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCosineRippleBox'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCosineRippleBox::FormFactorCosineRippleBox(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCosineRippleBox::FormFactorCosineRippleBox(double,double,double)\n");
+ return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorCosineRippleBox_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleBox *arg1 = (FormFactorCosineRippleBox *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+ FormFactorCosineRippleBox *result = 0 ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleBox, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCosineRippleBox_clone" "', argument " "1"" of type '" "FormFactorCosineRippleBox const *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleBox * >(argp1);
+ result = (FormFactorCosineRippleBox *)((FormFactorCosineRippleBox const *)arg1)->clone();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleBox, 0 | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorCosineRippleBox_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleBox *arg1 = (FormFactorCosineRippleBox *) 0 ;
+ INodeVisitor *arg2 = (INodeVisitor *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ void *argp2 = 0 ;
+ int res2 = 0 ;
+ PyObject *swig_obj[2] ;
+
+ if (!SWIG_Python_UnpackTuple(args, "FormFactorCosineRippleBox_accept", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleBox, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCosineRippleBox_accept" "', argument " "1"" of type '" "FormFactorCosineRippleBox const *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleBox * >(argp1);
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
+ if (!SWIG_IsOK(res2)) {
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCosineRippleBox_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
+ }
+ arg2 = reinterpret_cast< INodeVisitor * >(argp2);
+ ((FormFactorCosineRippleBox const *)arg1)->accept(arg2);
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FormFactorCosineRippleBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleBox *arg1 = (FormFactorCosineRippleBox *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleBox, SWIG_POINTER_DISOWN | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCosineRippleBox" "', argument " "1"" of type '" "FormFactorCosineRippleBox *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleBox * >(argp1);
+ delete arg1;
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *FormFactorCosineRippleBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *obj;
+ if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
+ SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCosineRippleBox, SWIG_NewClientData(obj));
+ return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *FormFactorCosineRippleBox_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCosineRippleGauss *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCosineRippleGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCosineRippleGauss *)new FormFactorCosineRippleGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ double arg1 ;
+ double arg2 ;
+ double arg3 ;
+ double val1 ;
+ int ecode1 = 0 ;
+ double val2 ;
+ int ecode2 = 0 ;
+ double val3 ;
+ int ecode3 = 0 ;
+ FormFactorCosineRippleGauss *result = 0 ;
+
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+ ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
+ if (!SWIG_IsOK(ecode1)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCosineRippleGauss" "', argument " "1"" of type '" "double""'");
+ }
+ arg1 = static_cast< double >(val1);
+ ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorCosineRippleGauss" "', argument " "2"" of type '" "double""'");
+ }
+ arg2 = static_cast< double >(val2);
+ ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
+ if (!SWIG_IsOK(ecode3)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorCosineRippleGauss" "', argument " "3"" of type '" "double""'");
+ }
+ arg3 = static_cast< double >(val3);
+ result = (FormFactorCosineRippleGauss *)new FormFactorCosineRippleGauss(arg1,arg2,arg3);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCosineRippleGauss", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCosineRippleGauss__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorCosineRippleGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCosineRippleGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCosineRippleGauss::FormFactorCosineRippleGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCosineRippleGauss::FormFactorCosineRippleGauss(double,double,double)\n");
+ return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorCosineRippleGauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleGauss *arg1 = (FormFactorCosineRippleGauss *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+ FormFactorCosineRippleGauss *result = 0 ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleGauss, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCosineRippleGauss_clone" "', argument " "1"" of type '" "FormFactorCosineRippleGauss const *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleGauss * >(argp1);
+ result = (FormFactorCosineRippleGauss *)((FormFactorCosineRippleGauss const *)arg1)->clone();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleGauss, 0 | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorCosineRippleGauss_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleGauss *arg1 = (FormFactorCosineRippleGauss *) 0 ;
+ INodeVisitor *arg2 = (INodeVisitor *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ void *argp2 = 0 ;
+ int res2 = 0 ;
+ PyObject *swig_obj[2] ;
+
+ if (!SWIG_Python_UnpackTuple(args, "FormFactorCosineRippleGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleGauss, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCosineRippleGauss_accept" "', argument " "1"" of type '" "FormFactorCosineRippleGauss const *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleGauss * >(argp1);
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
+ if (!SWIG_IsOK(res2)) {
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCosineRippleGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
+ }
+ arg2 = reinterpret_cast< INodeVisitor * >(argp2);
+ ((FormFactorCosineRippleGauss const *)arg1)->accept(arg2);
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FormFactorCosineRippleGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleGauss *arg1 = (FormFactorCosineRippleGauss *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleGauss, SWIG_POINTER_DISOWN | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCosineRippleGauss" "', argument " "1"" of type '" "FormFactorCosineRippleGauss *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleGauss * >(argp1);
+ delete arg1;
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *FormFactorCosineRippleGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *obj;
+ if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
+ SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCosineRippleGauss, SWIG_NewClientData(obj));
+ return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *FormFactorCosineRippleGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCosineRippleLorentz *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCosineRippleLorentz" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCosineRippleLorentz *)new FormFactorCosineRippleLorentz(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleLorentz, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ double arg1 ;
+ double arg2 ;
+ double arg3 ;
+ double val1 ;
+ int ecode1 = 0 ;
+ double val2 ;
+ int ecode2 = 0 ;
+ double val3 ;
+ int ecode3 = 0 ;
+ FormFactorCosineRippleLorentz *result = 0 ;
+
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
+ ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
+ if (!SWIG_IsOK(ecode1)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCosineRippleLorentz" "', argument " "1"" of type '" "double""'");
+ }
+ arg1 = static_cast< double >(val1);
+ ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorCosineRippleLorentz" "', argument " "2"" of type '" "double""'");
+ }
+ arg2 = static_cast< double >(val2);
+ ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
+ if (!SWIG_IsOK(ecode3)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorCosineRippleLorentz" "', argument " "3"" of type '" "double""'");
+ }
+ arg3 = static_cast< double >(val3);
+ result = (FormFactorCosineRippleLorentz *)new FormFactorCosineRippleLorentz(arg1,arg2,arg3);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleLorentz, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCosineRippleLorentz(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCosineRippleLorentz", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCosineRippleLorentz__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorCosineRippleLorentz__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCosineRippleLorentz'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCosineRippleLorentz::FormFactorCosineRippleLorentz(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCosineRippleLorentz::FormFactorCosineRippleLorentz(double,double,double)\n");
+ return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorCosineRippleLorentz_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleLorentz *arg1 = (FormFactorCosineRippleLorentz *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+ FormFactorCosineRippleLorentz *result = 0 ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleLorentz, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCosineRippleLorentz_clone" "', argument " "1"" of type '" "FormFactorCosineRippleLorentz const *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleLorentz * >(argp1);
+ result = (FormFactorCosineRippleLorentz *)((FormFactorCosineRippleLorentz const *)arg1)->clone();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCosineRippleLorentz, 0 | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorCosineRippleLorentz_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleLorentz *arg1 = (FormFactorCosineRippleLorentz *) 0 ;
+ INodeVisitor *arg2 = (INodeVisitor *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ void *argp2 = 0 ;
+ int res2 = 0 ;
+ PyObject *swig_obj[2] ;
+
+ if (!SWIG_Python_UnpackTuple(args, "FormFactorCosineRippleLorentz_accept", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleLorentz, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCosineRippleLorentz_accept" "', argument " "1"" of type '" "FormFactorCosineRippleLorentz const *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleLorentz * >(argp1);
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
+ if (!SWIG_IsOK(res2)) {
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCosineRippleLorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
+ }
+ arg2 = reinterpret_cast< INodeVisitor * >(argp2);
+ ((FormFactorCosineRippleLorentz const *)arg1)->accept(arg2);
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FormFactorCosineRippleLorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ FormFactorCosineRippleLorentz *arg1 = (FormFactorCosineRippleLorentz *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCosineRippleLorentz, SWIG_POINTER_DISOWN | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorCosineRippleLorentz" "', argument " "1"" of type '" "FormFactorCosineRippleLorentz *""'");
+ }
+ arg1 = reinterpret_cast< FormFactorCosineRippleLorentz * >(argp1);
+ delete arg1;
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *FormFactorCosineRippleLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *obj;
+ if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
+ SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorCosineRippleLorentz, SWIG_NewClientData(obj));
+ return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *FormFactorCosineRippleLorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCuboctahedron__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCuboctahedron *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCuboctahedron" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCuboctahedron *)new FormFactorCuboctahedron(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCuboctahedron, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCuboctahedron__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -92290,10 +94658,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCuboctahedron(PyObject *SWIGUNUSEDPARM(
int ecode3 = 0 ;
double val4 ;
int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
FormFactorCuboctahedron *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCuboctahedron", 4, 4, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCuboctahedron" "', argument " "1"" of type '" "double""'");
@@ -92322,6 +94689,60 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorCuboctahedron(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCuboctahedron", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCuboctahedron__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorCuboctahedron__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCuboctahedron'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCuboctahedron::FormFactorCuboctahedron(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCuboctahedron::FormFactorCuboctahedron(double,double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
@@ -92499,7 +94920,30 @@ SWIGINTERN PyObject *FormFactorCuboctahedron_swiginit(PyObject *SWIGUNUSEDPARM(s
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorCylinder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorCylinder__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorCylinder *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorCylinder" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorCylinder *)new FormFactorCylinder(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorCylinder, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorCylinder__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -92507,10 +94951,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorCylinder(PyObject *SWIGUNUSEDPARM(self)
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorCylinder *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorCylinder", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorCylinder" "', argument " "1"" of type '" "double""'");
@@ -92529,6 +94972,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorCylinder(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorCylinder", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorCylinder__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorCylinder__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorCylinder'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorCylinder::FormFactorCylinder(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorCylinder::FormFactorCylinder(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorCylinder_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCylinder *arg1 = (FormFactorCylinder *) 0 ;
@@ -92721,16 +95206,37 @@ SWIGINTERN PyObject *FormFactorCylinder_swiginit(PyObject *SWIGUNUSEDPARM(self),
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorDodecahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorDodecahedron__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorDodecahedron *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorDodecahedron" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorDodecahedron *)new FormFactorDodecahedron(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorDodecahedron, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorDodecahedron__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FormFactorDodecahedron *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorDodecahedron" "', argument " "1"" of type '" "double""'");
@@ -92744,6 +95250,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorDodecahedron(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorDodecahedron", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorDodecahedron__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorDodecahedron__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorDodecahedron'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorDodecahedron::FormFactorDodecahedron(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorDodecahedron::FormFactorDodecahedron(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorDodecahedron_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorDodecahedron *arg1 = (FormFactorDodecahedron *) 0 ;
@@ -92852,16 +95394,37 @@ SWIGINTERN PyObject *FormFactorDodecahedron_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorDot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorDot__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorDot *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorDot" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorDot *)new FormFactorDot(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorDot, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorDot__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FormFactorDot *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorDot" "', argument " "1"" of type '" "double""'");
@@ -92875,6 +95438,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorDot(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorDot", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorDot__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorDot__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorDot'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorDot::FormFactorDot(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorDot::FormFactorDot(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorDot_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorDot *arg1 = (FormFactorDot *) 0 ;
@@ -93110,7 +95709,30 @@ SWIGINTERN PyObject *FormFactorDot_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorEllipsoidalCylinder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorEllipsoidalCylinder__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorEllipsoidalCylinder *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorEllipsoidalCylinder" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorEllipsoidalCylinder *)new FormFactorEllipsoidalCylinder(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorEllipsoidalCylinder, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorEllipsoidalCylinder__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -93121,10 +95743,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorEllipsoidalCylinder(PyObject *SWIGUNUSE
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorEllipsoidalCylinder *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorEllipsoidalCylinder", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorEllipsoidalCylinder" "', argument " "1"" of type '" "double""'");
@@ -93148,6 +95769,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorEllipsoidalCylinder(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorEllipsoidalCylinder", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorEllipsoidalCylinder__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorEllipsoidalCylinder__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorEllipsoidalCylinder'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorEllipsoidalCylinder_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorEllipsoidalCylinder *arg1 = (FormFactorEllipsoidalCylinder *) 0 ;
@@ -93364,6 +96033,60 @@ SWIGINTERN PyObject *FormFactorEllipsoidalCylinder_swiginit(PyObject *SWIGUNUSED
}
SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ bool arg2 ;
+ bool val2 ;
+ int ecode2 = 0 ;
+ FormFactorFullSphere *result = 0 ;
+
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorFullSphere" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ ecode2 = SWIG_AsVal_bool(swig_obj[1], &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorFullSphere" "', argument " "2"" of type '" "bool""'");
+ }
+ arg2 = static_cast< bool >(val2);
+ result = (FormFactorFullSphere *)new FormFactorFullSphere(arg1,arg2);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorFullSphere, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorFullSphere *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorFullSphere" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorFullSphere *)new FormFactorFullSphere(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorFullSphere, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
bool arg2 ;
@@ -93392,7 +96115,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
@@ -93427,6 +96150,14 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere(PyObject *self, PyObject *ar
int res = SWIG_AsVal_double(argv[0], NULL);
_v = SWIG_CheckState(res);
}
+ if (_v) {
+ return _wrap_new_FormFactorFullSphere__SWIG_3(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
if (_v) {
return _wrap_new_FormFactorFullSphere__SWIG_1(self, argc, argv);
}
@@ -93437,6 +96168,20 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere(PyObject *self, PyObject *ar
int res = SWIG_AsVal_double(argv[0], NULL);
_v = SWIG_CheckState(res);
}
+ if (_v) {
+ {
+ int res = SWIG_AsVal_bool(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorFullSphere__SWIG_2(self, argc, argv);
+ }
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
if (_v) {
{
int res = SWIG_AsVal_bool(argv[1], NULL);
@@ -93451,6 +96196,8 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSphere(PyObject *self, PyObject *ar
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorFullSphere'.\n"
" Possible C/C++ prototypes are:\n"
+ " FormFactorFullSphere::FormFactorFullSphere(std::vector< double,std::allocator< double > > const,bool)\n"
+ " FormFactorFullSphere::FormFactorFullSphere(std::vector< double,std::allocator< double > > const)\n"
" FormFactorFullSphere::FormFactorFullSphere(double,bool)\n"
" FormFactorFullSphere::FormFactorFullSphere(double)\n");
return 0;
@@ -93692,7 +96439,30 @@ SWIGINTERN PyObject *FormFactorFullSphere_swiginit(PyObject *SWIGUNUSEDPARM(self
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorFullSpheroid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSpheroid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorFullSpheroid *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorFullSpheroid" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorFullSpheroid *)new FormFactorFullSpheroid(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorFullSpheroid, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSpheroid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -93700,10 +96470,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorFullSpheroid(PyObject *SWIGUNUSEDPARM(s
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorFullSpheroid *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorFullSpheroid", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorFullSpheroid" "', argument " "1"" of type '" "double""'");
@@ -93722,6 +96491,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorFullSpheroid(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorFullSpheroid", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorFullSpheroid__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorFullSpheroid__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorFullSpheroid'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorFullSpheroid::FormFactorFullSpheroid(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorFullSpheroid::FormFactorFullSpheroid(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorFullSpheroid_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorFullSpheroid *arg1 = (FormFactorFullSpheroid *) 0 ;
@@ -93914,7 +96725,30 @@ SWIGINTERN PyObject *FormFactorFullSpheroid_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorHemiEllipsoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorHemiEllipsoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorHemiEllipsoid *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorHemiEllipsoid" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorHemiEllipsoid *)new FormFactorHemiEllipsoid(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorHemiEllipsoid, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorHemiEllipsoid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -93925,10 +96759,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorHemiEllipsoid(PyObject *SWIGUNUSEDPARM(
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorHemiEllipsoid *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorHemiEllipsoid", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorHemiEllipsoid" "', argument " "1"" of type '" "double""'");
@@ -93952,6 +96785,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorHemiEllipsoid(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorHemiEllipsoid", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorHemiEllipsoid__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorHemiEllipsoid__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorHemiEllipsoid'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_delete_FormFactorHemiEllipsoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorHemiEllipsoid *arg1 = (FormFactorHemiEllipsoid *) 0 ;
@@ -94167,7 +97048,30 @@ SWIGINTERN PyObject *FormFactorHemiEllipsoid_swiginit(PyObject *SWIGUNUSEDPARM(s
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorHollowSphere(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorHollowSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorHollowSphere *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorHollowSphere" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorHollowSphere *)new FormFactorHollowSphere(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorHollowSphere, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorHollowSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -94175,10 +97079,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorHollowSphere(PyObject *SWIGUNUSEDPARM(s
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorHollowSphere *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorHollowSphere", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorHollowSphere" "', argument " "1"" of type '" "double""'");
@@ -94197,6 +97100,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorHollowSphere(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorHollowSphere", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorHollowSphere__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorHollowSphere__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorHollowSphere'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorHollowSphere::FormFactorHollowSphere(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorHollowSphere::FormFactorHollowSphere(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorHollowSphere_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorHollowSphere *arg1 = (FormFactorHollowSphere *) 0 ;
@@ -94343,16 +97288,37 @@ SWIGINTERN PyObject *FormFactorHollowSphere_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorIcosahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorIcosahedron__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorIcosahedron *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorIcosahedron" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorIcosahedron *)new FormFactorIcosahedron(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorIcosahedron, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorIcosahedron__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FormFactorIcosahedron *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorIcosahedron" "', argument " "1"" of type '" "double""'");
@@ -94366,6 +97332,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorIcosahedron(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorIcosahedron", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorIcosahedron__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorIcosahedron__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorIcosahedron'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorIcosahedron::FormFactorIcosahedron(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorIcosahedron::FormFactorIcosahedron(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorIcosahedron_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorIcosahedron *arg1 = (FormFactorIcosahedron *) 0 ;
@@ -94474,7 +97476,30 @@ SWIGINTERN PyObject *FormFactorIcosahedron_swiginit(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorLongBoxGauss *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorLongBoxGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorLongBoxGauss *)new FormFactorLongBoxGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorLongBoxGauss, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -94485,10 +97510,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxGauss(PyObject *SWIGUNUSEDPARM(s
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorLongBoxGauss *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongBoxGauss", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorLongBoxGauss" "', argument " "1"" of type '" "double""'");
@@ -94512,6 +97536,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorLongBoxGauss", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorLongBoxGauss__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorLongBoxGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorLongBoxGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorLongBoxGauss::FormFactorLongBoxGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorLongBoxGauss::FormFactorLongBoxGauss(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorLongBoxGauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorLongBoxGauss *arg1 = (FormFactorLongBoxGauss *) 0 ;
@@ -94727,7 +97799,30 @@ SWIGINTERN PyObject *FormFactorLongBoxGauss_swiginit(PyObject *SWIGUNUSEDPARM(se
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxLorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorLongBoxLorentz *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorLongBoxLorentz" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorLongBoxLorentz *)new FormFactorLongBoxLorentz(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorLongBoxLorentz, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -94738,10 +97833,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxLorentz(PyObject *SWIGUNUSEDPARM
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorLongBoxLorentz *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorLongBoxLorentz", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorLongBoxLorentz" "', argument " "1"" of type '" "double""'");
@@ -94765,6 +97859,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorLongBoxLorentz(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorLongBoxLorentz", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorLongBoxLorentz__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorLongBoxLorentz__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorLongBoxLorentz'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorLongBoxLorentz_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorLongBoxLorentz *arg1 = (FormFactorLongBoxLorentz *) 0 ;
@@ -94980,7 +98122,30 @@ SWIGINTERN PyObject *FormFactorLongBoxLorentz_swiginit(PyObject *SWIGUNUSEDPARM(
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorPrism3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorPrism3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorPrism3 *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorPrism3" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorPrism3 *)new FormFactorPrism3(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorPrism3, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorPrism3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -94988,10 +98153,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorPrism3(PyObject *SWIGUNUSEDPARM(self),
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorPrism3 *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorPrism3", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorPrism3" "', argument " "1"" of type '" "double""'");
@@ -95010,6 +98174,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorPrism3(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorPrism3", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorPrism3__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorPrism3__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorPrism3'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorPrism3::FormFactorPrism3(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorPrism3::FormFactorPrism3(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorPrism3_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorPrism3 *arg1 = (FormFactorPrism3 *) 0 ;
@@ -95118,7 +98324,30 @@ SWIGINTERN PyObject *FormFactorPrism3_swiginit(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorPrism6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorPrism6__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorPrism6 *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorPrism6" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorPrism6 *)new FormFactorPrism6(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorPrism6, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorPrism6__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -95126,10 +98355,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorPrism6(PyObject *SWIGUNUSEDPARM(self),
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorPrism6 *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorPrism6", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorPrism6" "', argument " "1"" of type '" "double""'");
@@ -95148,6 +98376,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorPrism6(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorPrism6", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorPrism6__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorPrism6__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorPrism6'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorPrism6::FormFactorPrism6(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorPrism6::FormFactorPrism6(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorPrism6_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorPrism6 *arg1 = (FormFactorPrism6 *) 0 ;
@@ -95256,7 +98526,30 @@ SWIGINTERN PyObject *FormFactorPrism6_swiginit(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorPyramid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorPyramid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorPyramid *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorPyramid" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorPyramid *)new FormFactorPyramid(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorPyramid, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorPyramid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -95267,10 +98560,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorPyramid(PyObject *SWIGUNUSEDPARM(self),
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorPyramid *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorPyramid", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorPyramid" "', argument " "1"" of type '" "double""'");
@@ -95294,6 +98586,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorPyramid(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorPyramid", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorPyramid__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorPyramid__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorPyramid'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorPyramid::FormFactorPyramid(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorPyramid::FormFactorPyramid(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorPyramid_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorPyramid *arg1 = (FormFactorPyramid *) 0 ;
@@ -95448,193 +98788,154 @@ SWIGINTERN PyObject *FormFactorPyramid_swiginit(PyObject *SWIGUNUSEDPARM(self),
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorRipple1Box(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double arg2 ;
- double arg3 ;
- double val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- FormFactorRipple1Box *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple1Box", 3, 3, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorRipple1Box" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple1Box" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple1Box" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = (FormFactorRipple1Box *)new FormFactorRipple1Box(arg1,arg2,arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple1Box, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FormFactorRipple1Box_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FormFactorRipple1Box *arg1 = (FormFactorRipple1Box *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- FormFactorRipple1Box *result = 0 ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Box, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1Box_clone" "', argument " "1"" of type '" "FormFactorRipple1Box const *""'");
- }
- arg1 = reinterpret_cast< FormFactorRipple1Box * >(argp1);
- result = (FormFactorRipple1Box *)((FormFactorRipple1Box const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple1Box, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FormFactorRipple1Box_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FormFactorRipple1Box *arg1 = (FormFactorRipple1Box *) 0 ;
- INodeVisitor *arg2 = (INodeVisitor *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple1Box_accept", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Box, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1Box_accept" "', argument " "1"" of type '" "FormFactorRipple1Box const *""'");
- }
- arg1 = reinterpret_cast< FormFactorRipple1Box * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple1Box_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
- }
- arg2 = reinterpret_cast< INodeVisitor * >(argp2);
- ((FormFactorRipple1Box const *)arg1)->accept(arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple1Box(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleBox__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
- FormFactorRipple1Box *arg1 = (FormFactorRipple1Box *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorSawtoothRippleBox *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Box, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple1Box" "', argument " "1"" of type '" "FormFactorRipple1Box *""'");
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorSawtoothRippleBox" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
}
- arg1 = reinterpret_cast< FormFactorRipple1Box * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
+ result = (FormFactorSawtoothRippleBox *)new FormFactorSawtoothRippleBox(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleBox, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *FormFactorRipple1Box_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple1Box, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *FormFactorRipple1Box_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_FormFactorRipple1Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleBox__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
double arg3 ;
+ double arg4 ;
double val1 ;
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- FormFactorRipple1Gauss *result = 0 ;
+ double val4 ;
+ int ecode4 = 0 ;
+ FormFactorSawtoothRippleBox *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple1Gauss", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorRipple1Gauss" "', argument " "1"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorSawtoothRippleBox" "', argument " "1"" of type '" "double""'");
}
arg1 = static_cast< double >(val1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple1Gauss" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorSawtoothRippleBox" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple1Gauss" "', argument " "3"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorSawtoothRippleBox" "', argument " "3"" of type '" "double""'");
}
arg3 = static_cast< double >(val3);
- result = (FormFactorRipple1Gauss *)new FormFactorRipple1Gauss(arg1,arg2,arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple1Gauss, SWIG_POINTER_NEW | 0 );
+ ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
+ if (!SWIG_IsOK(ecode4)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorSawtoothRippleBox" "', argument " "4"" of type '" "double""'");
+ }
+ arg4 = static_cast< double >(val4);
+ result = (FormFactorSawtoothRippleBox *)new FormFactorSawtoothRippleBox(arg1,arg2,arg3,arg4);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleBox, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_FormFactorRipple1Gauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleBox(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorSawtoothRippleBox", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorSawtoothRippleBox__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorSawtoothRippleBox__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorSawtoothRippleBox'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorSawtoothRippleBox::FormFactorSawtoothRippleBox(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorSawtoothRippleBox::FormFactorSawtoothRippleBox(double,double,double,double)\n");
+ return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorSawtoothRippleBox_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple1Gauss *arg1 = (FormFactorRipple1Gauss *) 0 ;
+ FormFactorSawtoothRippleBox *arg1 = (FormFactorSawtoothRippleBox *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
- FormFactorRipple1Gauss *result = 0 ;
+ FormFactorSawtoothRippleBox *result = 0 ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Gauss, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleBox, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1Gauss_clone" "', argument " "1"" of type '" "FormFactorRipple1Gauss const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSawtoothRippleBox_clone" "', argument " "1"" of type '" "FormFactorSawtoothRippleBox const *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple1Gauss * >(argp1);
- result = (FormFactorRipple1Gauss *)((FormFactorRipple1Gauss const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple1Gauss, 0 | 0 );
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleBox * >(argp1);
+ result = (FormFactorSawtoothRippleBox *)((FormFactorSawtoothRippleBox const *)arg1)->clone();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleBox, 0 | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_FormFactorRipple1Gauss_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorSawtoothRippleBox_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple1Gauss *arg1 = (FormFactorRipple1Gauss *) 0 ;
+ FormFactorSawtoothRippleBox *arg1 = (FormFactorSawtoothRippleBox *) 0 ;
INodeVisitor *arg2 = (INodeVisitor *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -95642,18 +98943,18 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple1Gauss_accept(PyObject *SWIGUNUSEDPAR
int res2 = 0 ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple1Gauss_accept", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Gauss, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "FormFactorSawtoothRippleBox_accept", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleBox, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1Gauss_accept" "', argument " "1"" of type '" "FormFactorRipple1Gauss const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSawtoothRippleBox_accept" "', argument " "1"" of type '" "FormFactorSawtoothRippleBox const *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple1Gauss * >(argp1);
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleBox * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple1Gauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSawtoothRippleBox_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
}
arg2 = reinterpret_cast< INodeVisitor * >(argp2);
- ((FormFactorRipple1Gauss const *)arg1)->accept(arg2);
+ ((FormFactorSawtoothRippleBox const *)arg1)->accept(arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -95661,20 +98962,20 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple1Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_FormFactorSawtoothRippleBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple1Gauss *arg1 = (FormFactorRipple1Gauss *) 0 ;
+ FormFactorSawtoothRippleBox *arg1 = (FormFactorSawtoothRippleBox *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Gauss, SWIG_POINTER_DISOWN | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleBox, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple1Gauss" "', argument " "1"" of type '" "FormFactorRipple1Gauss *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSawtoothRippleBox" "', argument " "1"" of type '" "FormFactorSawtoothRippleBox *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple1Gauss * >(argp1);
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleBox * >(argp1);
delete arg1;
resultobj = SWIG_Py_Void();
return resultobj;
@@ -95683,141 +98984,41 @@ fail:
}
-SWIGINTERN PyObject *FormFactorRipple1Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorSawtoothRippleBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple1Gauss, SWIG_NewClientData(obj));
+ SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSawtoothRippleBox, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *FormFactorRipple1Gauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorSawtoothRippleBox_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorRipple1Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double arg2 ;
- double arg3 ;
- double val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- FormFactorRipple1Lorentz *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple1Lorentz", 3, 3, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorRipple1Lorentz" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple1Lorentz" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple1Lorentz" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = (FormFactorRipple1Lorentz *)new FormFactorRipple1Lorentz(arg1,arg2,arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple1Lorentz, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FormFactorRipple1Lorentz_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FormFactorRipple1Lorentz *arg1 = (FormFactorRipple1Lorentz *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- FormFactorRipple1Lorentz *result = 0 ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Lorentz, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1Lorentz_clone" "', argument " "1"" of type '" "FormFactorRipple1Lorentz const *""'");
- }
- arg1 = reinterpret_cast< FormFactorRipple1Lorentz * >(argp1);
- result = (FormFactorRipple1Lorentz *)((FormFactorRipple1Lorentz const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple1Lorentz, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FormFactorRipple1Lorentz_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FormFactorRipple1Lorentz *arg1 = (FormFactorRipple1Lorentz *) 0 ;
- INodeVisitor *arg2 = (INodeVisitor *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple1Lorentz_accept", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Lorentz, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple1Lorentz_accept" "', argument " "1"" of type '" "FormFactorRipple1Lorentz const *""'");
- }
- arg1 = reinterpret_cast< FormFactorRipple1Lorentz * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple1Lorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
- }
- arg2 = reinterpret_cast< INodeVisitor * >(argp2);
- ((FormFactorRipple1Lorentz const *)arg1)->accept(arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple1Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleGauss__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
- FormFactorRipple1Lorentz *arg1 = (FormFactorRipple1Lorentz *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorSawtoothRippleGauss *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple1Lorentz, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple1Lorentz" "', argument " "1"" of type '" "FormFactorRipple1Lorentz *""'");
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorSawtoothRippleGauss" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
}
- arg1 = reinterpret_cast< FormFactorRipple1Lorentz * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
+ result = (FormFactorSawtoothRippleGauss *)new FormFactorSawtoothRippleGauss(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleGauss, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *FormFactorRipple1Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple1Lorentz, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *FormFactorRipple1Lorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_FormFactorRipple2Box(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleGauss__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -95831,64 +99032,117 @@ SWIGINTERN PyObject *_wrap_new_FormFactorRipple2Box(PyObject *SWIGUNUSEDPARM(sel
int ecode3 = 0 ;
double val4 ;
int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
- FormFactorRipple2Box *result = 0 ;
+ FormFactorSawtoothRippleGauss *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple2Box", 4, 4, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorRipple2Box" "', argument " "1"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorSawtoothRippleGauss" "', argument " "1"" of type '" "double""'");
}
arg1 = static_cast< double >(val1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple2Box" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorSawtoothRippleGauss" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple2Box" "', argument " "3"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorSawtoothRippleGauss" "', argument " "3"" of type '" "double""'");
}
arg3 = static_cast< double >(val3);
ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorRipple2Box" "', argument " "4"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorSawtoothRippleGauss" "', argument " "4"" of type '" "double""'");
}
arg4 = static_cast< double >(val4);
- result = (FormFactorRipple2Box *)new FormFactorRipple2Box(arg1,arg2,arg3,arg4);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple2Box, SWIG_POINTER_NEW | 0 );
+ result = (FormFactorSawtoothRippleGauss *)new FormFactorSawtoothRippleGauss(arg1,arg2,arg3,arg4);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleGauss, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_FormFactorRipple2Box_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleGauss(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorSawtoothRippleGauss", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorSawtoothRippleGauss__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorSawtoothRippleGauss__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorSawtoothRippleGauss'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorSawtoothRippleGauss::FormFactorSawtoothRippleGauss(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorSawtoothRippleGauss::FormFactorSawtoothRippleGauss(double,double,double,double)\n");
+ return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorSawtoothRippleGauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple2Box *arg1 = (FormFactorRipple2Box *) 0 ;
+ FormFactorSawtoothRippleGauss *arg1 = (FormFactorSawtoothRippleGauss *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
- FormFactorRipple2Box *result = 0 ;
+ FormFactorSawtoothRippleGauss *result = 0 ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Box, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleGauss, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2Box_clone" "', argument " "1"" of type '" "FormFactorRipple2Box const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSawtoothRippleGauss_clone" "', argument " "1"" of type '" "FormFactorSawtoothRippleGauss const *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple2Box * >(argp1);
- result = (FormFactorRipple2Box *)((FormFactorRipple2Box const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple2Box, 0 | 0 );
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleGauss * >(argp1);
+ result = (FormFactorSawtoothRippleGauss *)((FormFactorSawtoothRippleGauss const *)arg1)->clone();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleGauss, 0 | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_FormFactorRipple2Box_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorSawtoothRippleGauss_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple2Box *arg1 = (FormFactorRipple2Box *) 0 ;
+ FormFactorSawtoothRippleGauss *arg1 = (FormFactorSawtoothRippleGauss *) 0 ;
INodeVisitor *arg2 = (INodeVisitor *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -95896,18 +99150,18 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2Box_accept(PyObject *SWIGUNUSEDPARM(
int res2 = 0 ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple2Box_accept", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Box, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "FormFactorSawtoothRippleGauss_accept", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleGauss, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2Box_accept" "', argument " "1"" of type '" "FormFactorRipple2Box const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSawtoothRippleGauss_accept" "', argument " "1"" of type '" "FormFactorSawtoothRippleGauss const *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple2Box * >(argp1);
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleGauss * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple2Box_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSawtoothRippleGauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
}
arg2 = reinterpret_cast< INodeVisitor * >(argp2);
- ((FormFactorRipple2Box const *)arg1)->accept(arg2);
+ ((FormFactorSawtoothRippleGauss const *)arg1)->accept(arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -95915,20 +99169,20 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple2Box(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_FormFactorSawtoothRippleGauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple2Box *arg1 = (FormFactorRipple2Box *) 0 ;
+ FormFactorSawtoothRippleGauss *arg1 = (FormFactorSawtoothRippleGauss *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Box, SWIG_POINTER_DISOWN | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleGauss, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple2Box" "', argument " "1"" of type '" "FormFactorRipple2Box *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSawtoothRippleGauss" "', argument " "1"" of type '" "FormFactorSawtoothRippleGauss *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple2Box * >(argp1);
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleGauss * >(argp1);
delete arg1;
resultobj = SWIG_Py_Void();
return resultobj;
@@ -95937,149 +99191,41 @@ fail:
}
-SWIGINTERN PyObject *FormFactorRipple2Box_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorSawtoothRippleGauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple2Box, SWIG_NewClientData(obj));
+ SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSawtoothRippleGauss, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *FormFactorRipple2Box_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorSawtoothRippleGauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorRipple2Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double arg2 ;
- double arg3 ;
- double arg4 ;
- double val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- double val4 ;
- int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
- FormFactorRipple2Gauss *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple2Gauss", 4, 4, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorRipple2Gauss" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple2Gauss" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple2Gauss" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorRipple2Gauss" "', argument " "4"" of type '" "double""'");
- }
- arg4 = static_cast< double >(val4);
- result = (FormFactorRipple2Gauss *)new FormFactorRipple2Gauss(arg1,arg2,arg3,arg4);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple2Gauss, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FormFactorRipple2Gauss_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FormFactorRipple2Gauss *arg1 = (FormFactorRipple2Gauss *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- FormFactorRipple2Gauss *result = 0 ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Gauss, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2Gauss_clone" "', argument " "1"" of type '" "FormFactorRipple2Gauss const *""'");
- }
- arg1 = reinterpret_cast< FormFactorRipple2Gauss * >(argp1);
- result = (FormFactorRipple2Gauss *)((FormFactorRipple2Gauss const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple2Gauss, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FormFactorRipple2Gauss_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- FormFactorRipple2Gauss *arg1 = (FormFactorRipple2Gauss *) 0 ;
- INodeVisitor *arg2 = (INodeVisitor *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple2Gauss_accept", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Gauss, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2Gauss_accept" "', argument " "1"" of type '" "FormFactorRipple2Gauss const *""'");
- }
- arg1 = reinterpret_cast< FormFactorRipple2Gauss * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple2Gauss_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
- }
- arg2 = reinterpret_cast< INodeVisitor * >(argp2);
- ((FormFactorRipple2Gauss const *)arg1)->accept(arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple2Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleLorentz__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
- FormFactorRipple2Gauss *arg1 = (FormFactorRipple2Gauss *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorSawtoothRippleLorentz *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Gauss, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple2Gauss" "', argument " "1"" of type '" "FormFactorRipple2Gauss *""'");
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorSawtoothRippleLorentz" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
}
- arg1 = reinterpret_cast< FormFactorRipple2Gauss * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
+ result = (FormFactorSawtoothRippleLorentz *)new FormFactorSawtoothRippleLorentz(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleLorentz, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *FormFactorRipple2Gauss_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple2Gauss, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *FormFactorRipple2Gauss_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_FormFactorRipple2Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleLorentz__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -96093,64 +99239,117 @@ SWIGINTERN PyObject *_wrap_new_FormFactorRipple2Lorentz(PyObject *SWIGUNUSEDPARM
int ecode3 = 0 ;
double val4 ;
int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
- FormFactorRipple2Lorentz *result = 0 ;
+ FormFactorSawtoothRippleLorentz *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorRipple2Lorentz", 4, 4, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorRipple2Lorentz" "', argument " "1"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorSawtoothRippleLorentz" "', argument " "1"" of type '" "double""'");
}
arg1 = static_cast< double >(val1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorRipple2Lorentz" "', argument " "2"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorSawtoothRippleLorentz" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorRipple2Lorentz" "', argument " "3"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_FormFactorSawtoothRippleLorentz" "', argument " "3"" of type '" "double""'");
}
arg3 = static_cast< double >(val3);
ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorRipple2Lorentz" "', argument " "4"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_FormFactorSawtoothRippleLorentz" "', argument " "4"" of type '" "double""'");
}
arg4 = static_cast< double >(val4);
- result = (FormFactorRipple2Lorentz *)new FormFactorRipple2Lorentz(arg1,arg2,arg3,arg4);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple2Lorentz, SWIG_POINTER_NEW | 0 );
+ result = (FormFactorSawtoothRippleLorentz *)new FormFactorSawtoothRippleLorentz(arg1,arg2,arg3,arg4);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleLorentz, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_FormFactorRipple2Lorentz_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSawtoothRippleLorentz(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorSawtoothRippleLorentz", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorSawtoothRippleLorentz__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorSawtoothRippleLorentz__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorSawtoothRippleLorentz'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorSawtoothRippleLorentz::FormFactorSawtoothRippleLorentz(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorSawtoothRippleLorentz::FormFactorSawtoothRippleLorentz(double,double,double,double)\n");
+ return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_FormFactorSawtoothRippleLorentz_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple2Lorentz *arg1 = (FormFactorRipple2Lorentz *) 0 ;
+ FormFactorSawtoothRippleLorentz *arg1 = (FormFactorSawtoothRippleLorentz *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
- FormFactorRipple2Lorentz *result = 0 ;
+ FormFactorSawtoothRippleLorentz *result = 0 ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Lorentz, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleLorentz, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2Lorentz_clone" "', argument " "1"" of type '" "FormFactorRipple2Lorentz const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSawtoothRippleLorentz_clone" "', argument " "1"" of type '" "FormFactorSawtoothRippleLorentz const *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple2Lorentz * >(argp1);
- result = (FormFactorRipple2Lorentz *)((FormFactorRipple2Lorentz const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorRipple2Lorentz, 0 | 0 );
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleLorentz * >(argp1);
+ result = (FormFactorSawtoothRippleLorentz *)((FormFactorSawtoothRippleLorentz const *)arg1)->clone();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSawtoothRippleLorentz, 0 | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_FormFactorRipple2Lorentz_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorSawtoothRippleLorentz_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple2Lorentz *arg1 = (FormFactorRipple2Lorentz *) 0 ;
+ FormFactorSawtoothRippleLorentz *arg1 = (FormFactorSawtoothRippleLorentz *) 0 ;
INodeVisitor *arg2 = (INodeVisitor *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -96158,18 +99357,18 @@ SWIGINTERN PyObject *_wrap_FormFactorRipple2Lorentz_accept(PyObject *SWIGUNUSEDP
int res2 = 0 ;
PyObject *swig_obj[2] ;
- if (!SWIG_Python_UnpackTuple(args, "FormFactorRipple2Lorentz_accept", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Lorentz, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "FormFactorSawtoothRippleLorentz_accept", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleLorentz, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorRipple2Lorentz_accept" "', argument " "1"" of type '" "FormFactorRipple2Lorentz const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorSawtoothRippleLorentz_accept" "', argument " "1"" of type '" "FormFactorSawtoothRippleLorentz const *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple2Lorentz * >(argp1);
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleLorentz * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorRipple2Lorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorSawtoothRippleLorentz_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
}
arg2 = reinterpret_cast< INodeVisitor * >(argp2);
- ((FormFactorRipple2Lorentz const *)arg1)->accept(arg2);
+ ((FormFactorSawtoothRippleLorentz const *)arg1)->accept(arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -96177,20 +99376,20 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_FormFactorRipple2Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_FormFactorSawtoothRippleLorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- FormFactorRipple2Lorentz *arg1 = (FormFactorRipple2Lorentz *) 0 ;
+ FormFactorSawtoothRippleLorentz *arg1 = (FormFactorSawtoothRippleLorentz *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorRipple2Lorentz, SWIG_POINTER_DISOWN | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorSawtoothRippleLorentz, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorRipple2Lorentz" "', argument " "1"" of type '" "FormFactorRipple2Lorentz *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FormFactorSawtoothRippleLorentz" "', argument " "1"" of type '" "FormFactorSawtoothRippleLorentz *""'");
}
- arg1 = reinterpret_cast< FormFactorRipple2Lorentz * >(argp1);
+ arg1 = reinterpret_cast< FormFactorSawtoothRippleLorentz * >(argp1);
delete arg1;
resultobj = SWIG_Py_Void();
return resultobj;
@@ -96199,18 +99398,41 @@ fail:
}
-SWIGINTERN PyObject *FormFactorRipple2Lorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorSawtoothRippleLorentz_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorRipple2Lorentz, SWIG_NewClientData(obj));
+ SWIG_TypeNewClientData(SWIGTYPE_p_FormFactorSawtoothRippleLorentz, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *FormFactorRipple2Lorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *FormFactorSawtoothRippleLorentz_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorTetrahedron(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorTetrahedron__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorTetrahedron *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorTetrahedron" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorTetrahedron *)new FormFactorTetrahedron(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorTetrahedron, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorTetrahedron__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -96221,10 +99443,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTetrahedron(PyObject *SWIGUNUSEDPARM(se
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorTetrahedron *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorTetrahedron", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTetrahedron" "', argument " "1"" of type '" "double""'");
@@ -96248,6 +99469,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorTetrahedron(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorTetrahedron", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorTetrahedron__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorTetrahedron__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorTetrahedron'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorTetrahedron::FormFactorTetrahedron(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorTetrahedron::FormFactorTetrahedron(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorTetrahedron *arg1 = (FormFactorTetrahedron *) 0 ;
@@ -96402,7 +99671,30 @@ SWIGINTERN PyObject *FormFactorTetrahedron_swiginit(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedCube(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedCube__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorTruncatedCube *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorTruncatedCube" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorTruncatedCube *)new FormFactorTruncatedCube(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorTruncatedCube, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedCube__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -96410,10 +99702,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedCube(PyObject *SWIGUNUSEDPARM(
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorTruncatedCube *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedCube", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTruncatedCube" "', argument " "1"" of type '" "double""'");
@@ -96432,6 +99723,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedCube(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedCube", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorTruncatedCube__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorTruncatedCube__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorTruncatedCube'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorTruncatedCube::FormFactorTruncatedCube(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorTruncatedCube::FormFactorTruncatedCube(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorTruncatedCube_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorTruncatedCube *arg1 = (FormFactorTruncatedCube *) 0 ;
@@ -96563,7 +99896,30 @@ SWIGINTERN PyObject *FormFactorTruncatedCube_swiginit(PyObject *SWIGUNUSEDPARM(s
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorTruncatedSphere *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorTruncatedSphere" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorTruncatedSphere *)new FormFactorTruncatedSphere(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorTruncatedSphere, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -96574,10 +99930,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere(PyObject *SWIGUNUSEDPAR
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorTruncatedSphere *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedSphere", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTruncatedSphere" "', argument " "1"" of type '" "double""'");
@@ -96601,6 +99956,54 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSphere(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedSphere", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorTruncatedSphere__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_new_FormFactorTruncatedSphere__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorTruncatedSphere'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorTruncatedSphere::FormFactorTruncatedSphere(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorTruncatedSphere::FormFactorTruncatedSphere(double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorTruncatedSphere_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorTruncatedSphere *arg1 = (FormFactorTruncatedSphere *) 0 ;
@@ -96816,7 +100219,30 @@ SWIGINTERN PyObject *FormFactorTruncatedSphere_swiginit(PyObject *SWIGUNUSEDPARM
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorTruncatedSpheroid *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorTruncatedSpheroid *)new FormFactorTruncatedSpheroid(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorTruncatedSpheroid, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -96830,10 +100256,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid(PyObject *SWIGUNUSEDP
int ecode3 = 0 ;
double val4 ;
int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
FormFactorTruncatedSpheroid *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedSpheroid", 4, 4, swig_obj)) SWIG_fail;
+ if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorTruncatedSpheroid" "', argument " "1"" of type '" "double""'");
@@ -96862,6 +100287,60 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorTruncatedSpheroid(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[5] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorTruncatedSpheroid", 0, 4, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorTruncatedSpheroid__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 4) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _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_AsVal_double(argv[3], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorTruncatedSpheroid__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorTruncatedSpheroid'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double,double,double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorTruncatedSpheroid_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorTruncatedSpheroid *arg1 = (FormFactorTruncatedSpheroid *) 0 ;
@@ -97100,106 +100579,37 @@ SWIGINTERN PyObject *FormFactorTruncatedSpheroid_swiginit(PyObject *SWIGUNUSEDPA
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_factor_x_box(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorGaussSphere__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
- complex_t arg1 ;
- double arg2 ;
- std::complex< double > val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
- complex_t result;
-
- if (!SWIG_Python_UnpackTuple(args, "factor_x_box", 2, 2, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "factor_x_box" "', argument " "1"" of type '" "complex_t""'");
- }
- arg1 = static_cast< complex_t >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "factor_x_box" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- result = ripples::factor_x_box(arg1,arg2);
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_factor_x_Gauss(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- complex_t arg1 ;
- double arg2 ;
- std::complex< double > val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
- complex_t result;
-
- if (!SWIG_Python_UnpackTuple(args, "factor_x_Gauss", 2, 2, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "factor_x_Gauss" "', argument " "1"" of type '" "complex_t""'");
- }
- arg1 = static_cast< complex_t >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "factor_x_Gauss" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- result = ripples::factor_x_Gauss(arg1,arg2);
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_factor_x_Lorentz(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- complex_t arg1 ;
- double arg2 ;
- std::complex< double > val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
- complex_t result;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorGaussSphere *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "factor_x_Lorentz", 2, 2, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_std_complex_Sl_double_Sg_(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "factor_x_Lorentz" "', argument " "1"" of type '" "complex_t""'");
- }
- arg1 = static_cast< complex_t >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "factor_x_Lorentz" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- result = ripples::factor_x_Lorentz(arg1,arg2);
- resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result));
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorGaussSphere" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorGaussSphere *)new FormFactorGaussSphere(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorGaussSphere, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_new_FormFactorGaussSphere(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorGaussSphere__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
FormFactorGaussSphere *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorGaussSphere" "', argument " "1"" of type '" "double""'");
@@ -97213,6 +100623,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorGaussSphere(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorGaussSphere", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorGaussSphere__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorGaussSphere__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorGaussSphere'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorGaussSphere::FormFactorGaussSphere(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorGaussSphere::FormFactorGaussSphere(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorGaussSphere_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorGaussSphere *arg1 = (FormFactorGaussSphere *) 0 ;
@@ -97382,7 +100828,30 @@ SWIGINTERN PyObject *FormFactorGaussSphere_swiginit(PyObject *SWIGUNUSEDPARM(sel
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorSphereGaussianRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSphereGaussianRadius__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorSphereGaussianRadius *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorSphereGaussianRadius" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorSphereGaussianRadius *)new FormFactorSphereGaussianRadius(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSphereGaussianRadius, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorSphereGaussianRadius__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -97390,10 +100859,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorSphereGaussianRadius(PyObject *SWIGUNUS
int ecode1 = 0 ;
double val2 ;
int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
FormFactorSphereGaussianRadius *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorSphereGaussianRadius", 2, 2, swig_obj)) SWIG_fail;
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorSphereGaussianRadius" "', argument " "1"" of type '" "double""'");
@@ -97412,6 +100880,48 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorSphereGaussianRadius(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[3] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorSphereGaussianRadius", 0, 2, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorSphereGaussianRadius__SWIG_0(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorSphereGaussianRadius__SWIG_1(self, argc, argv);
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorSphereGaussianRadius'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double,double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorSphereGaussianRadius_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorSphereGaussianRadius *arg1 = (FormFactorSphereGaussianRadius *) 0 ;
@@ -97558,7 +101068,61 @@ SWIGINTERN PyObject *FormFactorSphereGaussianRadius_swiginit(PyObject *SWIGUNUSE
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ size_t arg2 ;
+ size_t val2 ;
+ int ecode2 = 0 ;
+ FormFactorSphereLogNormalRadius *result = 0 ;
+
+ if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorSphereLogNormalRadius" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_FormFactorSphereLogNormalRadius" "', argument " "2"" of type '" "size_t""'");
+ }
+ arg2 = static_cast< size_t >(val2);
+ result = (FormFactorSphereLogNormalRadius *)new FormFactorSphereLogNormalRadius(arg1,arg2);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ FormFactorSphereLogNormalRadius *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_FormFactorSphereLogNormalRadius" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (FormFactorSphereLogNormalRadius *)new FormFactorSphereLogNormalRadius(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FormFactorSphereLogNormalRadius, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -97569,10 +101133,9 @@ SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius(PyObject *SWIGUNU
int ecode2 = 0 ;
size_t val3 ;
int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
FormFactorSphereLogNormalRadius *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_FormFactorSphereLogNormalRadius", 3, 3, swig_obj)) SWIG_fail;
+ if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FormFactorSphereLogNormalRadius" "', argument " "1"" of type '" "double""'");
@@ -97596,6 +101159,69 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_FormFactorSphereLogNormalRadius(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[4] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_FormFactorSphereLogNormalRadius", 0, 3, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_FormFactorSphereLogNormalRadius__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ {
+ int res = SWIG_AsVal_size_t(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorSphereLogNormalRadius__SWIG_0(self, argc, argv);
+ }
+ }
+ }
+ if (argc == 3) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_double(argv[1], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ {
+ int res = SWIG_AsVal_size_t(argv[2], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_FormFactorSphereLogNormalRadius__SWIG_2(self, argc, argv);
+ }
+ }
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_FormFactorSphereLogNormalRadius'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(std::vector< double,std::allocator< double > > const,size_t)\n"
+ " FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(std::vector< double,std::allocator< double > > const)\n"
+ " FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double,double,size_t)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_FormFactorSphereLogNormalRadius_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorSphereLogNormalRadius *arg1 = (FormFactorSphereLogNormalRadius *) 0 ;
@@ -100980,16 +104606,37 @@ SWIGINTERN PyObject *IBackground_swigregister(PyObject *SWIGUNUSEDPARM(self), Py
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_ConstantBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_ConstantBackground__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ std::vector< double,std::allocator< double > > arg1 ;
+ ConstantBackground *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ {
+ std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
+ int res = swig::asptr(swig_obj[0], &ptr);
+ if (!SWIG_IsOK(res) || !ptr) {
+ SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ConstantBackground" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const""'");
+ }
+ arg1 = *ptr;
+ if (SWIG_IsNewObj(res)) delete ptr;
+ }
+ result = (ConstantBackground *)new ConstantBackground(arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ConstantBackground, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ConstantBackground__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double val1 ;
int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
ConstantBackground *result = 0 ;
- if (!args) SWIG_fail;
- swig_obj[0] = args;
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ConstantBackground" "', argument " "1"" of type '" "double""'");
@@ -101003,6 +104650,42 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_ConstantBackground(PyObject *self, PyObject *args) {
+ Py_ssize_t argc;
+ PyObject *argv[2] = {
+ 0
+ };
+
+ if (!(argc = SWIG_Python_UnpackTuple(args, "new_ConstantBackground", 0, 1, argv))) SWIG_fail;
+ --argc;
+ if (argc == 1) {
+ int _v;
+ {
+ int res = SWIG_AsVal_double(argv[0], NULL);
+ _v = SWIG_CheckState(res);
+ }
+ if (_v) {
+ return _wrap_new_ConstantBackground__SWIG_1(self, argc, argv);
+ }
+ }
+ if (argc == 1) {
+ int _v;
+ int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0));
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_ConstantBackground__SWIG_0(self, argc, argv);
+ }
+ }
+
+fail:
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_ConstantBackground'.\n"
+ " Possible C/C++ prototypes are:\n"
+ " ConstantBackground::ConstantBackground(std::vector< double,std::allocator< double > > const)\n"
+ " ConstantBackground::ConstantBackground(double)\n");
+ return 0;
+}
+
+
SWIGINTERN PyObject *_wrap_ConstantBackground_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
ConstantBackground *arg1 = (ConstantBackground *) 0 ;
@@ -101154,6 +104837,88 @@ fail:
}
+SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject *swig_obj[1] ;
+ PoissonNoiseBackground *result = 0 ;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_clone" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'");
+ }
+ arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
+ result = (PoissonNoiseBackground *)((PoissonNoiseBackground const *)arg1)->clone();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
+ INodeVisitor *arg2 = (INodeVisitor *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ void *argp2 = 0 ;
+ int res2 = 0 ;
+ PyObject *swig_obj[2] ;
+
+ if (!SWIG_Python_UnpackTuple(args, "PoissonNoiseBackground_accept", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_accept" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'");
+ }
+ arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
+ res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
+ if (!SWIG_IsOK(res2)) {
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PoissonNoiseBackground_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
+ }
+ arg2 = reinterpret_cast< INodeVisitor * >(argp2);
+ ((PoissonNoiseBackground const *)arg1)->accept(arg2);
+ resultobj = SWIG_Py_Void();
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_addBackGround(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
+ double arg2 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ double val2 ;
+ int ecode2 = 0 ;
+ PyObject *swig_obj[2] ;
+ double result;
+
+ if (!SWIG_Python_UnpackTuple(args, "PoissonNoiseBackground_addBackGround", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_addBackGround" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'");
+ }
+ arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
+ ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PoissonNoiseBackground_addBackGround" "', argument " "2"" of type '" "double""'");
+ }
+ arg2 = static_cast< double >(val2);
+ result = (double)((PoissonNoiseBackground const *)arg1)->addBackGround(arg2);
+ resultobj = SWIG_From_double(static_cast< double >(result));
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_delete_PoissonNoiseBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
@@ -101176,88 +104941,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- PoissonNoiseBackground *result = 0 ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_clone" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'");
- }
- arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
- result = (PoissonNoiseBackground *)((PoissonNoiseBackground const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_accept(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
- INodeVisitor *arg2 = (INodeVisitor *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "PoissonNoiseBackground_accept", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_accept" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'");
- }
- arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_INodeVisitor, 0 | 0 );
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PoissonNoiseBackground_accept" "', argument " "2"" of type '" "INodeVisitor *""'");
- }
- arg2 = reinterpret_cast< INodeVisitor * >(argp2);
- ((PoissonNoiseBackground const *)arg1)->accept(arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PoissonNoiseBackground_addBackGround(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- PoissonNoiseBackground *arg1 = (PoissonNoiseBackground *) 0 ;
- double arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
- double result;
-
- if (!SWIG_Python_UnpackTuple(args, "PoissonNoiseBackground_addBackGround", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PoissonNoiseBackground, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PoissonNoiseBackground_addBackGround" "', argument " "1"" of type '" "PoissonNoiseBackground const *""'");
- }
- arg1 = reinterpret_cast< PoissonNoiseBackground * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PoissonNoiseBackground_addBackGround" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- result = (double)((PoissonNoiseBackground const *)arg1)->addBackGround(arg2);
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *PoissonNoiseBackground_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
@@ -102936,243 +106619,6 @@ SWIGINTERN PyObject *IDetector2D_swigregister(PyObject *SWIGUNUSEDPARM(self), Py
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_SphericalPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Bin1D *arg1 = 0 ;
- Bin1D *arg2 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
- SphericalPixel *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "new_SphericalPixel", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Bin1D, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SphericalPixel" "', argument " "1"" of type '" "Bin1D const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SphericalPixel" "', argument " "1"" of type '" "Bin1D const &""'");
- }
- arg1 = reinterpret_cast< Bin1D * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Bin1D, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SphericalPixel" "', argument " "2"" of type '" "Bin1D const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SphericalPixel" "', argument " "2"" of type '" "Bin1D const &""'");
- }
- arg2 = reinterpret_cast< Bin1D * >(argp2);
- result = (SphericalPixel *)new SphericalPixel((Bin1D const &)*arg1,(Bin1D const &)*arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SphericalPixel, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SphericalPixel_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SphericalPixel *arg1 = (SphericalPixel *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- SphericalPixel *result = 0 ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_clone" "', argument " "1"" of type '" "SphericalPixel const *""'");
- }
- arg1 = reinterpret_cast< SphericalPixel * >(argp1);
- result = (SphericalPixel *)((SphericalPixel const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SphericalPixel, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SphericalPixel_createZeroSizePixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SphericalPixel *arg1 = (SphericalPixel *) 0 ;
- double arg2 ;
- double arg3 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- SphericalPixel *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "SphericalPixel_createZeroSizePixel", 3, 3, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_createZeroSizePixel" "', argument " "1"" of type '" "SphericalPixel const *""'");
- }
- arg1 = reinterpret_cast< SphericalPixel * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SphericalPixel_createZeroSizePixel" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SphericalPixel_createZeroSizePixel" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = (SphericalPixel *)((SphericalPixel const *)arg1)->createZeroSizePixel(arg2,arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SphericalPixel, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SphericalPixel_getK(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SphericalPixel *arg1 = (SphericalPixel *) 0 ;
- double arg2 ;
- double arg3 ;
- double arg4 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- double val4 ;
- int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
- kvector_t result;
-
- if (!SWIG_Python_UnpackTuple(args, "SphericalPixel_getK", 4, 4, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_getK" "', argument " "1"" of type '" "SphericalPixel const *""'");
- }
- arg1 = reinterpret_cast< SphericalPixel * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SphericalPixel_getK" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SphericalPixel_getK" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "SphericalPixel_getK" "', argument " "4"" of type '" "double""'");
- }
- arg4 = static_cast< double >(val4);
- result = ((SphericalPixel const *)arg1)->getK(arg2,arg3,arg4);
- resultobj = SWIG_NewPointerObj((new kvector_t(static_cast< const kvector_t& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SphericalPixel_getIntegrationFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SphericalPixel *arg1 = (SphericalPixel *) 0 ;
- double arg2 ;
- double arg3 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- double result;
-
- if (!SWIG_Python_UnpackTuple(args, "SphericalPixel_getIntegrationFactor", 3, 3, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_getIntegrationFactor" "', argument " "1"" of type '" "SphericalPixel const *""'");
- }
- arg1 = reinterpret_cast< SphericalPixel * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SphericalPixel_getIntegrationFactor" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SphericalPixel_getIntegrationFactor" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = (double)((SphericalPixel const *)arg1)->getIntegrationFactor(arg2,arg3);
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SphericalPixel_getSolidAngle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SphericalPixel *arg1 = (SphericalPixel *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SphericalPixel_getSolidAngle" "', argument " "1"" of type '" "SphericalPixel const *""'");
- }
- arg1 = reinterpret_cast< SphericalPixel * >(argp1);
- result = (double)((SphericalPixel const *)arg1)->getSolidAngle();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_SphericalPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SphericalPixel *arg1 = (SphericalPixel *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SphericalPixel, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SphericalPixel" "', argument " "1"" of type '" "SphericalPixel *""'");
- }
- arg1 = reinterpret_cast< SphericalPixel * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *SphericalPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_SphericalPixel, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *SphericalPixel_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- return SWIG_Python_InitShadowInstance(args);
-}
-
SWIGINTERN PyObject *_wrap_new_SphericalDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
PyObject *resultobj = 0;
SphericalDetector *result = 0 ;
@@ -104155,307 +107601,6 @@ SWIGINTERN PyObject *IsGISAXSDetector_swiginit(PyObject *SWIGUNUSEDPARM(self), P
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_RectangularPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- kvector_t arg1 ;
- kvector_t arg2 ;
- kvector_t arg3 ;
- void *argp1 ;
- int res1 = 0 ;
- void *argp2 ;
- int res2 = 0 ;
- void *argp3 ;
- int res3 = 0 ;
- PyObject *swig_obj[3] ;
- RectangularPixel *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "new_RectangularPixel", 3, 3, swig_obj)) SWIG_fail;
- {
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RectangularPixel" "', argument " "1"" of type '" "kvector_t""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RectangularPixel" "', argument " "1"" of type '" "kvector_t""'");
- } else {
- kvector_t * temp = reinterpret_cast< kvector_t * >(argp1);
- arg1 = *temp;
- if (SWIG_IsNewObj(res1)) delete temp;
- }
- }
- {
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_RectangularPixel" "', argument " "2"" of type '" "kvector_t""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RectangularPixel" "', argument " "2"" of type '" "kvector_t""'");
- } else {
- kvector_t * temp = reinterpret_cast< kvector_t * >(argp2);
- arg2 = *temp;
- if (SWIG_IsNewObj(res2)) delete temp;
- }
- }
- {
- res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_RectangularPixel" "', argument " "3"" of type '" "kvector_t""'");
- }
- if (!argp3) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_RectangularPixel" "', argument " "3"" of type '" "kvector_t""'");
- } else {
- kvector_t * temp = reinterpret_cast< kvector_t * >(argp3);
- arg3 = *temp;
- if (SWIG_IsNewObj(res3)) delete temp;
- }
- }
- result = (RectangularPixel *)new RectangularPixel(arg1,arg2,arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RectangularPixel, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RectangularPixel_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- RectangularPixel *arg1 = (RectangularPixel *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- RectangularPixel *result = 0 ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_clone" "', argument " "1"" of type '" "RectangularPixel const *""'");
- }
- arg1 = reinterpret_cast< RectangularPixel * >(argp1);
- result = (RectangularPixel *)((RectangularPixel const *)arg1)->clone();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RectangularPixel, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RectangularPixel_createZeroSizePixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- RectangularPixel *arg1 = (RectangularPixel *) 0 ;
- double arg2 ;
- double arg3 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- RectangularPixel *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_createZeroSizePixel", 3, 3, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_createZeroSizePixel" "', argument " "1"" of type '" "RectangularPixel const *""'");
- }
- arg1 = reinterpret_cast< RectangularPixel * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_createZeroSizePixel" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_createZeroSizePixel" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = (RectangularPixel *)((RectangularPixel const *)arg1)->createZeroSizePixel(arg2,arg3);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RectangularPixel, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RectangularPixel_getK(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- RectangularPixel *arg1 = (RectangularPixel *) 0 ;
- double arg2 ;
- double arg3 ;
- double arg4 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- double val4 ;
- int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
- kvector_t result;
-
- if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_getK", 4, 4, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getK" "', argument " "1"" of type '" "RectangularPixel const *""'");
- }
- arg1 = reinterpret_cast< RectangularPixel * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_getK" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_getK" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "RectangularPixel_getK" "', argument " "4"" of type '" "double""'");
- }
- arg4 = static_cast< double >(val4);
- result = ((RectangularPixel const *)arg1)->getK(arg2,arg3,arg4);
- resultobj = SWIG_NewPointerObj((new kvector_t(static_cast< const kvector_t& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RectangularPixel_getPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- RectangularPixel *arg1 = (RectangularPixel *) 0 ;
- double arg2 ;
- double arg3 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- kvector_t result;
-
- if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_getPosition", 3, 3, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getPosition" "', argument " "1"" of type '" "RectangularPixel const *""'");
- }
- arg1 = reinterpret_cast< RectangularPixel * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_getPosition" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_getPosition" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = ((RectangularPixel const *)arg1)->getPosition(arg2,arg3);
- resultobj = SWIG_NewPointerObj((new kvector_t(static_cast< const kvector_t& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RectangularPixel_getIntegrationFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- RectangularPixel *arg1 = (RectangularPixel *) 0 ;
- double arg2 ;
- double arg3 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- double result;
-
- if (!SWIG_Python_UnpackTuple(args, "RectangularPixel_getIntegrationFactor", 3, 3, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getIntegrationFactor" "', argument " "1"" of type '" "RectangularPixel const *""'");
- }
- arg1 = reinterpret_cast< RectangularPixel * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RectangularPixel_getIntegrationFactor" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RectangularPixel_getIntegrationFactor" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = (double)((RectangularPixel const *)arg1)->getIntegrationFactor(arg2,arg3);
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RectangularPixel_getSolidAngle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- RectangularPixel *arg1 = (RectangularPixel *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RectangularPixel_getSolidAngle" "', argument " "1"" of type '" "RectangularPixel const *""'");
- }
- arg1 = reinterpret_cast< RectangularPixel * >(argp1);
- result = (double)((RectangularPixel const *)arg1)->getSolidAngle();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_RectangularPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- RectangularPixel *arg1 = (RectangularPixel *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RectangularPixel, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RectangularPixel" "', argument " "1"" of type '" "RectangularPixel *""'");
- }
- arg1 = reinterpret_cast< RectangularPixel * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *RectangularPixel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_RectangularPixel, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *RectangularPixel_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- return SWIG_Python_InitShadowInstance(args);
-}
-
SWIGINTERN PyObject *_wrap_new_RectangularDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
size_t arg1 ;
@@ -121831,12 +124976,12 @@ static PyMethodDef SwigMethods[] = {
"INodeVisitor_visit(INodeVisitor self, FormFactorPrism3 arg2)\n"
"INodeVisitor_visit(INodeVisitor self, FormFactorPrism6 arg2)\n"
"INodeVisitor_visit(INodeVisitor self, FormFactorPyramid arg2)\n"
- "INodeVisitor_visit(INodeVisitor self, FormFactorRipple1Box arg2)\n"
- "INodeVisitor_visit(INodeVisitor self, FormFactorRipple1Gauss arg2)\n"
- "INodeVisitor_visit(INodeVisitor self, FormFactorRipple1Lorentz arg2)\n"
- "INodeVisitor_visit(INodeVisitor self, FormFactorRipple2Box arg2)\n"
- "INodeVisitor_visit(INodeVisitor self, FormFactorRipple2Gauss arg2)\n"
- "INodeVisitor_visit(INodeVisitor self, FormFactorRipple2Lorentz arg2)\n"
+ "INodeVisitor_visit(INodeVisitor self, FormFactorCosineRippleBox arg2)\n"
+ "INodeVisitor_visit(INodeVisitor self, FormFactorCosineRippleGauss arg2)\n"
+ "INodeVisitor_visit(INodeVisitor self, FormFactorCosineRippleLorentz arg2)\n"
+ "INodeVisitor_visit(INodeVisitor self, FormFactorSawtoothRippleBox arg2)\n"
+ "INodeVisitor_visit(INodeVisitor self, FormFactorSawtoothRippleGauss arg2)\n"
+ "INodeVisitor_visit(INodeVisitor self, FormFactorSawtoothRippleLorentz arg2)\n"
"INodeVisitor_visit(INodeVisitor self, FormFactorSphereGaussianRadius arg2)\n"
"INodeVisitor_visit(INodeVisitor self, FormFactorSphereLogNormalRadius arg2)\n"
"INodeVisitor_visit(INodeVisitor self, FormFactorTetrahedron arg2)\n"
@@ -122075,8 +125220,9 @@ static PyMethodDef SwigMethods[] = {
""},
{ "IDistribution1D_swigregister", IDistribution1D_swigregister, METH_O, NULL},
{ "new_DistributionGate", _wrap_new_DistributionGate, METH_VARARGS, "\n"
- "DistributionGate()\n"
- "new_DistributionGate(double min, double max) -> DistributionGate\n"
+ "DistributionGate(vdouble1d_t P)\n"
+ "DistributionGate(double min, double max)\n"
+ "new_DistributionGate() -> DistributionGate\n"
"DistributionGate::DistributionGate(double min, double max)\n"
"\n"
""},
@@ -122138,8 +125284,9 @@ static PyMethodDef SwigMethods[] = {
{ "DistributionGate_swigregister", DistributionGate_swigregister, METH_O, NULL},
{ "DistributionGate_swiginit", DistributionGate_swiginit, METH_VARARGS, NULL},
{ "new_DistributionLorentz", _wrap_new_DistributionLorentz, METH_VARARGS, "\n"
- "DistributionLorentz()\n"
- "new_DistributionLorentz(double mean, double hwhm) -> DistributionLorentz\n"
+ "DistributionLorentz(vdouble1d_t P)\n"
+ "DistributionLorentz(double mean, double hwhm)\n"
+ "new_DistributionLorentz() -> DistributionLorentz\n"
"DistributionLorentz::DistributionLorentz(double mean, double hwhm)\n"
"\n"
""},
@@ -122196,8 +125343,9 @@ static PyMethodDef SwigMethods[] = {
{ "DistributionLorentz_swigregister", DistributionLorentz_swigregister, METH_O, NULL},
{ "DistributionLorentz_swiginit", DistributionLorentz_swiginit, METH_VARARGS, NULL},
{ "new_DistributionGaussian", _wrap_new_DistributionGaussian, METH_VARARGS, "\n"
- "DistributionGaussian()\n"
- "new_DistributionGaussian(double mean, double std_dev) -> DistributionGaussian\n"
+ "DistributionGaussian(vdouble1d_t P)\n"
+ "DistributionGaussian(double mean, double std_dev)\n"
+ "new_DistributionGaussian() -> DistributionGaussian\n"
"DistributionGaussian::DistributionGaussian(double mean, double std_dev)\n"
"\n"
""},
@@ -122254,6 +125402,7 @@ static PyMethodDef SwigMethods[] = {
{ "DistributionGaussian_swigregister", DistributionGaussian_swigregister, METH_O, NULL},
{ "DistributionGaussian_swiginit", DistributionGaussian_swiginit, METH_VARARGS, NULL},
{ "new_DistributionLogNormal", _wrap_new_DistributionLogNormal, METH_VARARGS, "\n"
+ "DistributionLogNormal(vdouble1d_t P)\n"
"new_DistributionLogNormal(double median, double scale_param) -> DistributionLogNormal\n"
"DistributionLogNormal::DistributionLogNormal(double median, double scale_param)\n"
"\n"
@@ -122323,8 +125472,9 @@ static PyMethodDef SwigMethods[] = {
{ "DistributionLogNormal_swigregister", DistributionLogNormal_swigregister, METH_O, NULL},
{ "DistributionLogNormal_swiginit", DistributionLogNormal_swiginit, METH_VARARGS, NULL},
{ "new_DistributionCosine", _wrap_new_DistributionCosine, METH_VARARGS, "\n"
- "DistributionCosine()\n"
- "new_DistributionCosine(double mean, double sigma) -> DistributionCosine\n"
+ "DistributionCosine(vdouble1d_t P)\n"
+ "DistributionCosine(double mean, double sigma)\n"
+ "new_DistributionCosine() -> DistributionCosine\n"
"DistributionCosine::DistributionCosine(double mean, double sigma)\n"
"\n"
""},
@@ -122381,6 +125531,7 @@ static PyMethodDef SwigMethods[] = {
{ "DistributionCosine_swigregister", DistributionCosine_swigregister, METH_O, NULL},
{ "DistributionCosine_swiginit", DistributionCosine_swiginit, METH_VARARGS, NULL},
{ "new_DistributionTrapezoid", _wrap_new_DistributionTrapezoid, METH_VARARGS, "\n"
+ "DistributionTrapezoid(vdouble1d_t P)\n"
"DistributionTrapezoid(double center, double left, double middle, double right)\n"
"new_DistributionTrapezoid() -> DistributionTrapezoid\n"
"DistributionTrapezoid::DistributionTrapezoid(double center, double left_width, double middle_width, double right_width)\n"
@@ -123172,7 +126323,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_IdentityRotation", _wrap_delete_IdentityRotation, METH_O, "delete_IdentityRotation(IdentityRotation self)"},
{ "IdentityRotation_swigregister", IdentityRotation_swigregister, METH_O, NULL},
{ "IdentityRotation_swiginit", IdentityRotation_swiginit, METH_VARARGS, NULL},
- { "new_RotationX", _wrap_new_RotationX, METH_O, "\n"
+ { "new_RotationX", _wrap_new_RotationX, METH_VARARGS, "\n"
+ "RotationX(vdouble1d_t P)\n"
"new_RotationX(double angle) -> RotationX\n"
"RotationX::RotationX(double angle)\n"
"\n"
@@ -123221,7 +126373,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_RotationX", _wrap_delete_RotationX, METH_O, "delete_RotationX(RotationX self)"},
{ "RotationX_swigregister", RotationX_swigregister, METH_O, NULL},
{ "RotationX_swiginit", RotationX_swiginit, METH_VARARGS, NULL},
- { "new_RotationY", _wrap_new_RotationY, METH_O, "\n"
+ { "new_RotationY", _wrap_new_RotationY, METH_VARARGS, "\n"
+ "RotationY(vdouble1d_t P)\n"
"new_RotationY(double angle) -> RotationY\n"
"RotationY::RotationY(double angle)\n"
"\n"
@@ -123270,7 +126423,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_RotationY", _wrap_delete_RotationY, METH_O, "delete_RotationY(RotationY self)"},
{ "RotationY_swigregister", RotationY_swigregister, METH_O, NULL},
{ "RotationY_swiginit", RotationY_swiginit, METH_VARARGS, NULL},
- { "new_RotationZ", _wrap_new_RotationZ, METH_O, "\n"
+ { "new_RotationZ", _wrap_new_RotationZ, METH_VARARGS, "\n"
+ "RotationZ(vdouble1d_t P)\n"
"new_RotationZ(double angle) -> RotationZ\n"
"RotationZ::RotationZ(double angle=0.0)\n"
"\n"
@@ -123320,6 +126474,7 @@ static PyMethodDef SwigMethods[] = {
{ "RotationZ_swigregister", RotationZ_swigregister, METH_O, NULL},
{ "RotationZ_swiginit", RotationZ_swiginit, METH_VARARGS, NULL},
{ "new_RotationEuler", _wrap_new_RotationEuler, METH_VARARGS, "\n"
+ "RotationEuler(vdouble1d_t P)\n"
"new_RotationEuler(double alpha, double beta, double gamma) -> RotationEuler\n"
"RotationEuler::RotationEuler(double alpha, double beta, double gamma)\n"
"\n"
@@ -124196,7 +127351,8 @@ static PyMethodDef SwigMethods[] = {
""},
{ "delete_IFTDecayFunction1D", _wrap_delete_IFTDecayFunction1D, METH_O, "delete_IFTDecayFunction1D(IFTDecayFunction1D self)"},
{ "IFTDecayFunction1D_swigregister", IFTDecayFunction1D_swigregister, METH_O, NULL},
- { "new_FTDecayFunction1DCauchy", _wrap_new_FTDecayFunction1DCauchy, METH_O, "\n"
+ { "new_FTDecayFunction1DCauchy", _wrap_new_FTDecayFunction1DCauchy, METH_VARARGS, "\n"
+ "FTDecayFunction1DCauchy(vdouble1d_t P)\n"
"new_FTDecayFunction1DCauchy(double decay_length) -> FTDecayFunction1DCauchy\n"
"FTDecayFunction1DCauchy::FTDecayFunction1DCauchy(double decay_length)\n"
"\n"
@@ -124221,7 +127377,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FTDecayFunction1DCauchy", _wrap_delete_FTDecayFunction1DCauchy, METH_O, "delete_FTDecayFunction1DCauchy(FTDecayFunction1DCauchy self)"},
{ "FTDecayFunction1DCauchy_swigregister", FTDecayFunction1DCauchy_swigregister, METH_O, NULL},
{ "FTDecayFunction1DCauchy_swiginit", FTDecayFunction1DCauchy_swiginit, METH_VARARGS, NULL},
- { "new_FTDecayFunction1DGauss", _wrap_new_FTDecayFunction1DGauss, METH_O, "\n"
+ { "new_FTDecayFunction1DGauss", _wrap_new_FTDecayFunction1DGauss, METH_VARARGS, "\n"
+ "FTDecayFunction1DGauss(vdouble1d_t P)\n"
"new_FTDecayFunction1DGauss(double decay_length) -> FTDecayFunction1DGauss\n"
"FTDecayFunction1DGauss::FTDecayFunction1DGauss(double decay_length)\n"
"\n"
@@ -124246,7 +127403,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FTDecayFunction1DGauss", _wrap_delete_FTDecayFunction1DGauss, METH_O, "delete_FTDecayFunction1DGauss(FTDecayFunction1DGauss self)"},
{ "FTDecayFunction1DGauss_swigregister", FTDecayFunction1DGauss_swigregister, METH_O, NULL},
{ "FTDecayFunction1DGauss_swiginit", FTDecayFunction1DGauss_swiginit, METH_VARARGS, NULL},
- { "new_FTDecayFunction1DTriangle", _wrap_new_FTDecayFunction1DTriangle, METH_O, "\n"
+ { "new_FTDecayFunction1DTriangle", _wrap_new_FTDecayFunction1DTriangle, METH_VARARGS, "\n"
+ "FTDecayFunction1DTriangle(vdouble1d_t P)\n"
"new_FTDecayFunction1DTriangle(double decay_length) -> FTDecayFunction1DTriangle\n"
"FTDecayFunction1DTriangle::FTDecayFunction1DTriangle(double decay_length)\n"
"\n"
@@ -124272,6 +127430,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDecayFunction1DTriangle_swigregister", FTDecayFunction1DTriangle_swigregister, METH_O, NULL},
{ "FTDecayFunction1DTriangle_swiginit", FTDecayFunction1DTriangle_swiginit, METH_VARARGS, NULL},
{ "new_FTDecayFunction1DVoigt", _wrap_new_FTDecayFunction1DVoigt, METH_VARARGS, "\n"
+ "FTDecayFunction1DVoigt(vdouble1d_t P)\n"
"new_FTDecayFunction1DVoigt(double decay_length, double eta) -> FTDecayFunction1DVoigt\n"
"FTDecayFunction1DVoigt::FTDecayFunction1DVoigt(double decay_length, double eta)\n"
"\n"
@@ -124317,20 +127476,6 @@ static PyMethodDef SwigMethods[] = {
"virtual IFTDecayFunction2D* IFTDecayFunction2D::clone() const =0\n"
"\n"
""},
- { "IFTDecayFunction2D_setGamma", _wrap_IFTDecayFunction2D_setGamma, METH_VARARGS, "\n"
- "IFTDecayFunction2D_setGamma(IFTDecayFunction2D self, double gamma)\n"
- "void IFTDecayFunction2D::setGamma(double gamma)\n"
- "\n"
- "set angle between first lattice vector and X-axis of distribution (both in direct space) \n"
- "\n"
- ""},
- { "IFTDecayFunction2D_gamma", _wrap_IFTDecayFunction2D_gamma, METH_O, "\n"
- "IFTDecayFunction2D_gamma(IFTDecayFunction2D self) -> double\n"
- "double IFTDecayFunction2D::gamma() const\n"
- "\n"
- "get angle between first lattice vector and X-axis of distribution (both in direct space) \n"
- "\n"
- ""},
{ "IFTDecayFunction2D_decayLengthX", _wrap_IFTDecayFunction2D_decayLengthX, METH_O, "\n"
"IFTDecayFunction2D_decayLengthX(IFTDecayFunction2D self) -> double\n"
"double IFTDecayFunction2D::decayLengthX() const\n"
@@ -124345,6 +127490,13 @@ static PyMethodDef SwigMethods[] = {
"get decay length in distribution's Y-direction \n"
"\n"
""},
+ { "IFTDecayFunction2D_gamma", _wrap_IFTDecayFunction2D_gamma, METH_O, "\n"
+ "IFTDecayFunction2D_gamma(IFTDecayFunction2D self) -> double\n"
+ "double IFTDecayFunction2D::gamma() const\n"
+ "\n"
+ "get angle between first lattice vector and X-axis of distribution (both in direct space) \n"
+ "\n"
+ ""},
{ "IFTDecayFunction2D_evaluate", _wrap_IFTDecayFunction2D_evaluate, METH_VARARGS, "\n"
"IFTDecayFunction2D_evaluate(IFTDecayFunction2D self, double qx, double qy) -> double\n"
"virtual double IFTDecayFunction2D::evaluate(double qx, double qy) const =0\n"
@@ -124364,6 +127516,7 @@ static PyMethodDef SwigMethods[] = {
{ "delete_IFTDecayFunction2D", _wrap_delete_IFTDecayFunction2D, METH_O, "delete_IFTDecayFunction2D(IFTDecayFunction2D self)"},
{ "IFTDecayFunction2D_swigregister", IFTDecayFunction2D_swigregister, METH_O, NULL},
{ "new_FTDecayFunction2DCauchy", _wrap_new_FTDecayFunction2DCauchy, METH_VARARGS, "\n"
+ "FTDecayFunction2DCauchy(vdouble1d_t P)\n"
"new_FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma) -> FTDecayFunction2DCauchy\n"
"FTDecayFunction2DCauchy::FTDecayFunction2DCauchy(double decay_length_x, double decay_length_y, double gamma=0)\n"
"\n"
@@ -124391,6 +127544,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDecayFunction2DCauchy_swigregister", FTDecayFunction2DCauchy_swigregister, METH_O, NULL},
{ "FTDecayFunction2DCauchy_swiginit", FTDecayFunction2DCauchy_swiginit, METH_VARARGS, NULL},
{ "new_FTDecayFunction2DGauss", _wrap_new_FTDecayFunction2DGauss, METH_VARARGS, "\n"
+ "FTDecayFunction2DGauss(vdouble1d_t P)\n"
"new_FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma) -> FTDecayFunction2DGauss\n"
"FTDecayFunction2DGauss::FTDecayFunction2DGauss(double decay_length_x, double decay_length_y, double gamma=0)\n"
"\n"
@@ -124418,6 +127572,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDecayFunction2DGauss_swigregister", FTDecayFunction2DGauss_swigregister, METH_O, NULL},
{ "FTDecayFunction2DGauss_swiginit", FTDecayFunction2DGauss_swiginit, METH_VARARGS, NULL},
{ "new_FTDecayFunction2DVoigt", _wrap_new_FTDecayFunction2DVoigt, METH_VARARGS, "\n"
+ "FTDecayFunction2DVoigt(vdouble1d_t P)\n"
"new_FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double gamma, double eta) -> FTDecayFunction2DVoigt\n"
"FTDecayFunction2DVoigt::FTDecayFunction2DVoigt(double decay_length_x, double decay_length_y, double eta, double gamma=0)\n"
"\n"
@@ -124478,11 +127633,6 @@ static PyMethodDef SwigMethods[] = {
"Returns Fourier transform of this distribution; is a decay function starting at evaluate(0)=1. \n"
"\n"
""},
- { "IFTDistribution1D_setOmega", _wrap_IFTDistribution1D_setOmega, METH_VARARGS, "\n"
- "IFTDistribution1D_setOmega(IFTDistribution1D self, double omega)\n"
- "void IFTDistribution1D::setOmega(double omega)\n"
- "\n"
- ""},
{ "IFTDistribution1D_omega", _wrap_IFTDistribution1D_omega, METH_O, "\n"
"IFTDistribution1D_omega(IFTDistribution1D self) -> double\n"
"double IFTDistribution1D::omega() const\n"
@@ -124501,7 +127651,8 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IFTDistribution1D_swigregister", IFTDistribution1D_swigregister, METH_O, NULL},
- { "new_FTDistribution1DCauchy", _wrap_new_FTDistribution1DCauchy, METH_O, "\n"
+ { "new_FTDistribution1DCauchy", _wrap_new_FTDistribution1DCauchy, METH_VARARGS, "\n"
+ "FTDistribution1DCauchy(vdouble1d_t P)\n"
"new_FTDistribution1DCauchy(double omega) -> FTDistribution1DCauchy\n"
"FTDistribution1DCauchy::FTDistribution1DCauchy(double omega)\n"
"\n"
@@ -124535,7 +127686,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FTDistribution1DCauchy", _wrap_delete_FTDistribution1DCauchy, METH_O, "delete_FTDistribution1DCauchy(FTDistribution1DCauchy self)"},
{ "FTDistribution1DCauchy_swigregister", FTDistribution1DCauchy_swigregister, METH_O, NULL},
{ "FTDistribution1DCauchy_swiginit", FTDistribution1DCauchy_swiginit, METH_VARARGS, NULL},
- { "new_FTDistribution1DGauss", _wrap_new_FTDistribution1DGauss, METH_O, "\n"
+ { "new_FTDistribution1DGauss", _wrap_new_FTDistribution1DGauss, METH_VARARGS, "\n"
+ "FTDistribution1DGauss(vdouble1d_t P)\n"
"new_FTDistribution1DGauss(double omega) -> FTDistribution1DGauss\n"
"FTDistribution1DGauss::FTDistribution1DGauss(double omega)\n"
"\n"
@@ -124569,7 +127721,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FTDistribution1DGauss", _wrap_delete_FTDistribution1DGauss, METH_O, "delete_FTDistribution1DGauss(FTDistribution1DGauss self)"},
{ "FTDistribution1DGauss_swigregister", FTDistribution1DGauss_swigregister, METH_O, NULL},
{ "FTDistribution1DGauss_swiginit", FTDistribution1DGauss_swiginit, METH_VARARGS, NULL},
- { "new_FTDistribution1DGate", _wrap_new_FTDistribution1DGate, METH_O, "\n"
+ { "new_FTDistribution1DGate", _wrap_new_FTDistribution1DGate, METH_VARARGS, "\n"
+ "FTDistribution1DGate(vdouble1d_t P)\n"
"new_FTDistribution1DGate(double omega) -> FTDistribution1DGate\n"
"FTDistribution1DGate::FTDistribution1DGate(double omega)\n"
"\n"
@@ -124603,7 +127756,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FTDistribution1DGate", _wrap_delete_FTDistribution1DGate, METH_O, "delete_FTDistribution1DGate(FTDistribution1DGate self)"},
{ "FTDistribution1DGate_swigregister", FTDistribution1DGate_swigregister, METH_O, NULL},
{ "FTDistribution1DGate_swiginit", FTDistribution1DGate_swiginit, METH_VARARGS, NULL},
- { "new_FTDistribution1DTriangle", _wrap_new_FTDistribution1DTriangle, METH_O, "\n"
+ { "new_FTDistribution1DTriangle", _wrap_new_FTDistribution1DTriangle, METH_VARARGS, "\n"
+ "FTDistribution1DTriangle(vdouble1d_t P)\n"
"new_FTDistribution1DTriangle(double omega) -> FTDistribution1DTriangle\n"
"FTDistribution1DTriangle::FTDistribution1DTriangle(double omega)\n"
"\n"
@@ -124637,7 +127791,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FTDistribution1DTriangle", _wrap_delete_FTDistribution1DTriangle, METH_O, "delete_FTDistribution1DTriangle(FTDistribution1DTriangle self)"},
{ "FTDistribution1DTriangle_swigregister", FTDistribution1DTriangle_swigregister, METH_O, NULL},
{ "FTDistribution1DTriangle_swiginit", FTDistribution1DTriangle_swiginit, METH_VARARGS, NULL},
- { "new_FTDistribution1DCosine", _wrap_new_FTDistribution1DCosine, METH_O, "\n"
+ { "new_FTDistribution1DCosine", _wrap_new_FTDistribution1DCosine, METH_VARARGS, "\n"
+ "FTDistribution1DCosine(vdouble1d_t P)\n"
"new_FTDistribution1DCosine(double omega) -> FTDistribution1DCosine\n"
"FTDistribution1DCosine::FTDistribution1DCosine(double omega)\n"
"\n"
@@ -124672,6 +127827,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDistribution1DCosine_swigregister", FTDistribution1DCosine_swigregister, METH_O, NULL},
{ "FTDistribution1DCosine_swiginit", FTDistribution1DCosine_swiginit, METH_VARARGS, NULL},
{ "new_FTDistribution1DVoigt", _wrap_new_FTDistribution1DVoigt, METH_VARARGS, "\n"
+ "FTDistribution1DVoigt(vdouble1d_t P)\n"
"new_FTDistribution1DVoigt(double omega, double eta) -> FTDistribution1DVoigt\n"
"FTDistribution1DVoigt::FTDistribution1DVoigt(double omega, double eta)\n"
"\n"
@@ -124726,9 +127882,14 @@ static PyMethodDef SwigMethods[] = {
"IFTDistribution2D* IFTDistribution2D::clone() const =0\n"
"\n"
""},
- { "IFTDistribution2D_setGamma", _wrap_IFTDistribution2D_setGamma, METH_VARARGS, "\n"
- "IFTDistribution2D_setGamma(IFTDistribution2D self, double gamma)\n"
- "void IFTDistribution2D::setGamma(double gamma)\n"
+ { "IFTDistribution2D_omegaX", _wrap_IFTDistribution2D_omegaX, METH_O, "\n"
+ "IFTDistribution2D_omegaX(IFTDistribution2D self) -> double\n"
+ "double IFTDistribution2D::omegaX() const\n"
+ "\n"
+ ""},
+ { "IFTDistribution2D_omegaY", _wrap_IFTDistribution2D_omegaY, METH_O, "\n"
+ "IFTDistribution2D_omegaY(IFTDistribution2D self) -> double\n"
+ "double IFTDistribution2D::omegaY() const\n"
"\n"
""},
{ "IFTDistribution2D_gamma", _wrap_IFTDistribution2D_gamma, METH_O, "\n"
@@ -124741,16 +127902,6 @@ static PyMethodDef SwigMethods[] = {
"double IFTDistribution2D::delta() const\n"
"\n"
""},
- { "IFTDistribution2D_omegaX", _wrap_IFTDistribution2D_omegaX, METH_O, "\n"
- "IFTDistribution2D_omegaX(IFTDistribution2D self) -> double\n"
- "double IFTDistribution2D::omegaX() const\n"
- "\n"
- ""},
- { "IFTDistribution2D_omegaY", _wrap_IFTDistribution2D_omegaY, METH_O, "\n"
- "IFTDistribution2D_omegaY(IFTDistribution2D self) -> double\n"
- "double IFTDistribution2D::omegaY() const\n"
- "\n"
- ""},
{ "IFTDistribution2D_evaluate", _wrap_IFTDistribution2D_evaluate, METH_VARARGS, "\n"
"IFTDistribution2D_evaluate(IFTDistribution2D self, double qx, double qy) -> double\n"
"virtual double IFTDistribution2D::evaluate(double qx, double qy) const =0\n"
@@ -124761,6 +127912,7 @@ static PyMethodDef SwigMethods[] = {
{ "delete_IFTDistribution2D", _wrap_delete_IFTDistribution2D, METH_O, "delete_IFTDistribution2D(IFTDistribution2D self)"},
{ "IFTDistribution2D_swigregister", IFTDistribution2D_swigregister, METH_O, NULL},
{ "new_FTDistribution2DCauchy", _wrap_new_FTDistribution2DCauchy, METH_VARARGS, "\n"
+ "FTDistribution2DCauchy(vdouble1d_t P)\n"
"new_FTDistribution2DCauchy(double omega_x, double omega_y, double gamma) -> FTDistribution2DCauchy\n"
"FTDistribution2DCauchy::FTDistribution2DCauchy(double omega_x, double omega_y, double gamma=0)\n"
"\n"
@@ -124788,6 +127940,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDistribution2DCauchy_swigregister", FTDistribution2DCauchy_swigregister, METH_O, NULL},
{ "FTDistribution2DCauchy_swiginit", FTDistribution2DCauchy_swiginit, METH_VARARGS, NULL},
{ "new_FTDistribution2DGauss", _wrap_new_FTDistribution2DGauss, METH_VARARGS, "\n"
+ "FTDistribution2DGauss(vdouble1d_t P)\n"
"new_FTDistribution2DGauss(double omega_x, double omega_y, double gamma) -> FTDistribution2DGauss\n"
"FTDistribution2DGauss::FTDistribution2DGauss(double omega_x, double omega_y, double gamma=0)\n"
"\n"
@@ -124815,6 +127968,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDistribution2DGauss_swigregister", FTDistribution2DGauss_swigregister, METH_O, NULL},
{ "FTDistribution2DGauss_swiginit", FTDistribution2DGauss_swiginit, METH_VARARGS, NULL},
{ "new_FTDistribution2DGate", _wrap_new_FTDistribution2DGate, METH_VARARGS, "\n"
+ "FTDistribution2DGate(vdouble1d_t P)\n"
"new_FTDistribution2DGate(double omega_x, double omega_y, double gamma) -> FTDistribution2DGate\n"
"FTDistribution2DGate::FTDistribution2DGate(double omega_x, double omega_y, double gamma=0)\n"
"\n"
@@ -124842,6 +127996,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDistribution2DGate_swigregister", FTDistribution2DGate_swigregister, METH_O, NULL},
{ "FTDistribution2DGate_swiginit", FTDistribution2DGate_swiginit, METH_VARARGS, NULL},
{ "new_FTDistribution2DCone", _wrap_new_FTDistribution2DCone, METH_VARARGS, "\n"
+ "FTDistribution2DCone(vdouble1d_t P)\n"
"new_FTDistribution2DCone(double omega_x, double omega_y, double gamma) -> FTDistribution2DCone\n"
"FTDistribution2DCone::FTDistribution2DCone(double omega_x, double omega_y, double gamma=0)\n"
"\n"
@@ -124869,6 +128024,7 @@ static PyMethodDef SwigMethods[] = {
{ "FTDistribution2DCone_swigregister", FTDistribution2DCone_swigregister, METH_O, NULL},
{ "FTDistribution2DCone_swiginit", FTDistribution2DCone_swiginit, METH_VARARGS, NULL},
{ "new_FTDistribution2DVoigt", _wrap_new_FTDistribution2DVoigt, METH_VARARGS, "\n"
+ "FTDistribution2DVoigt(vdouble1d_t P)\n"
"new_FTDistribution2DVoigt(double omega_x, double omega_y, double gamma, double eta) -> FTDistribution2DVoigt\n"
"FTDistribution2DVoigt::FTDistribution2DVoigt(double omega_x, double omega_y, double eta, double gamma=0)\n"
"\n"
@@ -125229,11 +128385,6 @@ static PyMethodDef SwigMethods[] = {
"IInterferenceFunction::IInterferenceFunction(const IInterferenceFunction &other)\n"
"\n"
""},
- { "delete_IInterferenceFunction", _wrap_delete_IInterferenceFunction, METH_O, "\n"
- "delete_IInterferenceFunction(IInterferenceFunction self)\n"
- "IInterferenceFunction::~IInterferenceFunction()\n"
- "\n"
- ""},
{ "IInterferenceFunction_clone", _wrap_IInterferenceFunction_clone, METH_O, "\n"
"IInterferenceFunction_clone(IInterferenceFunction self) -> IInterferenceFunction\n"
"virtual IInterferenceFunction* IInterferenceFunction::clone() const =0\n"
@@ -125284,6 +128435,11 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IInterferenceFunction_iff_without_dw", _wrap_IInterferenceFunction_iff_without_dw, METH_VARARGS, "IInterferenceFunction_iff_without_dw(IInterferenceFunction self, kvector_t q) -> double"},
+ { "delete_IInterferenceFunction", _wrap_delete_IInterferenceFunction, METH_O, "\n"
+ "delete_IInterferenceFunction(IInterferenceFunction self)\n"
+ "IInterferenceFunction::~IInterferenceFunction()\n"
+ "\n"
+ ""},
{ "disown_IInterferenceFunction", _wrap_disown_IInterferenceFunction, METH_O, NULL},
{ "IInterferenceFunction_swigregister", IInterferenceFunction_swigregister, METH_O, NULL},
{ "IInterferenceFunction_swiginit", IInterferenceFunction_swiginit, METH_VARARGS, NULL},
@@ -126363,7 +129519,8 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IFootprintFactor_swigregister", IFootprintFactor_swigregister, METH_O, NULL},
- { "new_FootprintGauss", _wrap_new_FootprintGauss, METH_O, "\n"
+ { "new_FootprintGauss", _wrap_new_FootprintGauss, METH_VARARGS, "\n"
+ "FootprintGauss(vdouble1d_t P)\n"
"new_FootprintGauss(double width_ratio) -> FootprintGauss\n"
"FootprintGauss::FootprintGauss(double width_ratio)\n"
"\n"
@@ -126397,7 +129554,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FootprintGauss", _wrap_delete_FootprintGauss, METH_O, "delete_FootprintGauss(FootprintGauss self)"},
{ "FootprintGauss_swigregister", FootprintGauss_swigregister, METH_O, NULL},
{ "FootprintGauss_swiginit", FootprintGauss_swiginit, METH_VARARGS, NULL},
- { "new_FootprintSquare", _wrap_new_FootprintSquare, METH_O, "\n"
+ { "new_FootprintSquare", _wrap_new_FootprintSquare, METH_VARARGS, "\n"
+ "FootprintSquare(vdouble1d_t P)\n"
"new_FootprintSquare(double width_ratio) -> FootprintSquare\n"
"FootprintSquare::FootprintSquare(double width_ratio)\n"
"\n"
@@ -127053,105 +130211,34 @@ static PyMethodDef SwigMethods[] = {
""},
{ "delete_FormFactorPolygonalSurface", _wrap_delete_FormFactorPolygonalSurface, METH_O, "delete_FormFactorPolygonalSurface(FormFactorPolygonalSurface self)"},
{ "FormFactorPolygonalSurface_swigregister", FormFactorPolygonalSurface_swigregister, METH_O, NULL},
- { "ProfileBar_getLength", _wrap_ProfileBar_getLength, METH_O, "\n"
- "ProfileBar_getLength(ProfileBar self) -> double\n"
- "double ProfileBar::getLength() const\n"
- "\n"
- ""},
- { "ProfileBar_getHeight", _wrap_ProfileBar_getHeight, METH_O, "\n"
- "ProfileBar_getHeight(ProfileBar self) -> double\n"
- "double ProfileBar::getHeight() const\n"
- "\n"
- ""},
- { "ProfileBar_getWidth", _wrap_ProfileBar_getWidth, METH_O, "\n"
- "ProfileBar_getWidth(ProfileBar self) -> double\n"
- "double ProfileBar::getWidth() const\n"
- "\n"
- ""},
- { "ProfileBar_radialExtension", _wrap_ProfileBar_radialExtension, METH_O, "\n"
- "ProfileBar_radialExtension(ProfileBar self) -> double\n"
- "double ProfileBar::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"
- ""},
- { "ProfileBar_evaluate_for_q", _wrap_ProfileBar_evaluate_for_q, METH_VARARGS, "\n"
- "ProfileBar_evaluate_for_q(ProfileBar self, cvector_t q) -> complex_t\n"
- "complex_t ProfileBar::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"
- ""},
- { "delete_ProfileBar", _wrap_delete_ProfileBar, METH_O, "delete_ProfileBar(ProfileBar self)"},
- { "ProfileBar_swigregister", ProfileBar_swigregister, METH_O, NULL},
- { "ProfileRipple1_getLength", _wrap_ProfileRipple1_getLength, METH_O, "\n"
- "ProfileRipple1_getLength(ProfileRipple1 self) -> double\n"
- "double ProfileRipple1::getLength() const\n"
- "\n"
- ""},
- { "ProfileRipple1_getHeight", _wrap_ProfileRipple1_getHeight, METH_O, "\n"
- "ProfileRipple1_getHeight(ProfileRipple1 self) -> double\n"
- "double ProfileRipple1::getHeight() const\n"
- "\n"
- ""},
- { "ProfileRipple1_getWidth", _wrap_ProfileRipple1_getWidth, METH_O, "\n"
- "ProfileRipple1_getWidth(ProfileRipple1 self) -> double\n"
- "double ProfileRipple1::getWidth() const\n"
- "\n"
- ""},
- { "ProfileRipple1_radialExtension", _wrap_ProfileRipple1_radialExtension, METH_O, "\n"
- "ProfileRipple1_radialExtension(ProfileRipple1 self) -> double\n"
- "double ProfileRipple1::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"
- ""},
- { "ProfileRipple1_evaluate_for_q", _wrap_ProfileRipple1_evaluate_for_q, METH_VARARGS, "\n"
- "ProfileRipple1_evaluate_for_q(ProfileRipple1 self, cvector_t q) -> complex_t\n"
- "complex_t ProfileRipple1::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"
- ""},
- { "delete_ProfileRipple1", _wrap_delete_ProfileRipple1, METH_O, "delete_ProfileRipple1(ProfileRipple1 self)"},
- { "ProfileRipple1_swigregister", ProfileRipple1_swigregister, METH_O, NULL},
- { "ProfileRipple2_getLength", _wrap_ProfileRipple2_getLength, METH_O, "\n"
- "ProfileRipple2_getLength(ProfileRipple2 self) -> double\n"
- "double ProfileRipple2::getLength() const\n"
- "\n"
- ""},
- { "ProfileRipple2_getHeight", _wrap_ProfileRipple2_getHeight, METH_O, "\n"
- "ProfileRipple2_getHeight(ProfileRipple2 self) -> double\n"
- "double ProfileRipple2::getHeight() const\n"
- "\n"
- ""},
- { "ProfileRipple2_getWidth", _wrap_ProfileRipple2_getWidth, METH_O, "\n"
- "ProfileRipple2_getWidth(ProfileRipple2 self) -> double\n"
- "double ProfileRipple2::getWidth() const\n"
- "\n"
- ""},
- { "ProfileRipple2_getAsymmetry", _wrap_ProfileRipple2_getAsymmetry, METH_O, "\n"
- "ProfileRipple2_getAsymmetry(ProfileRipple2 self) -> double\n"
- "double ProfileRipple2::getAsymmetry() const\n"
- "\n"
- ""},
- { "ProfileRipple2_radialExtension", _wrap_ProfileRipple2_radialExtension, METH_O, "\n"
- "ProfileRipple2_radialExtension(ProfileRipple2 self) -> double\n"
- "double ProfileRipple2::radialExtension() const override final\n"
+ { "IProfileRipple_getLength", _wrap_IProfileRipple_getLength, METH_O, "IProfileRipple_getLength(IProfileRipple self) -> double"},
+ { "IProfileRipple_getHeight", _wrap_IProfileRipple_getHeight, METH_O, "IProfileRipple_getHeight(IProfileRipple self) -> double"},
+ { "IProfileRipple_getWidth", _wrap_IProfileRipple_getWidth, METH_O, "IProfileRipple_getWidth(IProfileRipple self) -> double"},
+ { "IProfileRipple_radialExtension", _wrap_IProfileRipple_radialExtension, METH_O, "\n"
+ "IProfileRipple_radialExtension(IProfileRipple self) -> double\n"
+ "virtual double IFormFactor::radialExtension() const =0\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"
""},
- { "ProfileRipple2_evaluate_for_q", _wrap_ProfileRipple2_evaluate_for_q, METH_VARARGS, "\n"
- "ProfileRipple2_evaluate_for_q(ProfileRipple2 self, cvector_t q) -> complex_t\n"
- "complex_t ProfileRipple2::evaluate_for_q(cvector_t q) const override final\n"
+ { "IProfileRipple_evaluate_for_q", _wrap_IProfileRipple_evaluate_for_q, METH_VARARGS, "\n"
+ "IProfileRipple_evaluate_for_q(IProfileRipple self, cvector_t q) -> complex_t\n"
+ "virtual complex_t IFormFactorBorn::evaluate_for_q(cvector_t q) const =0\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"
""},
- { "delete_ProfileRipple2", _wrap_delete_ProfileRipple2, METH_O, "delete_ProfileRipple2(ProfileRipple2 self)"},
- { "ProfileRipple2_swigregister", ProfileRipple2_swigregister, METH_O, NULL},
+ { "delete_IProfileRipple", _wrap_delete_IProfileRipple, METH_O, "delete_IProfileRipple(IProfileRipple self)"},
+ { "IProfileRipple_swigregister", IProfileRipple_swigregister, METH_O, NULL},
+ { "delete_IProfileRectangularRipple", _wrap_delete_IProfileRectangularRipple, METH_O, "delete_IProfileRectangularRipple(IProfileRectangularRipple self)"},
+ { "IProfileRectangularRipple_swigregister", IProfileRectangularRipple_swigregister, METH_O, NULL},
+ { "delete_ICosineRipple", _wrap_delete_ICosineRipple, METH_O, "delete_ICosineRipple(ICosineRipple self)"},
+ { "ICosineRipple_swigregister", ICosineRipple_swigregister, METH_O, NULL},
+ { "ISawtoothRipple_getAsymmetry", _wrap_ISawtoothRipple_getAsymmetry, METH_O, "ISawtoothRipple_getAsymmetry(ISawtoothRipple self) -> double"},
+ { "delete_ISawtoothRipple", _wrap_delete_ISawtoothRipple, METH_O, "delete_ISawtoothRipple(ISawtoothRipple self)"},
+ { "ISawtoothRipple_swigregister", ISawtoothRipple_swigregister, METH_O, NULL},
{ "new_FormFactorAnisoPyramid", _wrap_new_FormFactorAnisoPyramid, METH_VARARGS, "\n"
+ "FormFactorAnisoPyramid(vdouble1d_t P)\n"
"new_FormFactorAnisoPyramid(double length, double width, double height, double alpha) -> FormFactorAnisoPyramid\n"
"FormFactorAnisoPyramid::FormFactorAnisoPyramid(double length, double width, double height, double alpha)\n"
"\n"
@@ -127211,6 +130298,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorAnisoPyramid_swigregister", FormFactorAnisoPyramid_swigregister, METH_O, NULL},
{ "FormFactorAnisoPyramid_swiginit", FormFactorAnisoPyramid_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorBox", _wrap_new_FormFactorBox, METH_VARARGS, "\n"
+ "FormFactorBox(vdouble1d_t P)\n"
"new_FormFactorBox(double length, double width, double height) -> FormFactorBox\n"
"FormFactorBox::FormFactorBox(double length, double width, double height)\n"
"\n"
@@ -127278,6 +130366,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorBox_swigregister", FormFactorBox_swigregister, METH_O, NULL},
{ "FormFactorBox_swiginit", FormFactorBox_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorCantellatedCube", _wrap_new_FormFactorCantellatedCube, METH_VARARGS, "\n"
+ "FormFactorCantellatedCube(vdouble1d_t P)\n"
"new_FormFactorCantellatedCube(double length, double removed_length) -> FormFactorCantellatedCube\n"
"FormFactorCantellatedCube::FormFactorCantellatedCube(double length, double removed_length)\n"
"\n"
@@ -127321,6 +130410,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorCantellatedCube_swigregister", FormFactorCantellatedCube_swigregister, METH_O, NULL},
{ "FormFactorCantellatedCube_swiginit", FormFactorCantellatedCube_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorCone", _wrap_new_FormFactorCone, METH_VARARGS, "\n"
+ "FormFactorCone(vdouble1d_t P)\n"
"new_FormFactorCone(double radius, double height, double alpha) -> FormFactorCone\n"
"FormFactorCone::FormFactorCone(double radius, double height, double alpha)\n"
"\n"
@@ -127386,6 +130476,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorCone_swigregister", FormFactorCone_swigregister, METH_O, NULL},
{ "FormFactorCone_swiginit", FormFactorCone_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorCone6", _wrap_new_FormFactorCone6, METH_VARARGS, "\n"
+ "FormFactorCone6(vdouble1d_t P)\n"
"new_FormFactorCone6(double base_edge, double height, double alpha) -> FormFactorCone6\n"
"FormFactorCone6::FormFactorCone6(double base_edge, double height, double alpha)\n"
"\n"
@@ -127436,7 +130527,71 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FormFactorCone6", _wrap_delete_FormFactorCone6, METH_O, "delete_FormFactorCone6(FormFactorCone6 self)"},
{ "FormFactorCone6_swigregister", FormFactorCone6_swigregister, METH_O, NULL},
{ "FormFactorCone6_swiginit", FormFactorCone6_swiginit, METH_VARARGS, NULL},
+ { "new_FormFactorCosineRippleBox", _wrap_new_FormFactorCosineRippleBox, METH_VARARGS, "\n"
+ "FormFactorCosineRippleBox(vdouble1d_t P)\n"
+ "new_FormFactorCosineRippleBox(double length, double width, double height) -> FormFactorCosineRippleBox\n"
+ ""},
+ { "FormFactorCosineRippleBox_clone", _wrap_FormFactorCosineRippleBox_clone, METH_O, "\n"
+ "FormFactorCosineRippleBox_clone(FormFactorCosineRippleBox self) -> FormFactorCosineRippleBox\n"
+ "IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
+ "\n"
+ "Returns a clone of this ISample object. \n"
+ "\n"
+ ""},
+ { "FormFactorCosineRippleBox_accept", _wrap_FormFactorCosineRippleBox_accept, METH_VARARGS, "\n"
+ "FormFactorCosineRippleBox_accept(FormFactorCosineRippleBox self, INodeVisitor visitor)\n"
+ "virtual void INode::accept(INodeVisitor *visitor) const =0\n"
+ "\n"
+ "Calls the INodeVisitor's visit method. \n"
+ "\n"
+ ""},
+ { "delete_FormFactorCosineRippleBox", _wrap_delete_FormFactorCosineRippleBox, METH_O, "delete_FormFactorCosineRippleBox(FormFactorCosineRippleBox self)"},
+ { "FormFactorCosineRippleBox_swigregister", FormFactorCosineRippleBox_swigregister, METH_O, NULL},
+ { "FormFactorCosineRippleBox_swiginit", FormFactorCosineRippleBox_swiginit, METH_VARARGS, NULL},
+ { "new_FormFactorCosineRippleGauss", _wrap_new_FormFactorCosineRippleGauss, METH_VARARGS, "\n"
+ "FormFactorCosineRippleGauss(vdouble1d_t P)\n"
+ "new_FormFactorCosineRippleGauss(double length, double width, double height) -> FormFactorCosineRippleGauss\n"
+ ""},
+ { "FormFactorCosineRippleGauss_clone", _wrap_FormFactorCosineRippleGauss_clone, METH_O, "\n"
+ "FormFactorCosineRippleGauss_clone(FormFactorCosineRippleGauss self) -> FormFactorCosineRippleGauss\n"
+ "IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
+ "\n"
+ "Returns a clone of this ISample object. \n"
+ "\n"
+ ""},
+ { "FormFactorCosineRippleGauss_accept", _wrap_FormFactorCosineRippleGauss_accept, METH_VARARGS, "\n"
+ "FormFactorCosineRippleGauss_accept(FormFactorCosineRippleGauss self, INodeVisitor visitor)\n"
+ "virtual void INode::accept(INodeVisitor *visitor) const =0\n"
+ "\n"
+ "Calls the INodeVisitor's visit method. \n"
+ "\n"
+ ""},
+ { "delete_FormFactorCosineRippleGauss", _wrap_delete_FormFactorCosineRippleGauss, METH_O, "delete_FormFactorCosineRippleGauss(FormFactorCosineRippleGauss self)"},
+ { "FormFactorCosineRippleGauss_swigregister", FormFactorCosineRippleGauss_swigregister, METH_O, NULL},
+ { "FormFactorCosineRippleGauss_swiginit", FormFactorCosineRippleGauss_swiginit, METH_VARARGS, NULL},
+ { "new_FormFactorCosineRippleLorentz", _wrap_new_FormFactorCosineRippleLorentz, METH_VARARGS, "\n"
+ "FormFactorCosineRippleLorentz(vdouble1d_t P)\n"
+ "new_FormFactorCosineRippleLorentz(double length, double width, double height) -> FormFactorCosineRippleLorentz\n"
+ ""},
+ { "FormFactorCosineRippleLorentz_clone", _wrap_FormFactorCosineRippleLorentz_clone, METH_O, "\n"
+ "FormFactorCosineRippleLorentz_clone(FormFactorCosineRippleLorentz self) -> FormFactorCosineRippleLorentz\n"
+ "IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
+ "\n"
+ "Returns a clone of this ISample object. \n"
+ "\n"
+ ""},
+ { "FormFactorCosineRippleLorentz_accept", _wrap_FormFactorCosineRippleLorentz_accept, METH_VARARGS, "\n"
+ "FormFactorCosineRippleLorentz_accept(FormFactorCosineRippleLorentz self, INodeVisitor visitor)\n"
+ "virtual void INode::accept(INodeVisitor *visitor) const =0\n"
+ "\n"
+ "Calls the INodeVisitor's visit method. \n"
+ "\n"
+ ""},
+ { "delete_FormFactorCosineRippleLorentz", _wrap_delete_FormFactorCosineRippleLorentz, METH_O, "delete_FormFactorCosineRippleLorentz(FormFactorCosineRippleLorentz self)"},
+ { "FormFactorCosineRippleLorentz_swigregister", FormFactorCosineRippleLorentz_swigregister, METH_O, NULL},
+ { "FormFactorCosineRippleLorentz_swiginit", FormFactorCosineRippleLorentz_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorCuboctahedron", _wrap_new_FormFactorCuboctahedron, METH_VARARGS, "\n"
+ "FormFactorCuboctahedron(vdouble1d_t P)\n"
"new_FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha) -> FormFactorCuboctahedron\n"
"FormFactorCuboctahedron::FormFactorCuboctahedron(double length, double height, double height_ratio, double alpha)\n"
"\n"
@@ -127496,6 +130651,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorCuboctahedron_swigregister", FormFactorCuboctahedron_swigregister, METH_O, NULL},
{ "FormFactorCuboctahedron_swiginit", FormFactorCuboctahedron_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorCylinder", _wrap_new_FormFactorCylinder, METH_VARARGS, "\n"
+ "FormFactorCylinder(vdouble1d_t P)\n"
"new_FormFactorCylinder(double radius, double height) -> FormFactorCylinder\n"
"FormFactorCylinder::FormFactorCylinder(double radius, double height)\n"
"\n"
@@ -127552,7 +130708,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FormFactorCylinder", _wrap_delete_FormFactorCylinder, METH_O, "delete_FormFactorCylinder(FormFactorCylinder self)"},
{ "FormFactorCylinder_swigregister", FormFactorCylinder_swigregister, METH_O, NULL},
{ "FormFactorCylinder_swiginit", FormFactorCylinder_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorDodecahedron", _wrap_new_FormFactorDodecahedron, METH_O, "\n"
+ { "new_FormFactorDodecahedron", _wrap_new_FormFactorDodecahedron, METH_VARARGS, "\n"
+ "FormFactorDodecahedron(vdouble1d_t P)\n"
"new_FormFactorDodecahedron(double edge) -> FormFactorDodecahedron\n"
"FormFactorDodecahedron::FormFactorDodecahedron(double edge)\n"
"\n"
@@ -127595,7 +130752,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FormFactorDodecahedron", _wrap_delete_FormFactorDodecahedron, METH_O, "delete_FormFactorDodecahedron(FormFactorDodecahedron self)"},
{ "FormFactorDodecahedron_swigregister", FormFactorDodecahedron_swigregister, METH_O, NULL},
{ "FormFactorDodecahedron_swiginit", FormFactorDodecahedron_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorDot", _wrap_new_FormFactorDot, METH_O, "\n"
+ { "new_FormFactorDot", _wrap_new_FormFactorDot, METH_VARARGS, "\n"
+ "FormFactorDot(vdouble1d_t P)\n"
"new_FormFactorDot(double radius) -> FormFactorDot\n"
"FormFactorDot::FormFactorDot(double radius)\n"
"\n"
@@ -127659,6 +130817,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorDot_swigregister", FormFactorDot_swigregister, METH_O, NULL},
{ "FormFactorDot_swiginit", FormFactorDot_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorEllipsoidalCylinder", _wrap_new_FormFactorEllipsoidalCylinder, METH_VARARGS, "\n"
+ "FormFactorEllipsoidalCylinder(vdouble1d_t P)\n"
"new_FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height) -> FormFactorEllipsoidalCylinder\n"
"FormFactorEllipsoidalCylinder::FormFactorEllipsoidalCylinder(double radius_x, double radius_y, double height)\n"
"\n"
@@ -127724,6 +130883,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorEllipsoidalCylinder_swigregister", FormFactorEllipsoidalCylinder_swigregister, METH_O, NULL},
{ "FormFactorEllipsoidalCylinder_swiginit", FormFactorEllipsoidalCylinder_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorFullSphere", _wrap_new_FormFactorFullSphere, METH_VARARGS, "\n"
+ "FormFactorFullSphere(vdouble1d_t P, bool position_at_center=False)\n"
"FormFactorFullSphere(double radius, bool position_at_center=False)\n"
"FormFactorFullSphere::FormFactorFullSphere(double radius, bool position_at_center=false)\n"
"\n"
@@ -127787,6 +130947,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorFullSphere_swigregister", FormFactorFullSphere_swigregister, METH_O, NULL},
{ "FormFactorFullSphere_swiginit", FormFactorFullSphere_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorFullSpheroid", _wrap_new_FormFactorFullSpheroid, METH_VARARGS, "\n"
+ "FormFactorFullSpheroid(vdouble1d_t P)\n"
"new_FormFactorFullSpheroid(double radius, double height) -> FormFactorFullSpheroid\n"
"FormFactorFullSpheroid::FormFactorFullSpheroid(double radius, double height)\n"
"\n"
@@ -127844,6 +131005,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorFullSpheroid_swigregister", FormFactorFullSpheroid_swigregister, METH_O, NULL},
{ "FormFactorFullSpheroid_swiginit", FormFactorFullSpheroid_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorHemiEllipsoid", _wrap_new_FormFactorHemiEllipsoid, METH_VARARGS, "\n"
+ "FormFactorHemiEllipsoid(vdouble1d_t P)\n"
"new_FormFactorHemiEllipsoid(double radius_x, double radius_y, double height) -> FormFactorHemiEllipsoid\n"
"FormFactorHemiEllipsoid::FormFactorHemiEllipsoid(double radius_x, double radius_y, double height)\n"
"\n"
@@ -127913,6 +131075,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorHemiEllipsoid_swigregister", FormFactorHemiEllipsoid_swigregister, METH_O, NULL},
{ "FormFactorHemiEllipsoid_swiginit", FormFactorHemiEllipsoid_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorHollowSphere", _wrap_new_FormFactorHollowSphere, METH_VARARGS, "\n"
+ "FormFactorHollowSphere(vdouble1d_t P)\n"
"new_FormFactorHollowSphere(double mean, double full_width) -> FormFactorHollowSphere\n"
"FormFactorHollowSphere::FormFactorHollowSphere(double mean, double full_width)\n"
"\n"
@@ -127948,7 +131111,8 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FormFactorHollowSphere", _wrap_delete_FormFactorHollowSphere, METH_O, "delete_FormFactorHollowSphere(FormFactorHollowSphere self)"},
{ "FormFactorHollowSphere_swigregister", FormFactorHollowSphere_swigregister, METH_O, NULL},
{ "FormFactorHollowSphere_swiginit", FormFactorHollowSphere_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorIcosahedron", _wrap_new_FormFactorIcosahedron, METH_O, "\n"
+ { "new_FormFactorIcosahedron", _wrap_new_FormFactorIcosahedron, METH_VARARGS, "\n"
+ "FormFactorIcosahedron(vdouble1d_t P)\n"
"new_FormFactorIcosahedron(double edge) -> FormFactorIcosahedron\n"
"FormFactorIcosahedron::FormFactorIcosahedron(double edge)\n"
"\n"
@@ -127984,6 +131148,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorIcosahedron_swigregister", FormFactorIcosahedron_swigregister, METH_O, NULL},
{ "FormFactorIcosahedron_swiginit", FormFactorIcosahedron_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorLongBoxGauss", _wrap_new_FormFactorLongBoxGauss, METH_VARARGS, "\n"
+ "FormFactorLongBoxGauss(vdouble1d_t P)\n"
"new_FormFactorLongBoxGauss(double length, double width, double height) -> FormFactorLongBoxGauss\n"
"FormFactorLongBoxGauss::FormFactorLongBoxGauss(double length, double width, double height)\n"
"\n"
@@ -128049,6 +131214,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorLongBoxGauss_swigregister", FormFactorLongBoxGauss_swigregister, METH_O, NULL},
{ "FormFactorLongBoxGauss_swiginit", FormFactorLongBoxGauss_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorLongBoxLorentz", _wrap_new_FormFactorLongBoxLorentz, METH_VARARGS, "\n"
+ "FormFactorLongBoxLorentz(vdouble1d_t P)\n"
"new_FormFactorLongBoxLorentz(double length, double width, double height) -> FormFactorLongBoxLorentz\n"
"FormFactorLongBoxLorentz::FormFactorLongBoxLorentz(double length, double width, double height)\n"
"\n"
@@ -128114,6 +131280,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorLongBoxLorentz_swigregister", FormFactorLongBoxLorentz_swigregister, METH_O, NULL},
{ "FormFactorLongBoxLorentz_swiginit", FormFactorLongBoxLorentz_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorPrism3", _wrap_new_FormFactorPrism3, METH_VARARGS, "\n"
+ "FormFactorPrism3(vdouble1d_t P)\n"
"new_FormFactorPrism3(double base_edge, double height) -> FormFactorPrism3\n"
"FormFactorPrism3::FormFactorPrism3(double base_edge, double height)\n"
"\n"
@@ -128152,6 +131319,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorPrism3_swigregister", FormFactorPrism3_swigregister, METH_O, NULL},
{ "FormFactorPrism3_swiginit", FormFactorPrism3_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorPrism6", _wrap_new_FormFactorPrism6, METH_VARARGS, "\n"
+ "FormFactorPrism6(vdouble1d_t P)\n"
"new_FormFactorPrism6(double base_edge, double height) -> FormFactorPrism6\n"
"FormFactorPrism6::FormFactorPrism6(double base_edge, double height)\n"
"\n"
@@ -128190,6 +131358,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorPrism6_swigregister", FormFactorPrism6_swigregister, METH_O, NULL},
{ "FormFactorPrism6_swiginit", FormFactorPrism6_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorPyramid", _wrap_new_FormFactorPyramid, METH_VARARGS, "\n"
+ "FormFactorPyramid(vdouble1d_t P)\n"
"new_FormFactorPyramid(double base_edge, double height, double alpha) -> FormFactorPyramid\n"
"FormFactorPyramid::FormFactorPyramid(double base_edge, double height, double alpha)\n"
"\n"
@@ -128240,139 +131409,71 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FormFactorPyramid", _wrap_delete_FormFactorPyramid, METH_O, "delete_FormFactorPyramid(FormFactorPyramid self)"},
{ "FormFactorPyramid_swigregister", FormFactorPyramid_swigregister, METH_O, NULL},
{ "FormFactorPyramid_swiginit", FormFactorPyramid_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorRipple1Box", _wrap_new_FormFactorRipple1Box, METH_VARARGS, "\n"
- "new_FormFactorRipple1Box(double length, double width, double height) -> FormFactorRipple1Box\n"
- "FormFactorRipple1Box::FormFactorRipple1Box(double length, double width, double height)\n"
- "\n"
- ""},
- { "FormFactorRipple1Box_clone", _wrap_FormFactorRipple1Box_clone, METH_O, "\n"
- "FormFactorRipple1Box_clone(FormFactorRipple1Box self) -> FormFactorRipple1Box\n"
- "FormFactorRipple1Box * FormFactorRipple1Box::clone() const override final\n"
- "\n"
- "Returns a clone of this ISample object. \n"
- "\n"
- ""},
- { "FormFactorRipple1Box_accept", _wrap_FormFactorRipple1Box_accept, METH_VARARGS, "\n"
- "FormFactorRipple1Box_accept(FormFactorRipple1Box self, INodeVisitor visitor)\n"
- "void FormFactorRipple1Box::accept(INodeVisitor *visitor) const override final\n"
- "\n"
- "Calls the INodeVisitor's visit method. \n"
- "\n"
- ""},
- { "delete_FormFactorRipple1Box", _wrap_delete_FormFactorRipple1Box, METH_O, "delete_FormFactorRipple1Box(FormFactorRipple1Box self)"},
- { "FormFactorRipple1Box_swigregister", FormFactorRipple1Box_swigregister, METH_O, NULL},
- { "FormFactorRipple1Box_swiginit", FormFactorRipple1Box_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorRipple1Gauss", _wrap_new_FormFactorRipple1Gauss, METH_VARARGS, "\n"
- "new_FormFactorRipple1Gauss(double length, double width, double height) -> FormFactorRipple1Gauss\n"
- "FormFactorRipple1Gauss::FormFactorRipple1Gauss(double length, double width, double height)\n"
- "\n"
- ""},
- { "FormFactorRipple1Gauss_clone", _wrap_FormFactorRipple1Gauss_clone, METH_O, "\n"
- "FormFactorRipple1Gauss_clone(FormFactorRipple1Gauss self) -> FormFactorRipple1Gauss\n"
- "FormFactorRipple1Gauss * FormFactorRipple1Gauss::clone() const override final\n"
- "\n"
- "Returns a clone of this ISample object. \n"
- "\n"
- ""},
- { "FormFactorRipple1Gauss_accept", _wrap_FormFactorRipple1Gauss_accept, METH_VARARGS, "\n"
- "FormFactorRipple1Gauss_accept(FormFactorRipple1Gauss self, INodeVisitor visitor)\n"
- "void FormFactorRipple1Gauss::accept(INodeVisitor *visitor) const override final\n"
- "\n"
- "Calls the INodeVisitor's visit method. \n"
- "\n"
- ""},
- { "delete_FormFactorRipple1Gauss", _wrap_delete_FormFactorRipple1Gauss, METH_O, "delete_FormFactorRipple1Gauss(FormFactorRipple1Gauss self)"},
- { "FormFactorRipple1Gauss_swigregister", FormFactorRipple1Gauss_swigregister, METH_O, NULL},
- { "FormFactorRipple1Gauss_swiginit", FormFactorRipple1Gauss_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorRipple1Lorentz", _wrap_new_FormFactorRipple1Lorentz, METH_VARARGS, "\n"
- "new_FormFactorRipple1Lorentz(double length, double width, double height) -> FormFactorRipple1Lorentz\n"
- "FormFactorRipple1Lorentz::FormFactorRipple1Lorentz(double length, double width, double height)\n"
- "\n"
- ""},
- { "FormFactorRipple1Lorentz_clone", _wrap_FormFactorRipple1Lorentz_clone, METH_O, "\n"
- "FormFactorRipple1Lorentz_clone(FormFactorRipple1Lorentz self) -> FormFactorRipple1Lorentz\n"
- "FormFactorRipple1Lorentz * FormFactorRipple1Lorentz::clone() const override final\n"
- "\n"
- "Returns a clone of this ISample object. \n"
- "\n"
- ""},
- { "FormFactorRipple1Lorentz_accept", _wrap_FormFactorRipple1Lorentz_accept, METH_VARARGS, "\n"
- "FormFactorRipple1Lorentz_accept(FormFactorRipple1Lorentz self, INodeVisitor visitor)\n"
- "void FormFactorRipple1Lorentz::accept(INodeVisitor *visitor) const override final\n"
- "\n"
- "Calls the INodeVisitor's visit method. \n"
- "\n"
- ""},
- { "delete_FormFactorRipple1Lorentz", _wrap_delete_FormFactorRipple1Lorentz, METH_O, "delete_FormFactorRipple1Lorentz(FormFactorRipple1Lorentz self)"},
- { "FormFactorRipple1Lorentz_swigregister", FormFactorRipple1Lorentz_swigregister, METH_O, NULL},
- { "FormFactorRipple1Lorentz_swiginit", FormFactorRipple1Lorentz_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorRipple2Box", _wrap_new_FormFactorRipple2Box, METH_VARARGS, "\n"
- "new_FormFactorRipple2Box(double length, double width, double height, double asymmetry) -> FormFactorRipple2Box\n"
- "FormFactorRipple2Box::FormFactorRipple2Box(double length, double width, double height, double asymmetry)\n"
- "\n"
+ { "new_FormFactorSawtoothRippleBox", _wrap_new_FormFactorSawtoothRippleBox, METH_VARARGS, "\n"
+ "FormFactorSawtoothRippleBox(vdouble1d_t P)\n"
+ "new_FormFactorSawtoothRippleBox(double length, double width, double height, double asymmetry) -> FormFactorSawtoothRippleBox\n"
""},
- { "FormFactorRipple2Box_clone", _wrap_FormFactorRipple2Box_clone, METH_O, "\n"
- "FormFactorRipple2Box_clone(FormFactorRipple2Box self) -> FormFactorRipple2Box\n"
- "FormFactorRipple2Box * FormFactorRipple2Box::clone() const override final\n"
+ { "FormFactorSawtoothRippleBox_clone", _wrap_FormFactorSawtoothRippleBox_clone, METH_O, "\n"
+ "FormFactorSawtoothRippleBox_clone(FormFactorSawtoothRippleBox self) -> FormFactorSawtoothRippleBox\n"
+ "IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
""},
- { "FormFactorRipple2Box_accept", _wrap_FormFactorRipple2Box_accept, METH_VARARGS, "\n"
- "FormFactorRipple2Box_accept(FormFactorRipple2Box self, INodeVisitor visitor)\n"
- "void FormFactorRipple2Box::accept(INodeVisitor *visitor) const override final\n"
+ { "FormFactorSawtoothRippleBox_accept", _wrap_FormFactorSawtoothRippleBox_accept, METH_VARARGS, "\n"
+ "FormFactorSawtoothRippleBox_accept(FormFactorSawtoothRippleBox self, INodeVisitor visitor)\n"
+ "virtual void INode::accept(INodeVisitor *visitor) const =0\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
""},
- { "delete_FormFactorRipple2Box", _wrap_delete_FormFactorRipple2Box, METH_O, "delete_FormFactorRipple2Box(FormFactorRipple2Box self)"},
- { "FormFactorRipple2Box_swigregister", FormFactorRipple2Box_swigregister, METH_O, NULL},
- { "FormFactorRipple2Box_swiginit", FormFactorRipple2Box_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorRipple2Gauss", _wrap_new_FormFactorRipple2Gauss, METH_VARARGS, "\n"
- "new_FormFactorRipple2Gauss(double length, double width, double height, double asymmetry) -> FormFactorRipple2Gauss\n"
- "FormFactorRipple2Gauss::FormFactorRipple2Gauss(double length, double width, double height, double asymmetry)\n"
- "\n"
+ { "delete_FormFactorSawtoothRippleBox", _wrap_delete_FormFactorSawtoothRippleBox, METH_O, "delete_FormFactorSawtoothRippleBox(FormFactorSawtoothRippleBox self)"},
+ { "FormFactorSawtoothRippleBox_swigregister", FormFactorSawtoothRippleBox_swigregister, METH_O, NULL},
+ { "FormFactorSawtoothRippleBox_swiginit", FormFactorSawtoothRippleBox_swiginit, METH_VARARGS, NULL},
+ { "new_FormFactorSawtoothRippleGauss", _wrap_new_FormFactorSawtoothRippleGauss, METH_VARARGS, "\n"
+ "FormFactorSawtoothRippleGauss(vdouble1d_t P)\n"
+ "new_FormFactorSawtoothRippleGauss(double length, double width, double height, double asymmetry) -> FormFactorSawtoothRippleGauss\n"
""},
- { "FormFactorRipple2Gauss_clone", _wrap_FormFactorRipple2Gauss_clone, METH_O, "\n"
- "FormFactorRipple2Gauss_clone(FormFactorRipple2Gauss self) -> FormFactorRipple2Gauss\n"
- "FormFactorRipple2Gauss * FormFactorRipple2Gauss::clone() const override final\n"
+ { "FormFactorSawtoothRippleGauss_clone", _wrap_FormFactorSawtoothRippleGauss_clone, METH_O, "\n"
+ "FormFactorSawtoothRippleGauss_clone(FormFactorSawtoothRippleGauss self) -> FormFactorSawtoothRippleGauss\n"
+ "IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
""},
- { "FormFactorRipple2Gauss_accept", _wrap_FormFactorRipple2Gauss_accept, METH_VARARGS, "\n"
- "FormFactorRipple2Gauss_accept(FormFactorRipple2Gauss self, INodeVisitor visitor)\n"
- "void FormFactorRipple2Gauss::accept(INodeVisitor *visitor) const override final\n"
+ { "FormFactorSawtoothRippleGauss_accept", _wrap_FormFactorSawtoothRippleGauss_accept, METH_VARARGS, "\n"
+ "FormFactorSawtoothRippleGauss_accept(FormFactorSawtoothRippleGauss self, INodeVisitor visitor)\n"
+ "virtual void INode::accept(INodeVisitor *visitor) const =0\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
""},
- { "delete_FormFactorRipple2Gauss", _wrap_delete_FormFactorRipple2Gauss, METH_O, "delete_FormFactorRipple2Gauss(FormFactorRipple2Gauss self)"},
- { "FormFactorRipple2Gauss_swigregister", FormFactorRipple2Gauss_swigregister, METH_O, NULL},
- { "FormFactorRipple2Gauss_swiginit", FormFactorRipple2Gauss_swiginit, METH_VARARGS, NULL},
- { "new_FormFactorRipple2Lorentz", _wrap_new_FormFactorRipple2Lorentz, METH_VARARGS, "\n"
- "new_FormFactorRipple2Lorentz(double length, double width, double height, double asymmetry) -> FormFactorRipple2Lorentz\n"
- "FormFactorRipple2Lorentz::FormFactorRipple2Lorentz(double length, double width, double height, double asymmetry)\n"
- "\n"
+ { "delete_FormFactorSawtoothRippleGauss", _wrap_delete_FormFactorSawtoothRippleGauss, METH_O, "delete_FormFactorSawtoothRippleGauss(FormFactorSawtoothRippleGauss self)"},
+ { "FormFactorSawtoothRippleGauss_swigregister", FormFactorSawtoothRippleGauss_swigregister, METH_O, NULL},
+ { "FormFactorSawtoothRippleGauss_swiginit", FormFactorSawtoothRippleGauss_swiginit, METH_VARARGS, NULL},
+ { "new_FormFactorSawtoothRippleLorentz", _wrap_new_FormFactorSawtoothRippleLorentz, METH_VARARGS, "\n"
+ "FormFactorSawtoothRippleLorentz(vdouble1d_t P)\n"
+ "new_FormFactorSawtoothRippleLorentz(double length, double width, double height, double asymmetry) -> FormFactorSawtoothRippleLorentz\n"
""},
- { "FormFactorRipple2Lorentz_clone", _wrap_FormFactorRipple2Lorentz_clone, METH_O, "\n"
- "FormFactorRipple2Lorentz_clone(FormFactorRipple2Lorentz self) -> FormFactorRipple2Lorentz\n"
- "FormFactorRipple2Lorentz * FormFactorRipple2Lorentz::clone() const override final\n"
+ { "FormFactorSawtoothRippleLorentz_clone", _wrap_FormFactorSawtoothRippleLorentz_clone, METH_O, "\n"
+ "FormFactorSawtoothRippleLorentz_clone(FormFactorSawtoothRippleLorentz self) -> FormFactorSawtoothRippleLorentz\n"
+ "IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
"\n"
"Returns a clone of this ISample object. \n"
"\n"
""},
- { "FormFactorRipple2Lorentz_accept", _wrap_FormFactorRipple2Lorentz_accept, METH_VARARGS, "\n"
- "FormFactorRipple2Lorentz_accept(FormFactorRipple2Lorentz self, INodeVisitor visitor)\n"
- "void FormFactorRipple2Lorentz::accept(INodeVisitor *visitor) const override final\n"
+ { "FormFactorSawtoothRippleLorentz_accept", _wrap_FormFactorSawtoothRippleLorentz_accept, METH_VARARGS, "\n"
+ "FormFactorSawtoothRippleLorentz_accept(FormFactorSawtoothRippleLorentz self, INodeVisitor visitor)\n"
+ "virtual void INode::accept(INodeVisitor *visitor) const =0\n"
"\n"
"Calls the INodeVisitor's visit method. \n"
"\n"
""},
- { "delete_FormFactorRipple2Lorentz", _wrap_delete_FormFactorRipple2Lorentz, METH_O, "delete_FormFactorRipple2Lorentz(FormFactorRipple2Lorentz self)"},
- { "FormFactorRipple2Lorentz_swigregister", FormFactorRipple2Lorentz_swigregister, METH_O, NULL},
- { "FormFactorRipple2Lorentz_swiginit", FormFactorRipple2Lorentz_swiginit, METH_VARARGS, NULL},
+ { "delete_FormFactorSawtoothRippleLorentz", _wrap_delete_FormFactorSawtoothRippleLorentz, METH_O, "delete_FormFactorSawtoothRippleLorentz(FormFactorSawtoothRippleLorentz self)"},
+ { "FormFactorSawtoothRippleLorentz_swigregister", FormFactorSawtoothRippleLorentz_swigregister, METH_O, NULL},
+ { "FormFactorSawtoothRippleLorentz_swiginit", FormFactorSawtoothRippleLorentz_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorTetrahedron", _wrap_new_FormFactorTetrahedron, METH_VARARGS, "\n"
+ "FormFactorTetrahedron(vdouble1d_t P)\n"
"new_FormFactorTetrahedron(double base_edge, double height, double alpha) -> FormFactorTetrahedron\n"
"FormFactorTetrahedron::FormFactorTetrahedron(double base_edge, double height, double alpha)\n"
"\n"
@@ -128424,6 +131525,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorTetrahedron_swigregister", FormFactorTetrahedron_swigregister, METH_O, NULL},
{ "FormFactorTetrahedron_swiginit", FormFactorTetrahedron_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorTruncatedCube", _wrap_new_FormFactorTruncatedCube, METH_VARARGS, "\n"
+ "FormFactorTruncatedCube(vdouble1d_t P)\n"
"new_FormFactorTruncatedCube(double length, double removed_length) -> FormFactorTruncatedCube\n"
"FormFactorTruncatedCube::FormFactorTruncatedCube(double length, double removed_length)\n"
"\n"
@@ -128467,6 +131569,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorTruncatedCube_swigregister", FormFactorTruncatedCube_swigregister, METH_O, NULL},
{ "FormFactorTruncatedCube_swiginit", FormFactorTruncatedCube_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorTruncatedSphere", _wrap_new_FormFactorTruncatedSphere, METH_VARARGS, "\n"
+ "FormFactorTruncatedSphere(vdouble1d_t P)\n"
"new_FormFactorTruncatedSphere(double radius, double height, double dh) -> FormFactorTruncatedSphere\n"
"FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height, double dh=0.0)\n"
"\n"
@@ -128532,6 +131635,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorTruncatedSphere_swigregister", FormFactorTruncatedSphere_swigregister, METH_O, NULL},
{ "FormFactorTruncatedSphere_swiginit", FormFactorTruncatedSphere_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorTruncatedSpheroid", _wrap_new_FormFactorTruncatedSpheroid, METH_VARARGS, "\n"
+ "FormFactorTruncatedSpheroid(vdouble1d_t P)\n"
"new_FormFactorTruncatedSpheroid(double radius, double height, double height_flattening, double dh) -> FormFactorTruncatedSpheroid\n"
"FormFactorTruncatedSpheroid::FormFactorTruncatedSpheroid(double radius, double height, double height_flattening, double dh=0.0)\n"
"\n"
@@ -128604,22 +131708,10 @@ static PyMethodDef SwigMethods[] = {
{ "delete_FormFactorTruncatedSpheroid", _wrap_delete_FormFactorTruncatedSpheroid, METH_O, "delete_FormFactorTruncatedSpheroid(FormFactorTruncatedSpheroid self)"},
{ "FormFactorTruncatedSpheroid_swigregister", FormFactorTruncatedSpheroid_swigregister, METH_O, NULL},
{ "FormFactorTruncatedSpheroid_swiginit", FormFactorTruncatedSpheroid_swiginit, METH_VARARGS, NULL},
- { "factor_x_box", _wrap_factor_x_box, METH_VARARGS, "\n"
- "factor_x_box(complex_t q, double l) -> complex_t\n"
- "complex_t ripples::factor_x_box(complex_t q, double l)\n"
- "\n"
+ { "new_FormFactorGaussSphere", _wrap_new_FormFactorGaussSphere, METH_VARARGS, "\n"
+ "FormFactorGaussSphere(vdouble1d_t P)\n"
+ "new_FormFactorGaussSphere(double mean_radius) -> FormFactorGaussSphere\n"
""},
- { "factor_x_Gauss", _wrap_factor_x_Gauss, METH_VARARGS, "\n"
- "factor_x_Gauss(complex_t q, double l) -> complex_t\n"
- "complex_t ripples::factor_x_Gauss(complex_t q, double l)\n"
- "\n"
- ""},
- { "factor_x_Lorentz", _wrap_factor_x_Lorentz, METH_VARARGS, "\n"
- "factor_x_Lorentz(complex_t q, double l) -> complex_t\n"
- "complex_t ripples::factor_x_Lorentz(complex_t q, double l)\n"
- "\n"
- ""},
- { "new_FormFactorGaussSphere", _wrap_new_FormFactorGaussSphere, METH_O, "new_FormFactorGaussSphere(double mean_radius) -> FormFactorGaussSphere"},
{ "FormFactorGaussSphere_clone", _wrap_FormFactorGaussSphere_clone, METH_O, "\n"
"FormFactorGaussSphere_clone(FormFactorGaussSphere self) -> FormFactorGaussSphere\n"
"IFormFactorBorn* IFormFactorBorn::clone() const override=0\n"
@@ -128653,6 +131745,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorGaussSphere_swigregister", FormFactorGaussSphere_swigregister, METH_O, NULL},
{ "FormFactorGaussSphere_swiginit", FormFactorGaussSphere_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorSphereGaussianRadius", _wrap_new_FormFactorSphereGaussianRadius, METH_VARARGS, "\n"
+ "FormFactorSphereGaussianRadius(vdouble1d_t P)\n"
"new_FormFactorSphereGaussianRadius(double mean, double sigma) -> FormFactorSphereGaussianRadius\n"
"FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)\n"
"\n"
@@ -128689,6 +131782,7 @@ static PyMethodDef SwigMethods[] = {
{ "FormFactorSphereGaussianRadius_swigregister", FormFactorSphereGaussianRadius_swigregister, METH_O, NULL},
{ "FormFactorSphereGaussianRadius_swiginit", FormFactorSphereGaussianRadius_swiginit, METH_VARARGS, NULL},
{ "new_FormFactorSphereLogNormalRadius", _wrap_new_FormFactorSphereLogNormalRadius, METH_VARARGS, "\n"
+ "FormFactorSphereLogNormalRadius(vdouble1d_t P, size_t n_samples=0)\n"
"new_FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples) -> FormFactorSphereLogNormalRadius\n"
"FormFactorSphereLogNormalRadius::FormFactorSphereLogNormalRadius(double mean, double scale_param, size_t n_samples)\n"
"\n"
@@ -129243,7 +132337,8 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IBackground_swigregister", IBackground_swigregister, METH_O, NULL},
- { "new_ConstantBackground", _wrap_new_ConstantBackground, METH_O, "\n"
+ { "new_ConstantBackground", _wrap_new_ConstantBackground, METH_VARARGS, "\n"
+ "ConstantBackground(vdouble1d_t P)\n"
"new_ConstantBackground(double background_value) -> ConstantBackground\n"
"ConstantBackground::ConstantBackground(double background_value)\n"
"\n"
@@ -129282,11 +132377,6 @@ static PyMethodDef SwigMethods[] = {
"PoissonNoiseBackground::PoissonNoiseBackground()\n"
"\n"
""},
- { "delete_PoissonNoiseBackground", _wrap_delete_PoissonNoiseBackground, METH_O, "\n"
- "delete_PoissonNoiseBackground(PoissonNoiseBackground self)\n"
- "PoissonNoiseBackground::~PoissonNoiseBackground()\n"
- "\n"
- ""},
{ "PoissonNoiseBackground_clone", _wrap_PoissonNoiseBackground_clone, METH_O, "\n"
"PoissonNoiseBackground_clone(PoissonNoiseBackground self) -> PoissonNoiseBackground\n"
"PoissonNoiseBackground * PoissonNoiseBackground::clone() const override final\n"
@@ -129304,6 +132394,11 @@ static PyMethodDef SwigMethods[] = {
"double PoissonNoiseBackground::addBackGround(double intensity) const override final\n"
"\n"
""},
+ { "delete_PoissonNoiseBackground", _wrap_delete_PoissonNoiseBackground, METH_O, "\n"
+ "delete_PoissonNoiseBackground(PoissonNoiseBackground self)\n"
+ "PoissonNoiseBackground::~PoissonNoiseBackground()\n"
+ "\n"
+ ""},
{ "PoissonNoiseBackground_swigregister", PoissonNoiseBackground_swigregister, METH_O, NULL},
{ "PoissonNoiseBackground_swiginit", PoissonNoiseBackground_swiginit, METH_VARARGS, NULL},
{ "MaterialProfile_cpp", _wrap_MaterialProfile_cpp, METH_VARARGS, "\n"
@@ -129606,39 +132701,6 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IDetector2D_swigregister", IDetector2D_swigregister, METH_O, NULL},
- { "new_SphericalPixel", _wrap_new_SphericalPixel, METH_VARARGS, "\n"
- "new_SphericalPixel(Bin1D alpha_bin, Bin1D phi_bin) -> SphericalPixel\n"
- "SphericalPixel::SphericalPixel(const Bin1D &alpha_bin, const Bin1D &phi_bin)\n"
- "\n"
- ""},
- { "SphericalPixel_clone", _wrap_SphericalPixel_clone, METH_O, "\n"
- "SphericalPixel_clone(SphericalPixel self) -> SphericalPixel\n"
- "SphericalPixel * SphericalPixel::clone() const override\n"
- "\n"
- ""},
- { "SphericalPixel_createZeroSizePixel", _wrap_SphericalPixel_createZeroSizePixel, METH_VARARGS, "\n"
- "SphericalPixel_createZeroSizePixel(SphericalPixel self, double x, double y) -> SphericalPixel\n"
- "SphericalPixel * SphericalPixel::createZeroSizePixel(double x, double y) const override\n"
- "\n"
- ""},
- { "SphericalPixel_getK", _wrap_SphericalPixel_getK, METH_VARARGS, "\n"
- "SphericalPixel_getK(SphericalPixel self, double x, double y, double wavelength) -> kvector_t\n"
- "kvector_t SphericalPixel::getK(double x, double y, double wavelength) const override\n"
- "\n"
- ""},
- { "SphericalPixel_getIntegrationFactor", _wrap_SphericalPixel_getIntegrationFactor, METH_VARARGS, "\n"
- "SphericalPixel_getIntegrationFactor(SphericalPixel self, double x, double y) -> double\n"
- "double SphericalPixel::getIntegrationFactor(double x, double y) const override\n"
- "\n"
- ""},
- { "SphericalPixel_getSolidAngle", _wrap_SphericalPixel_getSolidAngle, METH_O, "\n"
- "SphericalPixel_getSolidAngle(SphericalPixel self) -> double\n"
- "double SphericalPixel::getSolidAngle() const override\n"
- "\n"
- ""},
- { "delete_SphericalPixel", _wrap_delete_SphericalPixel, METH_O, "delete_SphericalPixel(SphericalPixel self)"},
- { "SphericalPixel_swigregister", SphericalPixel_swigregister, METH_O, NULL},
- { "SphericalPixel_swiginit", SphericalPixel_swiginit, METH_VARARGS, NULL},
{ "new_SphericalDetector", _wrap_new_SphericalDetector, METH_VARARGS, "\n"
"SphericalDetector()\n"
"SphericalDetector(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)\n"
@@ -129769,44 +132831,6 @@ static PyMethodDef SwigMethods[] = {
{ "delete_IsGISAXSDetector", _wrap_delete_IsGISAXSDetector, METH_O, "delete_IsGISAXSDetector(IsGISAXSDetector self)"},
{ "IsGISAXSDetector_swigregister", IsGISAXSDetector_swigregister, METH_O, NULL},
{ "IsGISAXSDetector_swiginit", IsGISAXSDetector_swiginit, METH_VARARGS, NULL},
- { "new_RectangularPixel", _wrap_new_RectangularPixel, METH_VARARGS, "\n"
- "new_RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height) -> RectangularPixel\n"
- "RectangularPixel::RectangularPixel(kvector_t corner_pos, kvector_t width, kvector_t height)\n"
- "\n"
- ""},
- { "RectangularPixel_clone", _wrap_RectangularPixel_clone, METH_O, "\n"
- "RectangularPixel_clone(RectangularPixel self) -> RectangularPixel\n"
- "RectangularPixel * RectangularPixel::clone() const override\n"
- "\n"
- ""},
- { "RectangularPixel_createZeroSizePixel", _wrap_RectangularPixel_createZeroSizePixel, METH_VARARGS, "\n"
- "RectangularPixel_createZeroSizePixel(RectangularPixel self, double x, double y) -> RectangularPixel\n"
- "RectangularPixel * RectangularPixel::createZeroSizePixel(double x, double y) const override\n"
- "\n"
- ""},
- { "RectangularPixel_getK", _wrap_RectangularPixel_getK, METH_VARARGS, "\n"
- "RectangularPixel_getK(RectangularPixel self, double x, double y, double wavelength) -> kvector_t\n"
- "kvector_t RectangularPixel::getK(double x, double y, double wavelength) const override\n"
- "\n"
- ""},
- { "RectangularPixel_getPosition", _wrap_RectangularPixel_getPosition, METH_VARARGS, "\n"
- "RectangularPixel_getPosition(RectangularPixel self, double x, double y) -> kvector_t\n"
- "kvector_t RectangularPixel::getPosition(double x, double y) const\n"
- "\n"
- ""},
- { "RectangularPixel_getIntegrationFactor", _wrap_RectangularPixel_getIntegrationFactor, METH_VARARGS, "\n"
- "RectangularPixel_getIntegrationFactor(RectangularPixel self, double x, double y) -> double\n"
- "double RectangularPixel::getIntegrationFactor(double x, double y) const override\n"
- "\n"
- ""},
- { "RectangularPixel_getSolidAngle", _wrap_RectangularPixel_getSolidAngle, METH_O, "\n"
- "RectangularPixel_getSolidAngle(RectangularPixel self) -> double\n"
- "double RectangularPixel::getSolidAngle() const override\n"
- "\n"
- ""},
- { "delete_RectangularPixel", _wrap_delete_RectangularPixel, METH_O, "delete_RectangularPixel(RectangularPixel self)"},
- { "RectangularPixel_swigregister", RectangularPixel_swigregister, METH_O, NULL},
- { "RectangularPixel_swiginit", RectangularPixel_swiginit, METH_VARARGS, NULL},
{ "new_RectangularDetector", _wrap_new_RectangularDetector, METH_VARARGS, "\n"
"RectangularDetector(size_t nxbins, double width, size_t nybins, double height)\n"
"new_RectangularDetector(RectangularDetector other) -> RectangularDetector\n"
@@ -129930,7 +132954,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "RectangularDetector_regionOfInterestPixel", _wrap_RectangularDetector_regionOfInterestPixel, METH_O, "\n"
- "RectangularDetector_regionOfInterestPixel(RectangularDetector self) -> RectangularPixel\n"
+ "RectangularDetector_regionOfInterestPixel(RectangularDetector self) -> RectangularPixel *\n"
"RectangularPixel * RectangularDetector::regionOfInterestPixel() const\n"
"\n"
""},
@@ -131730,24 +134754,6 @@ static void *_p_RectangularDetectorTo_p_IDetector(void *x, int *SWIGUNUSEDPARM(n
static void *_p_IDetector2DTo_p_IDetector(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IDetector *) ((IDetector2D *) x));
}
-static void *_p_FormFactorRipple1LorentzTo_p_ProfileRipple1(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ProfileRipple1 *) ((FormFactorRipple1Lorentz *) x));
-}
-static void *_p_FormFactorRipple1BoxTo_p_ProfileRipple1(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ProfileRipple1 *) ((FormFactorRipple1Box *) x));
-}
-static void *_p_FormFactorRipple1GaussTo_p_ProfileRipple1(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ProfileRipple1 *) ((FormFactorRipple1Gauss *) x));
-}
-static void *_p_FormFactorRipple2GaussTo_p_ProfileRipple2(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ProfileRipple2 *) ((FormFactorRipple2Gauss *) x));
-}
-static void *_p_FormFactorRipple2LorentzTo_p_ProfileRipple2(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ProfileRipple2 *) ((FormFactorRipple2Lorentz *) x));
-}
-static void *_p_FormFactorRipple2BoxTo_p_ProfileRipple2(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ProfileRipple2 *) ((FormFactorRipple2Box *) x));
-}
static void *_p_PolygonTo_p_IShape2D(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IShape2D *) ((Polygon *) x));
}
@@ -131796,6 +134802,51 @@ static void *_p_RangedDistributionGateTo_p_RangedDistribution(void *x, int *SWIG
static void *_p_RangedDistributionLogNormalTo_p_RangedDistribution(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((RangedDistribution *) ((RangedDistributionLogNormal *) x));
}
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_ISawtoothRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
+}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_ISawtoothRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
+}
+static void *_p_FormFactorSawtoothRippleGaussTo_p_ISawtoothRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
+}
+static void *_p_FormFactorCosineRippleLorentzTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) (ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) (ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
+}
+static void *_p_IProfileRectangularRippleTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) ((IProfileRectangularRipple *) x));
+}
+static void *_p_ISawtoothRippleTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) ((ISawtoothRipple *) x));
+}
+static void *_p_FormFactorCosineRippleBoxTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) (ICosineRipple *) ((FormFactorCosineRippleBox *) x));
+}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) (ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
+}
+static void *_p_ICosineRippleTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) ((ICosineRipple *) x));
+}
+static void *_p_FormFactorCosineRippleGaussTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) (ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
+}
+static void *_p_FormFactorSawtoothRippleGaussTo_p_IProfileRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IProfileRipple *) (ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
+}
+static void *_p_FormFactorCosineRippleLorentzTo_p_ICosineRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
+static void *_p_FormFactorCosineRippleBoxTo_p_ICosineRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICosineRipple *) ((FormFactorCosineRippleBox *) x));
+}
+static void *_p_FormFactorCosineRippleGaussTo_p_ICosineRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
+}
static void *_p_ConstKBinAxisTo_p_VariableBinAxis(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((VariableBinAxis *) ((ConstKBinAxis *) x));
}
@@ -131829,36 +134880,36 @@ static void *_p_FormFactorFullSpheroidTo_p_IFormFactorBorn(void *x, int *SWIGUNU
static void *_p_FormFactorTruncatedSpheroidTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorTruncatedSpheroid *) x));
}
-static void *_p_FormFactorRipple1BoxTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (ProfileRipple1 *) ((FormFactorRipple1Box *) x));
+static void *_p_IProfileRippleTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) ((IProfileRipple *) x));
+}
+static void *_p_ICosineRippleTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *) ((ICosineRipple *) x));
}
static void *_p_FormFactorLongBoxGaussTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorLongBoxGauss *) x));
}
-static void *_p_ProfileRipple1To_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) ((ProfileRipple1 *) x));
+static void *_p_FormFactorSawtoothRippleGaussTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
+}
+static void *_p_FormFactorCosineRippleGaussTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
}
static void *_p_FormFactorPolygonalSurfaceTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorPolygonalSurface *) x));
}
-static void *_p_ProfileRipple2To_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) ((ProfileRipple2 *) x));
-}
-static void *_p_FormFactorTruncatedCubeTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorTruncatedCube *) x));
-}
static void *_p_FormFactorCantellatedCubeTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorCantellatedCube *) x));
}
static void *_p_FormFactorFullSphereTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorFullSphere *) x));
}
+static void *_p_FormFactorTruncatedCubeTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorTruncatedCube *) x));
+}
static void *_p_FormFactorTruncatedSphereTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorTruncatedSphere *) x));
}
-static void *_p_FormFactorRipple1GaussTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (ProfileRipple1 *) ((FormFactorRipple1Gauss *) x));
-}
static void *_p_FormFactorEllipsoidalCylinderTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorEllipsoidalCylinder *) x));
}
@@ -131874,14 +134925,14 @@ static void *_p_FormFactorTetrahedronTo_p_IFormFactorBorn(void *x, int *SWIGUNUS
static void *_p_FormFactorIcosahedronTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorIcosahedron *) x));
}
-static void *_p_FormFactorPolyhedronTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) ((FormFactorPolyhedron *) x));
+static void *_p_FormFactorDodecahedronTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorDodecahedron *) x));
}
static void *_p_FormFactorCuboctahedronTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorCuboctahedron *) x));
}
-static void *_p_FormFactorDodecahedronTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorDodecahedron *) x));
+static void *_p_FormFactorPolyhedronTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) ((FormFactorPolyhedron *) x));
}
static void *_p_FormFactorConeTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorCone *) x));
@@ -131904,20 +134955,26 @@ static void *_p_FormFactorGaussSphereTo_p_IFormFactorBorn(void *x, int *SWIGUNUS
static void *_p_FormFactorDotTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorDot *) x));
}
-static void *_p_FormFactorRipple2BoxTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (ProfileRipple2 *) ((FormFactorRipple2Box *) x));
+static void *_p_IProfileRectangularRippleTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *) ((IProfileRectangularRipple *) x));
}
-static void *_p_FormFactorRipple2LorentzTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (ProfileRipple2 *) ((FormFactorRipple2Lorentz *) x));
+static void *_p_ISawtoothRippleTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *) ((ISawtoothRipple *) x));
}
-static void *_p_FormFactorRipple1LorentzTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (ProfileRipple1 *) ((FormFactorRipple1Lorentz *) x));
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
}
static void *_p_FormFactorLongBoxLorentzTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) ((FormFactorLongBoxLorentz *) x));
}
-static void *_p_ProfileBarTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) ((ProfileBar *) x));
+static void *_p_FormFactorCosineRippleLorentzTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
+}
+static void *_p_FormFactorCosineRippleBoxTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactorBorn *) (IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleBox *) x));
}
static void *_p_FormFactorPyramidTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) (FormFactorPolyhedron *) ((FormFactorPyramid *) x));
@@ -131928,9 +134985,6 @@ static void *_p_FormFactorAnisoPyramidTo_p_IFormFactorBorn(void *x, int *SWIGUNU
static void *_p_FormFactorPrism3To_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactorBorn *) (FormFactorPolygonalPrism *) ((FormFactorPrism3 *) x));
}
-static void *_p_FormFactorRipple2GaussTo_p_IFormFactorBorn(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactorBorn *) (ProfileRipple2 *) ((FormFactorRipple2Gauss *) x));
-}
static void *_p_VariableBinAxisTo_p_IAxis(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IAxis *) ((VariableBinAxis *) x));
}
@@ -131976,12 +135030,6 @@ static void *_p_MillerIndexOrientationTo_p_ILatticeOrientation(void *x, int *SWI
static void *_p_SimpleSelectionRuleTo_p_ISelectionRule(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISelectionRule *) ((SimpleSelectionRule *) x));
}
-static void *_p_RectangularPixelTo_p_IPixel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IPixel *) ((RectangularPixel *) x));
-}
-static void *_p_SphericalPixelTo_p_IPixel(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IPixel *) ((SphericalPixel *) x));
-}
static void *_p_ChiSquaredModuleTo_p_IChiSquaredModule(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IChiSquaredModule *) ((ChiSquaredModule *) x));
}
@@ -132120,6 +135168,12 @@ static void *_p_MisesGaussPeakShapeTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(
static void *_p_FormFactorWeightedTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *) ((FormFactorWeighted *) x));
}
+static void *_p_FormFactorSawtoothRippleGaussTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
+}
+static void *_p_FormFactorCosineRippleGaussTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
+}
static void *_p_LineTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IShape2D *) ((Line *) x));
}
@@ -132183,8 +135237,11 @@ static void *_p_FTDecayFunction1DTriangleTo_p_ICloneable(void *x, int *SWIGUNUSE
static void *_p_FTDistribution1DTriangleTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IFTDistribution1D *) ((FTDistribution1DTriangle *) x));
}
-static void *_p_ProfileBarTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileBar *) x));
+static void *_p_ISawtoothRippleTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ISawtoothRipple *) x));
+}
+static void *_p_IProfileRectangularRippleTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((IProfileRectangularRipple *) x));
}
static void *_p_ParameterPoolTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) ((ParameterPool *) x));
@@ -132195,9 +135252,6 @@ static void *_p_FootprintGaussTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newme
static void *_p_FormFactorDotTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorDot *) x));
}
-static void *_p_FormFactorRipple2GaussTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Gauss *) x));
-}
static void *_p_ResolutionFunction2DGaussianTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IResolutionFunction2D *) ((ResolutionFunction2DGaussian *) x));
}
@@ -132228,6 +135282,12 @@ static void *_p_FormFactorTruncatedSphereTo_p_ICloneable(void *x, int *SWIGUNUSE
static void *_p_FormFactorFullSphereTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorFullSphere *) x));
}
+static void *_p_ICosineRippleTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ICosineRipple *) x));
+}
+static void *_p_IProfileRippleTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((IProfileRipple *) x));
+}
static void *_p_IClusteredParticlesTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *) ((IClusteredParticles *) x));
}
@@ -132300,9 +135360,6 @@ static void *_p_FormFactorFullSpheroidTo_p_ICloneable(void *x, int *SWIGUNUSEDPA
static void *_p_ISpecularScanTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) ((ISpecularScan *) x));
}
-static void *_p_HexagonalLatticeTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (Lattice2D *) ((HexagonalLattice *) x));
-}
static void *_p_SquareLatticeTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (Lattice2D *) ((SquareLattice *) x));
}
@@ -132330,6 +135387,9 @@ static void *_p_InterferenceFunction1DLatticeTo_p_ICloneable(void *x, int *SWIGU
static void *_p_IShape2DTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) ((IShape2D *) x));
}
+static void *_p_HexagonalLatticeTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (Lattice2D *) ((HexagonalLattice *) x));
+}
static void *_p_FootprintSquareTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IFootprintFactor *) ((FootprintSquare *) x));
}
@@ -132387,42 +135447,33 @@ static void *_p_FormFactorBoxTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmem
static void *_p_FTDistribution1DGateTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IFTDistribution1D *) ((FTDistribution1DGate *) x));
}
-static void *_p_ProfileRipple1To_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileRipple1 *) x));
-}
static void *_p_FormFactorLongBoxGaussTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorLongBoxGauss *) x));
}
static void *_p_FormFactorPolygonalPrismTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorPolygonalPrism *) x));
}
-static void *_p_ProfileRipple2To_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileRipple2 *) x));
-}
static void *_p_FormFactorPrism3To_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(FormFactorPolygonalPrism *) ((FormFactorPrism3 *) x));
}
static void *_p_FormFactorHemiEllipsoidTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorHemiEllipsoid *) x));
}
-static void *_p_FormFactorRipple2LorentzTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Lorentz *) x));
-}
-static void *_p_FormFactorRipple1LorentzTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Lorentz *) x));
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
}
static void *_p_FormFactorLongBoxLorentzTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorLongBoxLorentz *) x));
}
+static void *_p_FormFactorCosineRippleLorentzTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
static void *_p_RangedDistributionLorentzTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (RangedDistribution *) ((RangedDistributionLorentz *) x));
}
static void *_p_DistributionLorentzTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IDistribution1D *) ((DistributionLorentz *) x));
}
-static void *_p_FormFactorRipple1BoxTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Box *) x));
-}
static void *_p_FormFactorPrism6To_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(FormFactorPolygonalPrism *) ((FormFactorPrism6 *) x));
}
@@ -132432,18 +135483,12 @@ static void *_p_FTDistribution2DConeTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM
static void *_p_IDetector2DTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IDetector *) ((IDetector2D *) x));
}
-static void *_p_FormFactorRipple2BoxTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Box *) x));
-}
static void *_p_IFootprintFactorTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) ((IFootprintFactor *) x));
}
static void *_p_ISampleTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) ((ISample *) x));
}
-static void *_p_FormFactorRipple1GaussTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Gauss *) x));
-}
static void *_p_IResolutionFunction2DTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) ((IResolutionFunction2D *) x));
}
@@ -132465,6 +135510,12 @@ static void *_p_FormFactorSphereLogNormalRadiusTo_p_ICloneable(void *x, int *SWI
static void *_p_FormFactorSphereGaussianRadiusTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorSphereGaussianRadius *) x));
}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
+}
+static void *_p_FormFactorCosineRippleBoxTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ICloneable *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleBox *) x));
+}
static void *_p_AngularSpecScanTo_p_ISpecularScan(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISpecularScan *) ((AngularSpecScan *) x));
}
@@ -132579,9 +135630,6 @@ static void *_p_IsGISAXSDetectorTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM
static void *_p_RectangularDetectorTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(IDetector *)(IDetector2D *) ((RectangularDetector *) x));
}
-static void *_p_FormFactorRipple2BoxTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Box *) x));
-}
static void *_p_MisesGaussPeakShapeTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IPeakShape *) ((MisesGaussPeakShape *) x));
}
@@ -132648,8 +135696,11 @@ static void *_p_FTDistribution2DConeTo_p_IParameterized(void *x, int *SWIGUNUSED
static void *_p_ParticleCoreShellTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IAbstractParticle *)(IParticle *) ((ParticleCoreShell *) x));
}
-static void *_p_ProfileBarTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileBar *) x));
+static void *_p_IProfileRectangularRippleTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((IProfileRectangularRipple *) x));
+}
+static void *_p_ISawtoothRippleTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ISawtoothRipple *) x));
}
static void *_p_FormFactorFullSphereTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorFullSphere *) x));
@@ -132681,9 +135732,6 @@ static void *_p_FTDistribution2DGateTo_p_IParameterized(void *x, int *SWIGUNUSED
static void *_p_DistributionLogNormalTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(IDistribution1D *) ((DistributionLogNormal *) x));
}
-static void *_p_FormFactorRipple1BoxTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Box *) x));
-}
static void *_p_InstrumentTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *) ((Instrument *) x));
}
@@ -132729,9 +135777,6 @@ static void *_p_FormFactorTruncatedCubeTo_p_IParameterized(void *x, int *SWIGUNU
static void *_p_RotationZTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(IRotation *) ((RotationZ *) x));
}
-static void *_p_FormFactorRipple2GaussTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Gauss *) x));
-}
static void *_p_IFormFactorBornTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *) ((IFormFactorBorn *) x));
}
@@ -132771,18 +135816,18 @@ static void *_p_IFTDecayFunction1DTo_p_IParameterized(void *x, int *SWIGUNUSEDPA
static void *_p_FormFactorConeTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorCone *) x));
}
+static void *_p_FormFactorCosineRippleBoxTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleBox *) x));
+}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
+}
static void *_p_InterferenceFunctionTwinTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IInterferenceFunction *) ((InterferenceFunctionTwin *) x));
}
static void *_p_LayerTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *) ((Layer *) x));
}
-static void *_p_ProfileRipple1To_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileRipple1 *) x));
-}
-static void *_p_ProfileRipple2To_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileRipple2 *) x));
-}
static void *_p_FormFactorAnisoPyramidTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorAnisoPyramid *) x));
}
@@ -132825,6 +135870,12 @@ static void *_p_FTDistribution2DVoigtTo_p_IParameterized(void *x, int *SWIGUNUSE
static void *_p_FTDecayFunction2DVoigtTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(IFTDecayFunction2D *) ((FTDecayFunction2DVoigt *) x));
}
+static void *_p_FormFactorCosineRippleGaussTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
+}
+static void *_p_FormFactorSawtoothRippleGaussTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
+}
static void *_p_FTDistribution2DCauchyTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(IFTDistribution2D *) ((FTDistribution2DCauchy *) x));
}
@@ -132846,9 +135897,6 @@ static void *_p_FootprintSquareTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(
static void *_p_FormFactorCone6To_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorCone6 *) x));
}
-static void *_p_FormFactorRipple1GaussTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Gauss *) x));
-}
static void *_p_IFormFactorDecoratorTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *) ((IFormFactorDecorator *) x));
}
@@ -132873,6 +135921,12 @@ static void *_p_CrystalTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemor
static void *_p_MesoCrystalTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IAbstractParticle *)(IParticle *) ((MesoCrystal *) x));
}
+static void *_p_IProfileRippleTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *) ((IProfileRipple *) x));
+}
+static void *_p_ICosineRippleTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ICosineRipple *) x));
+}
static void *_p_IFTDistribution2DTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *) ((IFTDistribution2D *) x));
}
@@ -132915,14 +135969,14 @@ static void *_p_InterferenceFunction2DLatticeTo_p_IParameterized(void *x, int *S
static void *_p_InterferenceFunction1DLatticeTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IInterferenceFunction *) ((InterferenceFunction1DLattice *) x));
}
+static void *_p_FormFactorCosineRippleLorentzTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
static void *_p_FormFactorLongBoxLorentzTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorLongBoxLorentz *) x));
}
-static void *_p_FormFactorRipple1LorentzTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Lorentz *) x));
-}
-static void *_p_FormFactorRipple2LorentzTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Lorentz *) x));
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IParameterized *) (INode *)(ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
}
static void *_p_LatticeTo_p_IParameterized(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IParameterized *) (INode *) ((Lattice *) x));
@@ -132966,14 +136020,20 @@ static void *_p_FormFactorFullSpheroidTo_p_IFormFactor(void *x, int *SWIGUNUSEDP
static void *_p_FormFactorTruncatedSpheroidTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *) ((FormFactorTruncatedSpheroid *) x));
}
-static void *_p_FormFactorRipple1BoxTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Box *) x));
+static void *_p_IProfileRippleTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *) ((IProfileRipple *) x));
+}
+static void *_p_ICosineRippleTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *) ((ICosineRipple *) x));
}
static void *_p_FormFactorLongBoxGaussTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *) ((FormFactorLongBoxGauss *) x));
}
-static void *_p_ProfileRipple1To_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *) ((ProfileRipple1 *) x));
+static void *_p_FormFactorCosineRippleGaussTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
+}
+static void *_p_FormFactorSawtoothRippleGaussTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
}
static void *_p_FormFactorPolygonalSurfaceTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *) ((FormFactorPolygonalSurface *) x));
@@ -132981,9 +136041,6 @@ static void *_p_FormFactorPolygonalSurfaceTo_p_IFormFactor(void *x, int *SWIGUNU
static void *_p_FormFactorCrystalTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) ((FormFactorCrystal *) x));
}
-static void *_p_ProfileRipple2To_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *) ((ProfileRipple2 *) x));
-}
static void *_p_FormFactorCantellatedCubeTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorCantellatedCube *) x));
}
@@ -132996,9 +136053,6 @@ static void *_p_FormFactorTruncatedCubeTo_p_IFormFactor(void *x, int *SWIGUNUSED
static void *_p_FormFactorTruncatedSphereTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *) ((FormFactorTruncatedSphere *) x));
}
-static void *_p_FormFactorRipple1GaussTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Gauss *) x));
-}
static void *_p_FormFactorEllipsoidalCylinderTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *) ((FormFactorEllipsoidalCylinder *) x));
}
@@ -133050,23 +136104,29 @@ static void *_p_FormFactorGaussSphereTo_p_IFormFactor(void *x, int *SWIGUNUSEDPA
static void *_p_FormFactorDotTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *) ((FormFactorDot *) x));
}
-static void *_p_FormFactorRipple2BoxTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Box *) x));
+static void *_p_IProfileRectangularRippleTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *) ((IProfileRectangularRipple *) x));
}
-static void *_p_FormFactorRipple1LorentzTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Lorentz *) x));
+static void *_p_ISawtoothRippleTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *) ((ISawtoothRipple *) x));
}
static void *_p_FormFactorLongBoxLorentzTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *) ((FormFactorLongBoxLorentz *) x));
}
+static void *_p_FormFactorCosineRippleLorentzTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
static void *_p_FormFactorWeightedTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) ((FormFactorWeighted *) x));
}
-static void *_p_FormFactorRipple2LorentzTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Lorentz *) x));
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
}
-static void *_p_ProfileBarTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *) ((ProfileBar *) x));
+static void *_p_FormFactorCosineRippleBoxTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleBox *) x));
+}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((IFormFactor *) (IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
}
static void *_p_FormFactorPyramidTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorPyramid *) x));
@@ -133077,9 +136137,6 @@ static void *_p_FormFactorAnisoPyramidTo_p_IFormFactor(void *x, int *SWIGUNUSEDP
static void *_p_FormFactorPrism3To_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFormFactor *) (IFormFactorBorn *)(FormFactorPolygonalPrism *) ((FormFactorPrism3 *) x));
}
-static void *_p_FormFactorRipple2GaussTo_p_IFormFactor(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((IFormFactor *) (IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Gauss *) x));
-}
static void *_p_SampleBuilderFactoryTo_p_IFactoryT_std__string_IMultiLayerBuilder_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFactory< std::string,IMultiLayerBuilder > *) ((SampleBuilderFactory *) x));
}
@@ -133110,9 +136167,6 @@ static void *_p_ILayoutTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
static void *_p_FormFactorHemiEllipsoidTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorHemiEllipsoid *) x));
}
-static void *_p_FormFactorRipple2BoxTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Box *) x));
-}
static void *_p_IPeakShapeTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) ((IPeakShape *) x));
}
@@ -133158,8 +136212,11 @@ static void *_p_FormFactorPrism6To_p_ISample(void *x, int *SWIGUNUSEDPARM(newmem
static void *_p_ParticleCoreShellTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IAbstractParticle *)(IParticle *) ((ParticleCoreShell *) x));
}
-static void *_p_ProfileBarTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((ProfileBar *) x));
+static void *_p_ISawtoothRippleTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ISawtoothRipple *) x));
+}
+static void *_p_IProfileRectangularRippleTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((IProfileRectangularRipple *) x));
}
static void *_p_FormFactorTruncatedSphereTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorTruncatedSphere *) x));
@@ -133182,24 +136239,18 @@ static void *_p_FormFactorPolygonalPrismTo_p_ISample(void *x, int *SWIGUNUSEDPAR
static void *_p_InterferenceFunctionHardDiskTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IInterferenceFunction *) ((InterferenceFunctionHardDisk *) x));
}
-static void *_p_FormFactorRipple1BoxTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Box *) x));
+static void *_p_FormFactorFullSpheroidTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorFullSpheroid *) x));
}
static void *_p_FormFactorTruncatedSpheroidTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorTruncatedSpheroid *) x));
}
-static void *_p_FormFactorFullSpheroidTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorFullSpheroid *) x));
-}
static void *_p_FormFactorTruncatedCubeTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorTruncatedCube *) x));
}
static void *_p_FormFactorCantellatedCubeTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorCantellatedCube *) x));
}
-static void *_p_FormFactorRipple2GaussTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Gauss *) x));
-}
static void *_p_IFormFactorBornTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *) ((IFormFactorBorn *) x));
}
@@ -133215,6 +136266,12 @@ static void *_p_IParticleTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
static void *_p_IAbstractParticleTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) ((IAbstractParticle *) x));
}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
+}
+static void *_p_FormFactorCosineRippleBoxTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleBox *) x));
+}
static void *_p_FormFactorConeTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorCone *) x));
}
@@ -133224,18 +136281,12 @@ static void *_p_InterferenceFunctionTwinTo_p_ISample(void *x, int *SWIGUNUSEDPAR
static void *_p_LayerTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) ((Layer *) x));
}
-static void *_p_ProfileRipple1To_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((ProfileRipple1 *) x));
-}
static void *_p_FormFactorPyramidTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorPyramid *) x));
}
static void *_p_FormFactorAnisoPyramidTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorAnisoPyramid *) x));
}
-static void *_p_ProfileRipple2To_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((ProfileRipple2 *) x));
-}
static void *_p_FormFactorEllipsoidalCylinderTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorEllipsoidalCylinder *) x));
}
@@ -133245,15 +136296,18 @@ static void *_p_FormFactorCylinderTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newm
static void *_p_ParticleCompositionTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IAbstractParticle *)(IParticle *) ((ParticleComposition *) x));
}
+static void *_p_FormFactorSawtoothRippleGaussTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
+}
+static void *_p_FormFactorCosineRippleGaussTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
+}
static void *_p_IInterferenceFunctionTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) ((IInterferenceFunction *) x));
}
static void *_p_FormFactorCone6To_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorCone6 *) x));
}
-static void *_p_FormFactorRipple1GaussTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Gauss *) x));
-}
static void *_p_IFormFactorDecoratorTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *) ((IFormFactorDecorator *) x));
}
@@ -133278,6 +136332,12 @@ static void *_p_InterferenceFunction2DParaCrystalTo_p_ISample(void *x, int *SWIG
static void *_p_InterferenceFunctionRadialParaCrystalTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IInterferenceFunction *) ((InterferenceFunctionRadialParaCrystal *) x));
}
+static void *_p_ICosineRippleTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ICosineRipple *) x));
+}
+static void *_p_IProfileRippleTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((IProfileRipple *) x));
+}
static void *_p_FormFactorHollowSphereTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorHollowSphere *) x));
}
@@ -133287,15 +136347,15 @@ static void *_p_FormFactorGaussSphereTo_p_ISample(void *x, int *SWIGUNUSEDPARM(n
static void *_p_FormFactorWeightedTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *) ((FormFactorWeighted *) x));
}
-static void *_p_FormFactorRipple2LorentzTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Lorentz *) x));
-}
-static void *_p_FormFactorRipple1LorentzTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Lorentz *) x));
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
}
static void *_p_FormFactorLongBoxLorentzTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *) ((FormFactorLongBoxLorentz *) x));
}
+static void *_p_FormFactorCosineRippleLorentzTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((ISample *) (IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
static void *_p_InterferenceFunction1DLatticeTo_p_ISample(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ISample *) (IInterferenceFunction *) ((InterferenceFunction1DLattice *) x));
}
@@ -133371,9 +136431,6 @@ static void *_p_IsGISAXSDetectorTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemor
static void *_p_RectangularDetectorTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (IDetector *)(IDetector2D *) ((RectangularDetector *) x));
}
-static void *_p_FormFactorRipple2BoxTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Box *) x));
-}
static void *_p_MisesGaussPeakShapeTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IPeakShape *) ((MisesGaussPeakShape *) x));
}
@@ -133440,8 +136497,11 @@ static void *_p_FTDistribution2DConeTo_p_INode(void *x, int *SWIGUNUSEDPARM(newm
static void *_p_ParticleCoreShellTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IAbstractParticle *)(IParticle *) ((ParticleCoreShell *) x));
}
-static void *_p_ProfileBarTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileBar *) x));
+static void *_p_IProfileRectangularRippleTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((IProfileRectangularRipple *) x));
+}
+static void *_p_ISawtoothRippleTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ISawtoothRipple *) x));
}
static void *_p_FormFactorFullSphereTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorFullSphere *) x));
@@ -133473,9 +136533,6 @@ static void *_p_FTDistribution2DGateTo_p_INode(void *x, int *SWIGUNUSEDPARM(newm
static void *_p_DistributionLogNormalTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (IDistribution1D *) ((DistributionLogNormal *) x));
}
-static void *_p_FormFactorRipple1BoxTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Box *) x));
-}
static void *_p_InstrumentTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) ((Instrument *) x));
}
@@ -133521,9 +136578,6 @@ static void *_p_FormFactorTruncatedCubeTo_p_INode(void *x, int *SWIGUNUSEDPARM(n
static void *_p_RotationZTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (IRotation *) ((RotationZ *) x));
}
-static void *_p_FormFactorRipple2GaussTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Gauss *) x));
-}
static void *_p_IFormFactorBornTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IFormFactor *) ((IFormFactorBorn *) x));
}
@@ -133560,18 +136614,18 @@ static void *_p_IFTDecayFunction1DTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmem
static void *_p_FormFactorConeTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorCone *) x));
}
+static void *_p_FormFactorCosineRippleBoxTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleBox *) x));
+}
+static void *_p_FormFactorSawtoothRippleBoxTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleBox *) x));
+}
static void *_p_InterferenceFunctionTwinTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IInterferenceFunction *) ((InterferenceFunctionTwin *) x));
}
static void *_p_LayerTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *) ((Layer *) x));
}
-static void *_p_ProfileRipple1To_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileRipple1 *) x));
-}
-static void *_p_ProfileRipple2To_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((ProfileRipple2 *) x));
-}
static void *_p_FormFactorAnisoPyramidTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorAnisoPyramid *) x));
}
@@ -133614,6 +136668,12 @@ static void *_p_FTDistribution2DVoigtTo_p_INode(void *x, int *SWIGUNUSEDPARM(new
static void *_p_FTDecayFunction2DVoigtTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (IFTDecayFunction2D *) ((FTDecayFunction2DVoigt *) x));
}
+static void *_p_FormFactorCosineRippleGaussTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleGauss *) x));
+}
+static void *_p_FormFactorSawtoothRippleGaussTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleGauss *) x));
+}
static void *_p_FTDistribution2DCauchyTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (IFTDistribution2D *) ((FTDistribution2DCauchy *) x));
}
@@ -133635,9 +136695,6 @@ static void *_p_FootprintSquareTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory
static void *_p_FormFactorCone6To_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(FormFactorPolyhedron *) ((FormFactorCone6 *) x));
}
-static void *_p_FormFactorRipple1GaussTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Gauss *) x));
-}
static void *_p_IFormFactorDecoratorTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IFormFactor *) ((IFormFactorDecorator *) x));
}
@@ -133662,6 +136719,12 @@ static void *_p_CrystalTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
static void *_p_MesoCrystalTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IAbstractParticle *)(IParticle *) ((MesoCrystal *) x));
}
+static void *_p_IProfileRippleTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((IProfileRipple *) x));
+}
+static void *_p_ICosineRippleTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *) ((ICosineRipple *) x));
+}
static void *_p_IFTDistribution2DTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) ((IFTDistribution2D *) x));
}
@@ -133704,14 +136767,14 @@ static void *_p_InterferenceFunction2DLatticeTo_p_INode(void *x, int *SWIGUNUSED
static void *_p_InterferenceFunction1DLatticeTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IInterferenceFunction *) ((InterferenceFunction1DLattice *) x));
}
+static void *_p_FormFactorCosineRippleLorentzTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
+}
static void *_p_FormFactorLongBoxLorentzTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *) ((FormFactorLongBoxLorentz *) x));
}
-static void *_p_FormFactorRipple1LorentzTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple1 *) ((FormFactorRipple1Lorentz *) x));
-}
-static void *_p_FormFactorRipple2LorentzTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(ProfileRipple2 *) ((FormFactorRipple2Lorentz *) x));
+static void *_p_FormFactorSawtoothRippleLorentzTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+ return (void *)((INode *) (ISample *)(IFormFactor *)(IFormFactorBorn *)(IProfileRipple *)(ISawtoothRipple *) ((FormFactorSawtoothRippleLorentz *) x));
}
static void *_p_LatticeTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) ((Lattice *) x));
@@ -133976,6 +137039,9 @@ static swig_type_info _swigt__p_FormFactorCantellatedCube = {"_p_FormFactorCante
static swig_type_info _swigt__p_FormFactorCone = {"_p_FormFactorCone", "FormFactorCone *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorCone6 = {"_p_FormFactorCone6", "FormFactorCone6 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorCoreShell = {"_p_FormFactorCoreShell", "FormFactorCoreShell *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FormFactorCosineRippleBox = {"_p_FormFactorCosineRippleBox", "FormFactorCosineRippleBox *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FormFactorCosineRippleGauss = {"_p_FormFactorCosineRippleGauss", "FormFactorCosineRippleGauss *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FormFactorCosineRippleLorentz = {"_p_FormFactorCosineRippleLorentz", "FormFactorCosineRippleLorentz *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorCrystal = {"_p_FormFactorCrystal", "FormFactorCrystal *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorCuboctahedron = {"_p_FormFactorCuboctahedron", "FormFactorCuboctahedron *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorCylinder = {"_p_FormFactorCylinder", "FormFactorCylinder *", 0, 0, (void*)0, 0};
@@ -134001,12 +137067,9 @@ static swig_type_info _swigt__p_FormFactorPolyhedron = {"_p_FormFactorPolyhedron
static swig_type_info _swigt__p_FormFactorPrism3 = {"_p_FormFactorPrism3", "FormFactorPrism3 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorPrism6 = {"_p_FormFactorPrism6", "FormFactorPrism6 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorPyramid = {"_p_FormFactorPyramid", "FormFactorPyramid *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_FormFactorRipple1Box = {"_p_FormFactorRipple1Box", "FormFactorRipple1Box *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_FormFactorRipple1Gauss = {"_p_FormFactorRipple1Gauss", "FormFactorRipple1Gauss *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_FormFactorRipple1Lorentz = {"_p_FormFactorRipple1Lorentz", "FormFactorRipple1Lorentz *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_FormFactorRipple2Box = {"_p_FormFactorRipple2Box", "FormFactorRipple2Box *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_FormFactorRipple2Gauss = {"_p_FormFactorRipple2Gauss", "FormFactorRipple2Gauss *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_FormFactorRipple2Lorentz = {"_p_FormFactorRipple2Lorentz", "FormFactorRipple2Lorentz *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FormFactorSawtoothRippleBox = {"_p_FormFactorSawtoothRippleBox", "FormFactorSawtoothRippleBox *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FormFactorSawtoothRippleGauss = {"_p_FormFactorSawtoothRippleGauss", "FormFactorSawtoothRippleGauss *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FormFactorSawtoothRippleLorentz = {"_p_FormFactorSawtoothRippleLorentz", "FormFactorSawtoothRippleLorentz *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorSphereGaussianRadius = {"_p_FormFactorSphereGaussianRadius", "FormFactorSphereGaussianRadius *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorSphereLogNormalRadius = {"_p_FormFactorSphereLogNormalRadius", "FormFactorSphereLogNormalRadius *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_FormFactorTetrahedron = {"_p_FormFactorTetrahedron", "FormFactorTetrahedron *", 0, 0, (void*)0, 0};
@@ -134026,6 +137089,7 @@ static swig_type_info _swigt__p_IBackground = {"_p_IBackground", "IBackground *"
static swig_type_info _swigt__p_IChiSquaredModule = {"_p_IChiSquaredModule", "IChiSquaredModule *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ICloneable = {"_p_ICloneable", "ICloneable *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IClusteredParticles = {"_p_IClusteredParticles", "IClusteredParticles *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ICosineRipple = {"_p_ICosineRipple", "ICosineRipple *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IDetector = {"_p_IDetector", "IDetector *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IDetector2D = {"_p_IDetector2D", "IDetector2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IDetectorResolution = {"_p_IDetectorResolution", "IDetectorResolution *", 0, 0, (void*)0, 0};
@@ -134055,9 +137119,12 @@ static swig_type_info _swigt__p_IParameterized = {"_p_IParameterized", "IParamet
static swig_type_info _swigt__p_IParticle = {"_p_IParticle", "IParticle *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IPeakShape = {"_p_IPeakShape", "IPeakShape *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IPixel = {"_p_IPixel", "IPixel *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_IProfileRectangularRipple = {"_p_IProfileRectangularRipple", "IProfileRectangularRipple *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_IProfileRipple = {"_p_IProfileRipple", "IProfileRipple *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IResolutionFunction2D = {"_p_IResolutionFunction2D", "IResolutionFunction2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IRotation = {"_p_IRotation", "IRotation *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ISample = {"_p_ISample", "ISample *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ISawtoothRipple = {"_p_ISawtoothRipple", "ISawtoothRipple *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ISelectionRule = {"_p_ISelectionRule", "ISelectionRule *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IShape2D = {"_p_IShape2D", "IShape2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ISpecularScan = {"_p_ISpecularScan", "ISpecularScan *", 0, 0, (void*)0, 0};
@@ -134122,9 +137189,6 @@ static swig_type_info _swigt__p_PolygonalTopology = {"_p_PolygonalTopology", "Po
static swig_type_info _swigt__p_PolyhedralEdge = {"_p_PolyhedralEdge", "PolyhedralEdge *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_PolyhedralFace = {"_p_PolyhedralFace", "PolyhedralFace *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_PolyhedralTopology = {"_p_PolyhedralTopology", "PolyhedralTopology *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ProfileBar = {"_p_ProfileBar", "ProfileBar *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ProfileRipple1 = {"_p_ProfileRipple1", "ProfileRipple1 *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ProfileRipple2 = {"_p_ProfileRipple2", "ProfileRipple2 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ProgressHandler__Callback_t = {"_p_ProgressHandler__Callback_t", "ProgressHandler::Callback_t *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_PyBuilderCallback = {"_p_PyBuilderCallback", "PyBuilderCallback *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_PyObserverCallback = {"_p_PyObserverCallback", "PyObserverCallback *", 0, 0, (void*)0, 0};
@@ -134162,7 +137226,6 @@ static swig_type_info _swigt__p_SlicingEffects = {"_p_SlicingEffects", "SlicingE
static swig_type_info _swigt__p_SpecularDetector1D = {"_p_SpecularDetector1D", "SpecularDetector1D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_SpecularSimulation = {"_p_SpecularSimulation", "SpecularSimulation *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_SphericalDetector = {"_p_SphericalDetector", "SphericalDetector *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_SphericalPixel = {"_p_SphericalPixel", "SphericalPixel *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_SquareLattice = {"_p_SquareLattice", "SquareLattice *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ThreadInfo = {"_p_ThreadInfo", "ThreadInfo *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_Transform3D = {"_p_Transform3D", "Transform3D *", 0, 0, (void*)0, 0};
@@ -134317,6 +137380,9 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_FormFactorCone,
&_swigt__p_FormFactorCone6,
&_swigt__p_FormFactorCoreShell,
+ &_swigt__p_FormFactorCosineRippleBox,
+ &_swigt__p_FormFactorCosineRippleGauss,
+ &_swigt__p_FormFactorCosineRippleLorentz,
&_swigt__p_FormFactorCrystal,
&_swigt__p_FormFactorCuboctahedron,
&_swigt__p_FormFactorCylinder,
@@ -134342,12 +137408,9 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_FormFactorPrism3,
&_swigt__p_FormFactorPrism6,
&_swigt__p_FormFactorPyramid,
- &_swigt__p_FormFactorRipple1Box,
- &_swigt__p_FormFactorRipple1Gauss,
- &_swigt__p_FormFactorRipple1Lorentz,
- &_swigt__p_FormFactorRipple2Box,
- &_swigt__p_FormFactorRipple2Gauss,
- &_swigt__p_FormFactorRipple2Lorentz,
+ &_swigt__p_FormFactorSawtoothRippleBox,
+ &_swigt__p_FormFactorSawtoothRippleGauss,
+ &_swigt__p_FormFactorSawtoothRippleLorentz,
&_swigt__p_FormFactorSphereGaussianRadius,
&_swigt__p_FormFactorSphereLogNormalRadius,
&_swigt__p_FormFactorTetrahedron,
@@ -134367,6 +137430,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_IChiSquaredModule,
&_swigt__p_ICloneable,
&_swigt__p_IClusteredParticles,
+ &_swigt__p_ICosineRipple,
&_swigt__p_IDetector,
&_swigt__p_IDetector2D,
&_swigt__p_IDetectorResolution,
@@ -134396,9 +137460,12 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_IParticle,
&_swigt__p_IPeakShape,
&_swigt__p_IPixel,
+ &_swigt__p_IProfileRectangularRipple,
+ &_swigt__p_IProfileRipple,
&_swigt__p_IResolutionFunction2D,
&_swigt__p_IRotation,
&_swigt__p_ISample,
+ &_swigt__p_ISawtoothRipple,
&_swigt__p_ISelectionRule,
&_swigt__p_IShape2D,
&_swigt__p_ISpecularScan,
@@ -134463,9 +137530,6 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_PolyhedralEdge,
&_swigt__p_PolyhedralFace,
&_swigt__p_PolyhedralTopology,
- &_swigt__p_ProfileBar,
- &_swigt__p_ProfileRipple1,
- &_swigt__p_ProfileRipple2,
&_swigt__p_ProgressHandler__Callback_t,
&_swigt__p_PyBuilderCallback,
&_swigt__p_PyObserverCallback,
@@ -134503,7 +137567,6 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_SpecularDetector1D,
&_swigt__p_SpecularSimulation,
&_swigt__p_SphericalDetector,
- &_swigt__p_SphericalPixel,
&_swigt__p_SquareLattice,
&_swigt__p_ThreadInfo,
&_swigt__p_Transform3D,
@@ -134658,6 +137721,9 @@ static swig_cast_info _swigc__p_FormFactorCantellatedCube[] = { {&_swigt__p_For
static swig_cast_info _swigc__p_FormFactorCone[] = { {&_swigt__p_FormFactorCone, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorCone6[] = { {&_swigt__p_FormFactorCone6, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorCoreShell[] = { {&_swigt__p_FormFactorCoreShell, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FormFactorCosineRippleBox[] = { {&_swigt__p_FormFactorCosineRippleBox, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FormFactorCosineRippleGauss[] = { {&_swigt__p_FormFactorCosineRippleGauss, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FormFactorCosineRippleLorentz[] = { {&_swigt__p_FormFactorCosineRippleLorentz, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorCrystal[] = { {&_swigt__p_FormFactorCrystal, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorCuboctahedron[] = { {&_swigt__p_FormFactorCuboctahedron, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorCylinder[] = { {&_swigt__p_FormFactorCylinder, 0, 0, 0},{0, 0, 0, 0}};
@@ -134683,12 +137749,9 @@ static swig_cast_info _swigc__p_FormFactorPolyhedron[] = { {&_swigt__p_FormFact
static swig_cast_info _swigc__p_FormFactorPrism3[] = { {&_swigt__p_FormFactorPrism3, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorPrism6[] = { {&_swigt__p_FormFactorPrism6, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorPyramid[] = { {&_swigt__p_FormFactorPyramid, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FormFactorRipple1Box[] = { {&_swigt__p_FormFactorRipple1Box, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FormFactorRipple1Gauss[] = { {&_swigt__p_FormFactorRipple1Gauss, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FormFactorRipple1Lorentz[] = { {&_swigt__p_FormFactorRipple1Lorentz, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FormFactorRipple2Box[] = { {&_swigt__p_FormFactorRipple2Box, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FormFactorRipple2Gauss[] = { {&_swigt__p_FormFactorRipple2Gauss, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FormFactorRipple2Lorentz[] = { {&_swigt__p_FormFactorRipple2Lorentz, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FormFactorSawtoothRippleBox[] = { {&_swigt__p_FormFactorSawtoothRippleBox, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FormFactorSawtoothRippleGauss[] = { {&_swigt__p_FormFactorSawtoothRippleGauss, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FormFactorSawtoothRippleLorentz[] = { {&_swigt__p_FormFactorSawtoothRippleLorentz, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorSphereGaussianRadius[] = { {&_swigt__p_FormFactorSphereGaussianRadius, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorSphereLogNormalRadius[] = { {&_swigt__p_FormFactorSphereLogNormalRadius, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_FormFactorTetrahedron[] = { {&_swigt__p_FormFactorTetrahedron, 0, 0, 0},{0, 0, 0, 0}};
@@ -134706,8 +137769,9 @@ static swig_cast_info _swigc__p_IAbstractParticle[] = { {&_swigt__p_ParticleCom
static swig_cast_info _swigc__p_IAxis[] = { {&_swigt__p_IAxis, 0, 0, 0}, {&_swigt__p_VariableBinAxis, _p_VariableBinAxisTo_p_IAxis, 0, 0}, {&_swigt__p_ConstKBinAxis, _p_ConstKBinAxisTo_p_IAxis, 0, 0}, {&_swigt__p_CustomBinAxis, _p_CustomBinAxisTo_p_IAxis, 0, 0}, {&_swigt__p_FixedBinAxis, _p_FixedBinAxisTo_p_IAxis, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IBackground[] = { {&_swigt__p_IBackground, 0, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_IBackground, 0, 0}, {&_swigt__p_PoissonNoiseBackground, _p_PoissonNoiseBackgroundTo_p_IBackground, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IChiSquaredModule[] = { {&_swigt__p_IChiSquaredModule, 0, 0, 0}, {&_swigt__p_ChiSquaredModule, _p_ChiSquaredModuleTo_p_IChiSquaredModule, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ICloneable[] = { {&_swigt__p_Line, _p_LineTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionTrapezoid, _p_DistributionTrapezoidTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_ICloneable, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction2DVoigt, _p_FTDecayFunction2DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DVoigt, _p_FTDistribution2DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationEuler, _p_RotationEulerTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionGate, _p_RangedDistributionGateTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionGate, _p_DistributionGateTo_p_ICloneable, 0, 0}, {&_swigt__p_IdentityRotation, _p_IdentityRotationTo_p_ICloneable, 0, 0}, {&_swigt__p_IRotation, _p_IRotationTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_ICloneable, 0, 0}, {&_swigt__p_IUnitConverter, _p_IUnitConverterTo_p_ICloneable, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_ICloneable, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationX, _p_RotationXTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationY, _p_RotationYTo_p_ICloneable, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationZ, _p_RotationZTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DCauchy, _p_FTDistribution2DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DCauchy, _p_FTDistribution1DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction2DCauchy, _p_FTDecayFunction2DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DCauchy, _p_FTDecayFunction1DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DVoigt, _p_FTDistribution1DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DVoigt, _p_FTDecayFunction1DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_IChiSquaredModule, _p_IChiSquaredModuleTo_p_ICloneable, 0, 0}, {&_swigt__p_ChiSquaredModule, _p_ChiSquaredModuleTo_p_ICloneable, 0, 0}, {&_swigt__p_Lattice2D, _p_Lattice2DTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_ICloneable, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_ICloneable, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_ICloneable, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DGate, _p_FTDistribution2DGateTo_p_ICloneable, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistribution, _p_RangedDistributionTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DTriangle, _p_FTDistribution1DTriangleTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DTriangle, _p_FTDecayFunction1DTriangleTo_p_ICloneable, 0, 0}, {&_swigt__p_ProfileBar, _p_ProfileBarTo_p_ICloneable, 0, 0}, {&_swigt__p_ParameterPool, _p_ParameterPoolTo_p_ICloneable, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_ICloneable, 0, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorRipple2Gauss, _p_FormFactorRipple2GaussTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionGaussian, _p_DistributionGaussianTo_p_ICloneable, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionGaussian, _p_RangedDistributionGaussianTo_p_ICloneable, 0, 0}, {&_swigt__p_PoissonNoiseBackground, _p_PoissonNoiseBackgroundTo_p_ICloneable, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_ICloneable, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_ICloneable, 0, 0}, {&_swigt__p_ScanResolution, _p_ScanResolutionTo_p_ICloneable, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionCosine, _p_DistributionCosineTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DCosine, _p_FTDistribution1DCosineTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionCosine, _p_RangedDistributionCosineTo_p_ICloneable, 0, 0}, {&_swigt__p_Polygon, _p_PolygonTo_p_ICloneable, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_ICloneable, 0, 0}, {&_swigt__p_QSpecScan, _p_QSpecScanTo_p_ICloneable, 0, 0}, {&_swigt__p_AngularSpecScan, _p_AngularSpecScanTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_VerticalLine, _p_VerticalLineTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction2DGauss, _p_FTDecayFunction2DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DGauss, _p_FTDistribution2DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_ICloneable, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_ICloneable, 0, 0}, {&_swigt__p_ISpecularScan, _p_ISpecularScanTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_HexagonalLattice, _p_HexagonalLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_SquareLattice, _p_SquareLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_BasicLattice, _p_BasicLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_IShape2D, _p_IShape2DTo_p_ICloneable, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_ICloneable, 0, 0}, {&_swigt__p_Rectangle, _p_RectangleTo_p_ICloneable, 0, 0}, {&_swigt__p_HorizontalLine, _p_HorizontalLineTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DGauss, _p_FTDecayFunction1DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DGauss, _p_FTDistribution1DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_ICloneable, 0, 0}, {&_swigt__p_IDistribution1D, _p_IDistribution1DTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDecayFunction1D, _p_IFTDecayFunction1DTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDistribution1D, _p_IFTDistribution1DTo_p_ICloneable, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_OffSpecSimulation, _p_OffSpecSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_GISASSimulation, _p_GISASSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_Simulation, _p_SimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionLogNormal, _p_DistributionLogNormalTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionLogNormal, _p_RangedDistributionLogNormalTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DGate, _p_FTDistribution1DGateTo_p_ICloneable, 0, 0}, {&_swigt__p_ProfileRipple1, _p_ProfileRipple1To_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_ProfileRipple2, _p_ProfileRipple2To_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionLorentz, _p_DistributionLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionLorentz, _p_RangedDistributionLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorRipple1Lorentz, _p_FormFactorRipple1LorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorRipple2Lorentz, _p_FormFactorRipple2LorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorRipple1Box, _p_FormFactorRipple1BoxTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DCone, _p_FTDistribution2DConeTo_p_ICloneable, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorRipple2Box, _p_FormFactorRipple2BoxTo_p_ICloneable, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_ICloneable, 0, 0}, {&_swigt__p_ISample, _p_ISampleTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorRipple1Gauss, _p_FormFactorRipple1GaussTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDecayFunction2D, _p_IFTDecayFunction2DTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDistribution2D, _p_IFTDistribution2DTo_p_ICloneable, 0, 0}, {&_swigt__p_Simulation2D, _p_Simulation2DTo_p_ICloneable, 0, 0}, {&_swigt__p_Ellipse, _p_EllipseTo_p_ICloneable, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_ICloneable, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_ICloneable, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ICloneable[] = { {&_swigt__p_Line, _p_LineTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionTrapezoid, _p_DistributionTrapezoidTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_ICloneable, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction2DVoigt, _p_FTDecayFunction2DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DVoigt, _p_FTDistribution2DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationEuler, _p_RotationEulerTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionGate, _p_RangedDistributionGateTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionGate, _p_DistributionGateTo_p_ICloneable, 0, 0}, {&_swigt__p_IdentityRotation, _p_IdentityRotationTo_p_ICloneable, 0, 0}, {&_swigt__p_IRotation, _p_IRotationTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_ICloneable, 0, 0}, {&_swigt__p_IUnitConverter, _p_IUnitConverterTo_p_ICloneable, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_ICloneable, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationX, _p_RotationXTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationY, _p_RotationYTo_p_ICloneable, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_ICloneable, 0, 0}, {&_swigt__p_RotationZ, _p_RotationZTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DCauchy, _p_FTDistribution2DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DCauchy, _p_FTDistribution1DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction2DCauchy, _p_FTDecayFunction2DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DCauchy, _p_FTDecayFunction1DCauchyTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_ICloneable, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DVoigt, _p_FTDistribution1DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DVoigt, _p_FTDecayFunction1DVoigtTo_p_ICloneable, 0, 0}, {&_swigt__p_IChiSquaredModule, _p_IChiSquaredModuleTo_p_ICloneable, 0, 0}, {&_swigt__p_ChiSquaredModule, _p_ChiSquaredModuleTo_p_ICloneable, 0, 0}, {&_swigt__p_Lattice2D, _p_Lattice2DTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_ICloneable, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_ICloneable, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_ICloneable, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DGate, _p_FTDistribution2DGateTo_p_ICloneable, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistribution, _p_RangedDistributionTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DTriangle, _p_FTDistribution1DTriangleTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DTriangle, _p_FTDecayFunction1DTriangleTo_p_ICloneable, 0, 0}, {&_swigt__p_ISawtoothRipple, _p_ISawtoothRippleTo_p_ICloneable, 0, 0}, {&_swigt__p_IProfileRectangularRipple, _p_IProfileRectangularRippleTo_p_ICloneable, 0, 0}, {&_swigt__p_ParameterPool, _p_ParameterPoolTo_p_ICloneable, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_ICloneable, 0, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_ICloneable, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionGaussian, _p_DistributionGaussianTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionGaussian, _p_RangedDistributionGaussianTo_p_ICloneable, 0, 0}, {&_swigt__p_PoissonNoiseBackground, _p_PoissonNoiseBackgroundTo_p_ICloneable, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_ICloneable, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_ICloneable, 0, 0}, {&_swigt__p_ScanResolution, _p_ScanResolutionTo_p_ICloneable, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_IProfileRipple, _p_IProfileRippleTo_p_ICloneable, 0, 0}, {&_swigt__p_ICosineRipple, _p_ICosineRippleTo_p_ICloneable, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_ICloneable, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionCosine, _p_DistributionCosineTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DCosine, _p_FTDistribution1DCosineTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionCosine, _p_RangedDistributionCosineTo_p_ICloneable, 0, 0}, {&_swigt__p_Polygon, _p_PolygonTo_p_ICloneable, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_ICloneable, 0, 0}, {&_swigt__p_QSpecScan, _p_QSpecScanTo_p_ICloneable, 0, 0}, {&_swigt__p_AngularSpecScan, _p_AngularSpecScanTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_ICloneable, 0, 0}, {&_swigt__p_VerticalLine, _p_VerticalLineTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction2DGauss, _p_FTDecayFunction2DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DGauss, _p_FTDistribution2DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_ICloneable, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_ICloneable, 0, 0}, {&_swigt__p_ISpecularScan, _p_ISpecularScanTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_HexagonalLattice, _p_HexagonalLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_SquareLattice, _p_SquareLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_BasicLattice, _p_BasicLatticeTo_p_ICloneable, 0, 0}, {&_swigt__p_IShape2D, _p_IShape2DTo_p_ICloneable, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_ICloneable, 0, 0}, {&_swigt__p_Rectangle, _p_RectangleTo_p_ICloneable, 0, 0}, {&_swigt__p_HorizontalLine, _p_HorizontalLineTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDecayFunction1DGauss, _p_FTDecayFunction1DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DGauss, _p_FTDistribution1DGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_ICloneable, 0, 0}, {&_swigt__p_IDistribution1D, _p_IDistribution1DTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDecayFunction1D, _p_IFTDecayFunction1DTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDistribution1D, _p_IFTDistribution1DTo_p_ICloneable, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_OffSpecSimulation, _p_OffSpecSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_GISASSimulation, _p_GISASSimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_Simulation, _p_SimulationTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionLogNormal, _p_DistributionLogNormalTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionLogNormal, _p_RangedDistributionLogNormalTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution1DGate, _p_FTDistribution1DGateTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_ICloneable, 0, 0}, {&_swigt__p_DistributionLorentz, _p_DistributionLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_RangedDistributionLorentz, _p_RangedDistributionLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_ICloneable, 0, 0}, {&_swigt__p_FTDistribution2DCone, _p_FTDistribution2DConeTo_p_ICloneable, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_ICloneable, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_ICloneable, 0, 0}, {&_swigt__p_ISample, _p_ISampleTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDistribution2D, _p_IFTDistribution2DTo_p_ICloneable, 0, 0}, {&_swigt__p_Simulation2D, _p_Simulation2DTo_p_ICloneable, 0, 0}, {&_swigt__p_Ellipse, _p_EllipseTo_p_ICloneable, 0, 0}, {&_swigt__p_IFTDecayFunction2D, _p_IFTDecayFunction2DTo_p_ICloneable, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_ICloneable, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_ICloneable, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_ICloneable, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IClusteredParticles[] = { {&_swigt__p_IClusteredParticles, 0, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_IClusteredParticles, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ICosineRipple[] = { {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_ICosineRipple, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_ICosineRipple, 0, 0}, {&_swigt__p_ICosineRipple, 0, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_ICosineRipple, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IDetector[] = { {&_swigt__p_IDetector, 0, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_IDetector, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_IDetector, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_IDetector, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_IDetector, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IDetector2D[] = { {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_IDetector2D, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_IDetector2D, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_IDetector2D, 0, 0}, {&_swigt__p_IDetector2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IDetectorResolution[] = { {&_swigt__p_IDetectorResolution, 0, 0, 0},{0, 0, 0, 0}};
@@ -134719,8 +137783,8 @@ static swig_cast_info _swigc__p_IFTDistribution2D[] = { {&_swigt__p_FTDistribut
static swig_cast_info _swigc__p_IFactoryT_std__string_IMultiLayerBuilder_t[] = { {&_swigt__p_IFactoryT_std__string_IMultiLayerBuilder_t, 0, 0, 0}, {&_swigt__p_SampleBuilderFactory, _p_SampleBuilderFactoryTo_p_IFactoryT_std__string_IMultiLayerBuilder_t, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IFactoryT_std__string_Simulation_t[] = { {&_swigt__p_SimulationFactory, _p_SimulationFactoryTo_p_IFactoryT_std__string_Simulation_t, 0, 0}, {&_swigt__p_IFactoryT_std__string_Simulation_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IFootprintFactor[] = { {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_IFootprintFactor, 0, 0}, {&_swigt__p_IFootprintFactor, 0, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_IFootprintFactor, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_IFormFactor[] = { {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_IFormFactor, 0, 0}, {&_swigt__p_IFormFactor, 0, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorRipple1Box, _p_FormFactorRipple1BoxTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_IFormFactor, 0, 0}, {&_swigt__p_ProfileRipple1, _p_ProfileRipple1To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_IFormFactor, 0, 0}, {&_swigt__p_ProfileRipple2, _p_ProfileRipple2To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorRipple1Gauss, _p_FormFactorRipple1GaussTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_IFormFactor, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_IFormFactor, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorRipple2Box, _p_FormFactorRipple2BoxTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorRipple2Lorentz, _p_FormFactorRipple2LorentzTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorRipple1Lorentz, _p_FormFactorRipple1LorentzTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_IFormFactor, 0, 0}, {&_swigt__p_ProfileBar, _p_ProfileBarTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorRipple2Gauss, _p_FormFactorRipple2GaussTo_p_IFormFactor, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_IFormFactorBorn[] = { {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorRipple1Box, _p_FormFactorRipple1BoxTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_ProfileRipple1, _p_ProfileRipple1To_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_ProfileRipple2, _p_ProfileRipple2To_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorRipple1Gauss, _p_FormFactorRipple1GaussTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_IFormFactorBorn, 0, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorRipple2Box, _p_FormFactorRipple2BoxTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorRipple2Lorentz, _p_FormFactorRipple2LorentzTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorRipple1Lorentz, _p_FormFactorRipple1LorentzTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_ProfileBar, _p_ProfileBarTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorRipple2Gauss, _p_FormFactorRipple2GaussTo_p_IFormFactorBorn, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IFormFactor[] = { {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_IFormFactor, 0, 0}, {&_swigt__p_IFormFactor, 0, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_IFormFactor, 0, 0}, {&_swigt__p_ICosineRipple, _p_ICosineRippleTo_p_IFormFactor, 0, 0}, {&_swigt__p_IProfileRipple, _p_IProfileRippleTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_IFormFactor, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_IFormFactor, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_IFormFactor, 0, 0}, {&_swigt__p_IProfileRectangularRipple, _p_IProfileRectangularRippleTo_p_IFormFactor, 0, 0}, {&_swigt__p_ISawtoothRipple, _p_ISawtoothRippleTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_IFormFactor, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_IFormFactor, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IFormFactorBorn[] = { {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_ICosineRipple, _p_ICosineRippleTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_IProfileRipple, _p_IProfileRippleTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_IFormFactorBorn, 0, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_IProfileRectangularRipple, _p_IProfileRectangularRippleTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_ISawtoothRipple, _p_ISawtoothRippleTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_IFormFactorBorn, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_IFormFactorBorn, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IFormFactorDecorator[] = { {&_swigt__p_IFormFactorDecorator, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IHistogram[] = { {&_swigt__p_IHistogram, 0, 0, 0}, {&_swigt__p_Histogram2D, _p_Histogram2DTo_p_IHistogram, 0, 0}, {&_swigt__p_Histogram1D, _p_Histogram1DTo_p_IHistogram, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IIntensityFunction[] = { {&_swigt__p_IntensityFunctionSqrt, _p_IntensityFunctionSqrtTo_p_IIntensityFunction, 0, 0}, {&_swigt__p_IIntensityFunction, 0, 0, 0}, {&_swigt__p_IntensityFunctionLog, _p_IntensityFunctionLogTo_p_IIntensityFunction, 0, 0},{0, 0, 0, 0}};
@@ -134728,18 +137792,21 @@ static swig_cast_info _swigc__p_IInterferenceFunction[] = { {&_swigt__p_Interfe
static swig_cast_info _swigc__p_ILatticeOrientation[] = { {&_swigt__p_ILatticeOrientation, 0, 0, 0}, {&_swigt__p_MillerIndexOrientation, _p_MillerIndexOrientationTo_p_ILatticeOrientation, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ILayout[] = { {&_swigt__p_ILayout, 0, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_ILayout, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IMultiLayerBuilder[] = { {&_swigt__p_IMultiLayerBuilder, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_INode[] = { {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_INode, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_INode, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_INode, 0, 0}, {&_swigt__p_PoissonNoiseBackground, _p_PoissonNoiseBackgroundTo_p_INode, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_INode, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_INode, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_INode, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DGauss, _p_FTDistribution1DGaussTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DGauss, _p_FTDecayFunction1DGaussTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_INode, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_INode, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_INode, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_INode, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_INode, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_INode, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_INode, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_INode, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_INode, 0, 0}, {&_swigt__p_INode, 0, 0, 0}, {&_swigt__p_FormFactorRipple2Box, _p_FormFactorRipple2BoxTo_p_INode, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_INode, 0, 0}, {&_swigt__p_DistributionTrapezoid, _p_DistributionTrapezoidTo_p_INode, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_INode, 0, 0}, {&_swigt__p_Simulation, _p_SimulationTo_p_INode, 0, 0}, {&_swigt__p_GISASSimulation, _p_GISASSimulationTo_p_INode, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_INode, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_INode, 0, 0}, {&_swigt__p_OffSpecSimulation, _p_OffSpecSimulationTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DCone, _p_FTDistribution2DConeTo_p_INode, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_INode, 0, 0}, {&_swigt__p_ProfileBar, _p_ProfileBarTo_p_INode, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_INode, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_INode, 0, 0}, {&_swigt__p_ISample, _p_ISampleTo_p_INode, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DGate, _p_FTDistribution2DGateTo_p_INode, 0, 0}, {&_swigt__p_DistributionLogNormal, _p_DistributionLogNormalTo_p_INode, 0, 0}, {&_swigt__p_FormFactorRipple1Box, _p_FormFactorRipple1BoxTo_p_INode, 0, 0}, {&_swigt__p_Instrument, _p_InstrumentTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DVoigt, _p_FTDecayFunction1DVoigtTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DVoigt, _p_FTDistribution1DVoigtTo_p_INode, 0, 0}, {&_swigt__p_IRotation, _p_IRotationTo_p_INode, 0, 0}, {&_swigt__p_IdentityRotation, _p_IdentityRotationTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_INode, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_INode, 0, 0}, {&_swigt__p_RotationX, _p_RotationXTo_p_INode, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_INode, 0, 0}, {&_swigt__p_RotationY, _p_RotationYTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction2DGauss, _p_FTDecayFunction2DGaussTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DGauss, _p_FTDistribution2DGaussTo_p_INode, 0, 0}, {&_swigt__p_RotationZ, _p_RotationZTo_p_INode, 0, 0}, {&_swigt__p_FormFactorRipple2Gauss, _p_FormFactorRipple2GaussTo_p_INode, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_INode, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_INode, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_INode, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_INode, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_INode, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_INode, 0, 0}, {&_swigt__p_Lattice2D, _p_Lattice2DTo_p_INode, 0, 0}, {&_swigt__p_DistributionGate, _p_DistributionGateTo_p_INode, 0, 0}, {&_swigt__p_IFTDistribution1D, _p_IFTDistribution1DTo_p_INode, 0, 0}, {&_swigt__p_IDistribution1D, _p_IDistribution1DTo_p_INode, 0, 0}, {&_swigt__p_IFTDecayFunction1D, _p_IFTDecayFunction1DTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_INode, 0, 0}, {&_swigt__p_ProfileRipple1, _p_ProfileRipple1To_p_INode, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_INode, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_INode, 0, 0}, {&_swigt__p_ProfileRipple2, _p_ProfileRipple2To_p_INode, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_INode, 0, 0}, {&_swigt__p_DistributionGaussian, _p_DistributionGaussianTo_p_INode, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_INode, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_INode, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DCosine, _p_FTDistribution1DCosineTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DGate, _p_FTDistribution1DGateTo_p_INode, 0, 0}, {&_swigt__p_DistributionCosine, _p_DistributionCosineTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DVoigt, _p_FTDistribution2DVoigtTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction2DVoigt, _p_FTDecayFunction2DVoigtTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DCauchy, _p_FTDistribution1DCauchyTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DCauchy, _p_FTDecayFunction1DCauchyTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DCauchy, _p_FTDistribution2DCauchyTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction2DCauchy, _p_FTDecayFunction2DCauchyTo_p_INode, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_INode, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_INode, 0, 0}, {&_swigt__p_FormFactorRipple1Gauss, _p_FormFactorRipple1GaussTo_p_INode, 0, 0}, {&_swigt__p_Beam, _p_BeamTo_p_INode, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_INode, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_INode, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_INode, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_INode, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_INode, 0, 0}, {&_swigt__p_Simulation2D, _p_Simulation2DTo_p_INode, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_INode, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_INode, 0, 0}, {&_swigt__p_IFTDistribution2D, _p_IFTDistribution2DTo_p_INode, 0, 0}, {&_swigt__p_IFTDecayFunction2D, _p_IFTDecayFunction2DTo_p_INode, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_INode, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_INode, 0, 0}, {&_swigt__p_FormFactorRipple2Lorentz, _p_FormFactorRipple2LorentzTo_p_INode, 0, 0}, {&_swigt__p_FormFactorRipple1Lorentz, _p_FormFactorRipple1LorentzTo_p_INode, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_INode, 0, 0}, {&_swigt__p_BasicLattice, _p_BasicLatticeTo_p_INode, 0, 0}, {&_swigt__p_SquareLattice, _p_SquareLatticeTo_p_INode, 0, 0}, {&_swigt__p_HexagonalLattice, _p_HexagonalLatticeTo_p_INode, 0, 0}, {&_swigt__p_DistributionLorentz, _p_DistributionLorentzTo_p_INode, 0, 0}, {&_swigt__p_Lattice, _p_LatticeTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DTriangle, _p_FTDistribution1DTriangleTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DTriangle, _p_FTDecayFunction1DTriangleTo_p_INode, 0, 0}, {&_swigt__p_RotationEuler, _p_RotationEulerTo_p_INode, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_INode[] = { {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_INode, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_INode, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_INode, 0, 0}, {&_swigt__p_PoissonNoiseBackground, _p_PoissonNoiseBackgroundTo_p_INode, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_INode, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_INode, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_INode, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DGauss, _p_FTDistribution1DGaussTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DGauss, _p_FTDecayFunction1DGaussTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_INode, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_INode, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_INode, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_INode, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_INode, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_INode, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_INode, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_INode, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_INode, 0, 0}, {&_swigt__p_INode, 0, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_INode, 0, 0}, {&_swigt__p_DistributionTrapezoid, _p_DistributionTrapezoidTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_INode, 0, 0}, {&_swigt__p_Simulation, _p_SimulationTo_p_INode, 0, 0}, {&_swigt__p_GISASSimulation, _p_GISASSimulationTo_p_INode, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_INode, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_INode, 0, 0}, {&_swigt__p_OffSpecSimulation, _p_OffSpecSimulationTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DCone, _p_FTDistribution2DConeTo_p_INode, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_INode, 0, 0}, {&_swigt__p_IProfileRectangularRipple, _p_IProfileRectangularRippleTo_p_INode, 0, 0}, {&_swigt__p_ISawtoothRipple, _p_ISawtoothRippleTo_p_INode, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_INode, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_INode, 0, 0}, {&_swigt__p_ISample, _p_ISampleTo_p_INode, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DGate, _p_FTDistribution2DGateTo_p_INode, 0, 0}, {&_swigt__p_DistributionLogNormal, _p_DistributionLogNormalTo_p_INode, 0, 0}, {&_swigt__p_Instrument, _p_InstrumentTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DVoigt, _p_FTDecayFunction1DVoigtTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DVoigt, _p_FTDistribution1DVoigtTo_p_INode, 0, 0}, {&_swigt__p_IRotation, _p_IRotationTo_p_INode, 0, 0}, {&_swigt__p_IdentityRotation, _p_IdentityRotationTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_INode, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_INode, 0, 0}, {&_swigt__p_RotationX, _p_RotationXTo_p_INode, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_INode, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_INode, 0, 0}, {&_swigt__p_RotationY, _p_RotationYTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction2DGauss, _p_FTDecayFunction2DGaussTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DGauss, _p_FTDistribution2DGaussTo_p_INode, 0, 0}, {&_swigt__p_RotationZ, _p_RotationZTo_p_INode, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_INode, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_INode, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_INode, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_INode, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_INode, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_INode, 0, 0}, {&_swigt__p_Lattice2D, _p_Lattice2DTo_p_INode, 0, 0}, {&_swigt__p_DistributionGate, _p_DistributionGateTo_p_INode, 0, 0}, {&_swigt__p_IFTDistribution1D, _p_IFTDistribution1DTo_p_INode, 0, 0}, {&_swigt__p_IDistribution1D, _p_IDistribution1DTo_p_INode, 0, 0}, {&_swigt__p_IFTDecayFunction1D, _p_IFTDecayFunction1DTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_INode, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_INode, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_INode, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_INode, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_INode, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_INode, 0, 0}, {&_swigt__p_DistributionGaussian, _p_DistributionGaussianTo_p_INode, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_INode, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_INode, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DCosine, _p_FTDistribution1DCosineTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DGate, _p_FTDistribution1DGateTo_p_INode, 0, 0}, {&_swigt__p_DistributionCosine, _p_DistributionCosineTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_INode, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DVoigt, _p_FTDistribution2DVoigtTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction2DVoigt, _p_FTDecayFunction2DVoigtTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DCauchy, _p_FTDistribution1DCauchyTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DCauchy, _p_FTDecayFunction1DCauchyTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution2DCauchy, _p_FTDistribution2DCauchyTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction2DCauchy, _p_FTDecayFunction2DCauchyTo_p_INode, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_INode, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_INode, 0, 0}, {&_swigt__p_Beam, _p_BeamTo_p_INode, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_INode, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_INode, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_INode, 0, 0}, {&_swigt__p_ICosineRipple, _p_ICosineRippleTo_p_INode, 0, 0}, {&_swigt__p_IProfileRipple, _p_IProfileRippleTo_p_INode, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_INode, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_INode, 0, 0}, {&_swigt__p_Simulation2D, _p_Simulation2DTo_p_INode, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_INode, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_INode, 0, 0}, {&_swigt__p_IFTDistribution2D, _p_IFTDistribution2DTo_p_INode, 0, 0}, {&_swigt__p_IFTDecayFunction2D, _p_IFTDecayFunction2DTo_p_INode, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_INode, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_INode, 0, 0}, {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_INode, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_INode, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_INode, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_INode, 0, 0}, {&_swigt__p_BasicLattice, _p_BasicLatticeTo_p_INode, 0, 0}, {&_swigt__p_SquareLattice, _p_SquareLatticeTo_p_INode, 0, 0}, {&_swigt__p_HexagonalLattice, _p_HexagonalLatticeTo_p_INode, 0, 0}, {&_swigt__p_DistributionLorentz, _p_DistributionLorentzTo_p_INode, 0, 0}, {&_swigt__p_Lattice, _p_LatticeTo_p_INode, 0, 0}, {&_swigt__p_FTDistribution1DTriangle, _p_FTDistribution1DTriangleTo_p_INode, 0, 0}, {&_swigt__p_FTDecayFunction1DTriangle, _p_FTDecayFunction1DTriangleTo_p_INode, 0, 0}, {&_swigt__p_RotationEuler, _p_RotationEulerTo_p_INode, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_INodeVisitor[] = { {&_swigt__p_INodeVisitor, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IObservable[] = { {&_swigt__p_IObservable, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IObserver[] = { {&_swigt__p_IObserver, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IParameterT_double_t[] = { {&_swigt__p_IParameterT_double_t, 0, 0, 0}, {&_swigt__p_RealParameter, _p_RealParameterTo_p_IParameterT_double_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_IParameterized[] = { {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_IParameterized, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_IParameterized, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_IParameterized, 0, 0}, {&_swigt__p_PoissonNoiseBackground, _p_PoissonNoiseBackgroundTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_IParameterized, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_IParameterized, 0, 0}, {&_swigt__p_ParameterDistribution, _p_ParameterDistributionTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DGauss, _p_FTDistribution1DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DGauss, _p_FTDecayFunction1DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_IParameterized, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_IParameterized, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_IParameterized, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_INode, _p_INodeTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorRipple2Box, _p_FormFactorRipple2BoxTo_p_IParameterized, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_IParameterized, 0, 0}, {&_swigt__p_DistributionTrapezoid, _p_DistributionTrapezoidTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_IParameterized, 0, 0}, {&_swigt__p_Simulation, _p_SimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_GISASSimulation, _p_GISASSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_OffSpecSimulation, _p_OffSpecSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DCone, _p_FTDistribution2DConeTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_IParameterized, 0, 0}, {&_swigt__p_ProfileBar, _p_ProfileBarTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_IParameterized, 0, 0}, {&_swigt__p_ISample, _p_ISampleTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DGate, _p_FTDistribution2DGateTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionLogNormal, _p_DistributionLogNormalTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorRipple1Box, _p_FormFactorRipple1BoxTo_p_IParameterized, 0, 0}, {&_swigt__p_Instrument, _p_InstrumentTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DVoigt, _p_FTDecayFunction1DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DVoigt, _p_FTDistribution1DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_IRotation, _p_IRotationTo_p_IParameterized, 0, 0}, {&_swigt__p_IdentityRotation, _p_IdentityRotationTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationX, _p_RotationXTo_p_IParameterized, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationY, _p_RotationYTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction2DGauss, _p_FTDecayFunction2DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DGauss, _p_FTDistribution2DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationZ, _p_RotationZTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorRipple2Gauss, _p_FormFactorRipple2GaussTo_p_IParameterized, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_IParameterized, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_IParameterized, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_IParameterized, 0, 0}, {&_swigt__p_IMultiLayerBuilder, _p_IMultiLayerBuilderTo_p_IParameterized, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_IParameterized, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_IParameterized, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_IParameterized, 0, 0}, {&_swigt__p_Lattice2D, _p_Lattice2DTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionGate, _p_DistributionGateTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDistribution1D, _p_IFTDistribution1DTo_p_IParameterized, 0, 0}, {&_swigt__p_IDistribution1D, _p_IDistribution1DTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDecayFunction1D, _p_IFTDecayFunction1DTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_IParameterized, 0, 0}, {&_swigt__p_ProfileRipple1, _p_ProfileRipple1To_p_IParameterized, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_IParameterized, 0, 0}, {&_swigt__p_ProfileRipple2, _p_ProfileRipple2To_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionGaussian, _p_DistributionGaussianTo_p_IParameterized, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_IParameterized, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DCosine, _p_FTDistribution1DCosineTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DGate, _p_FTDistribution1DGateTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionCosine, _p_DistributionCosineTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DVoigt, _p_FTDistribution2DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction2DVoigt, _p_FTDecayFunction2DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DCauchy, _p_FTDistribution1DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DCauchy, _p_FTDecayFunction1DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DCauchy, _p_FTDistribution2DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction2DCauchy, _p_FTDecayFunction2DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_IParameterized, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorRipple1Gauss, _p_FormFactorRipple1GaussTo_p_IParameterized, 0, 0}, {&_swigt__p_Beam, _p_BeamTo_p_IParameterized, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_IParameterized, 0, 0}, {&_swigt__p_IParameterized, 0, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_IParameterized, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_Simulation2D, _p_Simulation2DTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDistribution2D, _p_IFTDistribution2DTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDecayFunction2D, _p_IFTDecayFunction2DTo_p_IParameterized, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorRipple2Lorentz, _p_FormFactorRipple2LorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorRipple1Lorentz, _p_FormFactorRipple1LorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_BasicLattice, _p_BasicLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_SquareLattice, _p_SquareLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_HexagonalLattice, _p_HexagonalLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionLorentz, _p_DistributionLorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_Lattice, _p_LatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DTriangle, _p_FTDistribution1DTriangleTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DTriangle, _p_FTDecayFunction1DTriangleTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationEuler, _p_RotationEulerTo_p_IParameterized, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IParameterized[] = { {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_IParameterized, 0, 0}, {&_swigt__p_IBackground, _p_IBackgroundTo_p_IParameterized, 0, 0}, {&_swigt__p_ConstantBackground, _p_ConstantBackgroundTo_p_IParameterized, 0, 0}, {&_swigt__p_PoissonNoiseBackground, _p_PoissonNoiseBackgroundTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_IParameterized, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_IParameterized, 0, 0}, {&_swigt__p_ParameterDistribution, _p_ParameterDistributionTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DGauss, _p_FTDistribution1DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DGauss, _p_FTDecayFunction1DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_IParameterized, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_IParameterized, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_IParameterized, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_IParameterized, 0, 0}, {&_swigt__p_INode, _p_INodeTo_p_IParameterized, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_IParameterized, 0, 0}, {&_swigt__p_DistributionTrapezoid, _p_DistributionTrapezoidTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_IParameterized, 0, 0}, {&_swigt__p_Simulation, _p_SimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_GISASSimulation, _p_GISASSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_DepthProbeSimulation, _p_DepthProbeSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_SpecularSimulation, _p_SpecularSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_OffSpecSimulation, _p_OffSpecSimulationTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DCone, _p_FTDistribution2DConeTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_IParameterized, 0, 0}, {&_swigt__p_IProfileRectangularRipple, _p_IProfileRectangularRippleTo_p_IParameterized, 0, 0}, {&_swigt__p_ISawtoothRipple, _p_ISawtoothRippleTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_IParameterized, 0, 0}, {&_swigt__p_ISample, _p_ISampleTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DGate, _p_FTDistribution2DGateTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionLogNormal, _p_DistributionLogNormalTo_p_IParameterized, 0, 0}, {&_swigt__p_Instrument, _p_InstrumentTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DVoigt, _p_FTDecayFunction1DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DVoigt, _p_FTDistribution1DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_IRotation, _p_IRotationTo_p_IParameterized, 0, 0}, {&_swigt__p_IdentityRotation, _p_IdentityRotationTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationX, _p_RotationXTo_p_IParameterized, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationY, _p_RotationYTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction2DGauss, _p_FTDecayFunction2DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DGauss, _p_FTDistribution2DGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationZ, _p_RotationZTo_p_IParameterized, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_IParameterized, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_IParameterized, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_IParameterized, 0, 0}, {&_swigt__p_IMultiLayerBuilder, _p_IMultiLayerBuilderTo_p_IParameterized, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_IParameterized, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_IParameterized, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_IParameterized, 0, 0}, {&_swigt__p_Lattice2D, _p_Lattice2DTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionGate, _p_DistributionGateTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDistribution1D, _p_IFTDistribution1DTo_p_IParameterized, 0, 0}, {&_swigt__p_IDistribution1D, _p_IDistribution1DTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDecayFunction1D, _p_IFTDecayFunction1DTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_IParameterized, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionGaussian, _p_DistributionGaussianTo_p_IParameterized, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_IParameterized, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_IParameterized, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DCosine, _p_FTDistribution1DCosineTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DGate, _p_FTDistribution1DGateTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionCosine, _p_DistributionCosineTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DVoigt, _p_FTDistribution2DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction2DVoigt, _p_FTDecayFunction2DVoigtTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DCauchy, _p_FTDistribution1DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DCauchy, _p_FTDecayFunction1DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution2DCauchy, _p_FTDistribution2DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction2DCauchy, _p_FTDecayFunction2DCauchyTo_p_IParameterized, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_IParameterized, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_IParameterized, 0, 0}, {&_swigt__p_Beam, _p_BeamTo_p_IParameterized, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_IParameterized, 0, 0}, {&_swigt__p_IParameterized, 0, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_IParameterized, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_ICosineRipple, _p_ICosineRippleTo_p_IParameterized, 0, 0}, {&_swigt__p_IProfileRipple, _p_IProfileRippleTo_p_IParameterized, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_IParameterized, 0, 0}, {&_swigt__p_Simulation2D, _p_Simulation2DTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDistribution2D, _p_IFTDistribution2DTo_p_IParameterized, 0, 0}, {&_swigt__p_IFTDecayFunction2D, _p_IFTDecayFunction2DTo_p_IParameterized, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_BasicLattice, _p_BasicLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_SquareLattice, _p_SquareLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_HexagonalLattice, _p_HexagonalLatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_DistributionLorentz, _p_DistributionLorentzTo_p_IParameterized, 0, 0}, {&_swigt__p_Lattice, _p_LatticeTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDistribution1DTriangle, _p_FTDistribution1DTriangleTo_p_IParameterized, 0, 0}, {&_swigt__p_FTDecayFunction1DTriangle, _p_FTDecayFunction1DTriangleTo_p_IParameterized, 0, 0}, {&_swigt__p_RotationEuler, _p_RotationEulerTo_p_IParameterized, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IParticle[] = { {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_IParticle, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_IParticle, 0, 0}, {&_swigt__p_IParticle, 0, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_IParticle, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_IParticle, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IPeakShape[] = { {&_swigt__p_IPeakShape, 0, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_IPeakShape, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_IPeakShape, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_IPeakShape, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_IPeakShape, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_IPeakShape, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_IPeakShape, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_IPixel[] = { {&_swigt__p_RectangularPixel, _p_RectangularPixelTo_p_IPixel, 0, 0}, {&_swigt__p_SphericalPixel, _p_SphericalPixelTo_p_IPixel, 0, 0}, {&_swigt__p_IPixel, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IPixel[] = { {&_swigt__p_IPixel, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IProfileRectangularRipple[] = { {&_swigt__p_IProfileRectangularRipple, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IProfileRipple[] = { {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_IProfileRipple, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_IProfileRipple, 0, 0}, {&_swigt__p_IProfileRectangularRipple, _p_IProfileRectangularRippleTo_p_IProfileRipple, 0, 0}, {&_swigt__p_ISawtoothRipple, _p_ISawtoothRippleTo_p_IProfileRipple, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_IProfileRipple, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_IProfileRipple, 0, 0}, {&_swigt__p_IProfileRipple, 0, 0, 0}, {&_swigt__p_ICosineRipple, _p_ICosineRippleTo_p_IProfileRipple, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_IProfileRipple, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_IProfileRipple, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IResolutionFunction2D[] = { {&_swigt__p_IResolutionFunction2D, 0, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_IResolutionFunction2D, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IRotation[] = { {&_swigt__p_RotationY, _p_RotationYTo_p_IRotation, 0, 0}, {&_swigt__p_RotationEuler, _p_RotationEulerTo_p_IRotation, 0, 0}, {&_swigt__p_RotationZ, _p_RotationZTo_p_IRotation, 0, 0}, {&_swigt__p_IRotation, 0, 0, 0}, {&_swigt__p_IdentityRotation, _p_IdentityRotationTo_p_IRotation, 0, 0}, {&_swigt__p_RotationX, _p_RotationXTo_p_IRotation, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ISample[] = { {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_ISample, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_ISample, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_ISample, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_ISample, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorRipple2Box, _p_FormFactorRipple2BoxTo_p_ISample, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_ISample, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_ISample, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_ISample, 0, 0}, {&_swigt__p_ProfileBar, _p_ProfileBarTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_ISample, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_ISample, 0, 0}, {&_swigt__p_ISample, 0, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorRipple1Box, _p_FormFactorRipple1BoxTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorRipple2Gauss, _p_FormFactorRipple2GaussTo_p_ISample, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_ISample, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_ISample, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_ISample, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_ISample, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_ISample, 0, 0}, {&_swigt__p_ProfileRipple1, _p_ProfileRipple1To_p_ISample, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_ISample, 0, 0}, {&_swigt__p_ProfileRipple2, _p_ProfileRipple2To_p_ISample, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_ISample, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_ISample, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_ISample, 0, 0}, {&_swigt__p_FormFactorRipple1Gauss, _p_FormFactorRipple1GaussTo_p_ISample, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_ISample, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_ISample, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_ISample, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorRipple2Lorentz, _p_FormFactorRipple2LorentzTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorRipple1Lorentz, _p_FormFactorRipple1LorentzTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_ISample, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ISample[] = { {&_swigt__p_FormFactorBox, _p_FormFactorBoxTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorSphereGaussianRadius, _p_FormFactorSphereGaussianRadiusTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorSphereLogNormalRadius, _p_FormFactorSphereLogNormalRadiusTo_p_ISample, 0, 0}, {&_swigt__p_MultiLayer, _p_MultiLayerTo_p_ISample, 0, 0}, {&_swigt__p_ParticleDistribution, _p_ParticleDistributionTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionNone, _p_InterferenceFunctionNoneTo_p_ISample, 0, 0}, {&_swigt__p_ParticleLayout, _p_ParticleLayoutTo_p_ISample, 0, 0}, {&_swigt__p_ILayout, _p_ILayoutTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorHemiEllipsoid, _p_FormFactorHemiEllipsoidTo_p_ISample, 0, 0}, {&_swigt__p_IPeakShape, _p_IPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_IsotropicGaussPeakShape, _p_IsotropicGaussPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_IsotropicLorentzPeakShape, _p_IsotropicLorentzPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_GaussFisherPeakShape, _p_GaussFisherPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_LorentzFisherPeakShape, _p_LorentzFisherPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_MisesFisherGaussPeakShape, _p_MisesFisherGaussPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_MisesGaussPeakShape, _p_MisesGaussPeakShapeTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPrism3, _p_FormFactorPrism3To_p_ISample, 0, 0}, {&_swigt__p_FormFactorTetrahedron, _p_FormFactorTetrahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorIcosahedron, _p_FormFactorIcosahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorDodecahedron, _p_FormFactorDodecahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCuboctahedron, _p_FormFactorCuboctahedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPolyhedron, _p_FormFactorPolyhedronTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPrism6, _p_FormFactorPrism6To_p_ISample, 0, 0}, {&_swigt__p_ParticleCoreShell, _p_ParticleCoreShellTo_p_ISample, 0, 0}, {&_swigt__p_IProfileRectangularRipple, _p_IProfileRectangularRippleTo_p_ISample, 0, 0}, {&_swigt__p_ISawtoothRipple, _p_ISawtoothRippleTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorFullSphere, _p_FormFactorFullSphereTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorTruncatedSphere, _p_FormFactorTruncatedSphereTo_p_ISample, 0, 0}, {&_swigt__p_IFormFactor, _p_IFormFactorTo_p_ISample, 0, 0}, {&_swigt__p_ISample, 0, 0, 0}, {&_swigt__p_FormFactorPolygonalSurface, _p_FormFactorPolygonalSurfaceTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorLongBoxGauss, _p_FormFactorLongBoxGaussTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPolygonalPrism, _p_FormFactorPolygonalPrismTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionHardDisk, _p_InterferenceFunctionHardDiskTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorTruncatedSpheroid, _p_FormFactorTruncatedSpheroidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorFullSpheroid, _p_FormFactorFullSpheroidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCantellatedCube, _p_FormFactorCantellatedCubeTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorTruncatedCube, _p_FormFactorTruncatedCubeTo_p_ISample, 0, 0}, {&_swigt__p_IFormFactorBorn, _p_IFormFactorBornTo_p_ISample, 0, 0}, {&_swigt__p_IClusteredParticles, _p_IClusteredParticlesTo_p_ISample, 0, 0}, {&_swigt__p_Particle, _p_ParticleTo_p_ISample, 0, 0}, {&_swigt__p_IParticle, _p_IParticleTo_p_ISample, 0, 0}, {&_swigt__p_IAbstractParticle, _p_IAbstractParticleTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCosineRippleBox, _p_FormFactorCosineRippleBoxTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCone, _p_FormFactorConeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionTwin, _p_InterferenceFunctionTwinTo_p_ISample, 0, 0}, {&_swigt__p_Layer, _p_LayerTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorAnisoPyramid, _p_FormFactorAnisoPyramidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorPyramid, _p_FormFactorPyramidTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorEllipsoidalCylinder, _p_FormFactorEllipsoidalCylinderTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCylinder, _p_FormFactorCylinderTo_p_ISample, 0, 0}, {&_swigt__p_ParticleComposition, _p_ParticleCompositionTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCosineRippleGauss, _p_FormFactorCosineRippleGaussTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_ISample, 0, 0}, {&_swigt__p_IInterferenceFunction, _p_IInterferenceFunctionTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCone6, _p_FormFactorCone6To_p_ISample, 0, 0}, {&_swigt__p_IFormFactorDecorator, _p_IFormFactorDecoratorTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorDot, _p_FormFactorDotTo_p_ISample, 0, 0}, {&_swigt__p_LayerRoughness, _p_LayerRoughnessTo_p_ISample, 0, 0}, {&_swigt__p_MesoCrystal, _p_MesoCrystalTo_p_ISample, 0, 0}, {&_swigt__p_Crystal, _p_CrystalTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCrystal, _p_FormFactorCrystalTo_p_ISample, 0, 0}, {&_swigt__p_ICosineRipple, _p_ICosineRippleTo_p_ISample, 0, 0}, {&_swigt__p_IProfileRipple, _p_IProfileRippleTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction2DParaCrystal, _p_InterferenceFunction2DParaCrystalTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionRadialParaCrystal, _p_InterferenceFunctionRadialParaCrystalTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorHollowSphere, _p_FormFactorHollowSphereTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorGaussSphere, _p_FormFactorGaussSphereTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorWeighted, _p_FormFactorWeightedTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorLongBoxLorentz, _p_FormFactorLongBoxLorentzTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorCosineRippleLorentz, _p_FormFactorCosineRippleLorentzTo_p_ISample, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction3DLattice, _p_InterferenceFunction3DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction2DSuperLattice, _p_InterferenceFunction2DSuperLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction2DLattice, _p_InterferenceFunction2DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunction1DLattice, _p_InterferenceFunction1DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionFinite2DLattice, _p_InterferenceFunctionFinite2DLatticeTo_p_ISample, 0, 0}, {&_swigt__p_InterferenceFunctionFinite3DLattice, _p_InterferenceFunctionFinite3DLatticeTo_p_ISample, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ISawtoothRipple[] = { {&_swigt__p_FormFactorSawtoothRippleLorentz, _p_FormFactorSawtoothRippleLorentzTo_p_ISawtoothRipple, 0, 0}, {&_swigt__p_ISawtoothRipple, 0, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleBox, _p_FormFactorSawtoothRippleBoxTo_p_ISawtoothRipple, 0, 0}, {&_swigt__p_FormFactorSawtoothRippleGauss, _p_FormFactorSawtoothRippleGaussTo_p_ISawtoothRipple, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ISelectionRule[] = { {&_swigt__p_ISelectionRule, 0, 0, 0}, {&_swigt__p_SimpleSelectionRule, _p_SimpleSelectionRuleTo_p_ISelectionRule, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IShape2D[] = { {&_swigt__p_Polygon, _p_PolygonTo_p_IShape2D, 0, 0}, {&_swigt__p_Line, _p_LineTo_p_IShape2D, 0, 0}, {&_swigt__p_VerticalLine, _p_VerticalLineTo_p_IShape2D, 0, 0}, {&_swigt__p_Ellipse, _p_EllipseTo_p_IShape2D, 0, 0}, {&_swigt__p_HorizontalLine, _p_HorizontalLineTo_p_IShape2D, 0, 0}, {&_swigt__p_Rectangle, _p_RectangleTo_p_IShape2D, 0, 0}, {&_swigt__p_IShape2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ISpecularScan[] = { {&_swigt__p_AngularSpecScan, _p_AngularSpecScanTo_p_ISpecularScan, 0, 0}, {&_swigt__p_QSpecScan, _p_QSpecScanTo_p_ISpecularScan, 0, 0}, {&_swigt__p_ISpecularScan, 0, 0, 0},{0, 0, 0, 0}};
@@ -134804,9 +137871,6 @@ static swig_cast_info _swigc__p_PolygonalTopology[] = { {&_swigt__p_PolygonalTo
static swig_cast_info _swigc__p_PolyhedralEdge[] = { {&_swigt__p_PolyhedralEdge, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_PolyhedralFace[] = { {&_swigt__p_PolyhedralFace, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_PolyhedralTopology[] = { {&_swigt__p_PolyhedralTopology, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ProfileBar[] = { {&_swigt__p_ProfileBar, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ProfileRipple1[] = { {&_swigt__p_FormFactorRipple1Lorentz, _p_FormFactorRipple1LorentzTo_p_ProfileRipple1, 0, 0}, {&_swigt__p_ProfileRipple1, 0, 0, 0}, {&_swigt__p_FormFactorRipple1Box, _p_FormFactorRipple1BoxTo_p_ProfileRipple1, 0, 0}, {&_swigt__p_FormFactorRipple1Gauss, _p_FormFactorRipple1GaussTo_p_ProfileRipple1, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ProfileRipple2[] = { {&_swigt__p_FormFactorRipple2Gauss, _p_FormFactorRipple2GaussTo_p_ProfileRipple2, 0, 0}, {&_swigt__p_FormFactorRipple2Lorentz, _p_FormFactorRipple2LorentzTo_p_ProfileRipple2, 0, 0}, {&_swigt__p_ProfileRipple2, 0, 0, 0}, {&_swigt__p_FormFactorRipple2Box, _p_FormFactorRipple2BoxTo_p_ProfileRipple2, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ProgressHandler__Callback_t[] = { {&_swigt__p_ProgressHandler__Callback_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_PyBuilderCallback[] = { {&_swigt__p_PyBuilderCallback, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_PyObserverCallback[] = { {&_swigt__p_PyObserverCallback, 0, 0, 0},{0, 0, 0, 0}};
@@ -134844,7 +137908,6 @@ static swig_cast_info _swigc__p_SlicingEffects[] = { {&_swigt__p_SlicingEffects
static swig_cast_info _swigc__p_SpecularDetector1D[] = { {&_swigt__p_SpecularDetector1D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_SpecularSimulation[] = { {&_swigt__p_SpecularSimulation, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_SphericalDetector[] = { {&_swigt__p_SphericalDetector, 0, 0, 0}, {&_swigt__p_IsGISAXSDetector, _p_IsGISAXSDetectorTo_p_SphericalDetector, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_SphericalPixel[] = { {&_swigt__p_SphericalPixel, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_SquareLattice[] = { {&_swigt__p_SquareLattice, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ThreadInfo[] = { {&_swigt__p_ThreadInfo, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_Transform3D[] = { {&_swigt__p_Transform3D, 0, 0, 0},{0, 0, 0, 0}};
@@ -134999,6 +138062,9 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_FormFactorCone,
_swigc__p_FormFactorCone6,
_swigc__p_FormFactorCoreShell,
+ _swigc__p_FormFactorCosineRippleBox,
+ _swigc__p_FormFactorCosineRippleGauss,
+ _swigc__p_FormFactorCosineRippleLorentz,
_swigc__p_FormFactorCrystal,
_swigc__p_FormFactorCuboctahedron,
_swigc__p_FormFactorCylinder,
@@ -135024,12 +138090,9 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_FormFactorPrism3,
_swigc__p_FormFactorPrism6,
_swigc__p_FormFactorPyramid,
- _swigc__p_FormFactorRipple1Box,
- _swigc__p_FormFactorRipple1Gauss,
- _swigc__p_FormFactorRipple1Lorentz,
- _swigc__p_FormFactorRipple2Box,
- _swigc__p_FormFactorRipple2Gauss,
- _swigc__p_FormFactorRipple2Lorentz,
+ _swigc__p_FormFactorSawtoothRippleBox,
+ _swigc__p_FormFactorSawtoothRippleGauss,
+ _swigc__p_FormFactorSawtoothRippleLorentz,
_swigc__p_FormFactorSphereGaussianRadius,
_swigc__p_FormFactorSphereLogNormalRadius,
_swigc__p_FormFactorTetrahedron,
@@ -135049,6 +138112,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_IChiSquaredModule,
_swigc__p_ICloneable,
_swigc__p_IClusteredParticles,
+ _swigc__p_ICosineRipple,
_swigc__p_IDetector,
_swigc__p_IDetector2D,
_swigc__p_IDetectorResolution,
@@ -135078,9 +138142,12 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_IParticle,
_swigc__p_IPeakShape,
_swigc__p_IPixel,
+ _swigc__p_IProfileRectangularRipple,
+ _swigc__p_IProfileRipple,
_swigc__p_IResolutionFunction2D,
_swigc__p_IRotation,
_swigc__p_ISample,
+ _swigc__p_ISawtoothRipple,
_swigc__p_ISelectionRule,
_swigc__p_IShape2D,
_swigc__p_ISpecularScan,
@@ -135145,9 +138212,6 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_PolyhedralEdge,
_swigc__p_PolyhedralFace,
_swigc__p_PolyhedralTopology,
- _swigc__p_ProfileBar,
- _swigc__p_ProfileRipple1,
- _swigc__p_ProfileRipple2,
_swigc__p_ProgressHandler__Callback_t,
_swigc__p_PyBuilderCallback,
_swigc__p_PyObserverCallback,
@@ -135185,7 +138249,6 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_SpecularDetector1D,
_swigc__p_SpecularSimulation,
_swigc__p_SphericalDetector,
- _swigc__p_SphericalPixel,
_swigc__p_SquareLattice,
_swigc__p_ThreadInfo,
_swigc__p_Transform3D,