diff --git a/Base/Element/DepthProbeElement.h b/Base/Element/DepthProbeElement.h
index 46de2bfdbd1626e64383a26371cb787addb98194..b4f99263831e14587dcd43fa3daa663d7a5688f8 100644
--- a/Base/Element/DepthProbeElement.h
+++ b/Base/Element/DepthProbeElement.h
@@ -35,7 +35,7 @@ public:
~DepthProbeElement();
double wavelength() const { return m_wavelength; }
- double getAlphaI() const { return m_alpha_i; }
+ double alphaI() const { return m_alpha_i; }
R3 getKi() const;
template <typename T> void setIntensities(T&& intensities)
diff --git a/Core/Contrib/GISASSpecularContribution.cpp b/Core/Contrib/GISASSpecularContribution.cpp
index db223c203f921074292fa5c67eabe181e547d780..d358c144f2ece9e2fe79e8b437876e8fb078372b 100644
--- a/Core/Contrib/GISASSpecularContribution.cpp
+++ b/Core/Contrib/GISASSpecularContribution.cpp
@@ -26,7 +26,7 @@ void GISASSpecularContribution::compute(DiffuseElement& ele) const
ASSERT(flux);
complex_t R = flux->getScalarR();
- double sin_alpha_i = std::abs(std::sin(ele.getAlphaI()));
+ double sin_alpha_i = std::abs(std::sin(ele.alphaI()));
if (sin_alpha_i == 0.0) {
ele.setIntensity(0);
return;
diff --git a/Core/Contrib/RoughMultiLayerContribution.cpp b/Core/Contrib/RoughMultiLayerContribution.cpp
index 2e5e691acce80eb29792ef17807fdcb50583ba5e..34a326a975bdc7a667b8ba696cca10dac40fea17 100644
--- a/Core/Contrib/RoughMultiLayerContribution.cpp
+++ b/Core/Contrib/RoughMultiLayerContribution.cpp
@@ -49,7 +49,7 @@ RoughMultiLayerContribution::RoughMultiLayerContribution(const ProcessedSample&
void RoughMultiLayerContribution::compute(DiffuseElement& ele) const
{
- if (ele.getAlphaMean() < 0.0)
+ if (ele.alphaMean() < 0.0)
return;
const size_t n_slices = m_re_sample.numberOfSlices();
R3 q = ele.meanQ();
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index 1ed811782e9cdc349293bf12c9bf73708ab1446d..f310885de0e7f24aebc23245b25b4fed10a2670b 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -43,7 +43,7 @@ DepthProbeSimulation::~DepthProbeSimulation() = default;
size_t DepthProbeSimulation::numberOfElements() const
{
- return getAlphaAxis()->size();
+ return alphaAxis()->size();
}
SimulationResult DepthProbeSimulation::result() const
@@ -68,10 +68,10 @@ void DepthProbeSimulation::setZSpan(size_t n_bins, double z_min, double z_max)
m_z_axis = std::make_unique<FixedBinAxis>("z", n_bins, z_min, z_max);
}
-const IAxis* DepthProbeSimulation::getAlphaAxis() const
+const IAxis* DepthProbeSimulation::alphaAxis() const
{
if (!m_alpha_axis)
- throw std::runtime_error("Error in DepthProbeSimulation::getAlphaAxis: incident angle axis "
+ throw std::runtime_error("Error in DepthProbeSimulation::alphaAxis: incident angle axis "
"was not initialized.");
return m_alpha_axis.get();
}
@@ -146,7 +146,7 @@ std::vector<DepthProbeElement> DepthProbeSimulation::generateElements(const Beam
const double wavelength = beam.wavelength();
const double angle_shift = beam.direction().alpha();
- const size_t axis_size = getAlphaAxis()->size();
+ const size_t axis_size = alphaAxis()->size();
result.reserve(axis_size);
for (size_t i = 0; i < axis_size; ++i) {
double result_angle = incidentAngle(i) + angle_shift;
@@ -175,7 +175,7 @@ void DepthProbeSimulation::validityCheck() const
"Error in DepthProbeSimulation::validityCheck: no sample found in the simulation.");
const size_t data_size = m_eles.size();
- if (data_size != getAlphaAxis()->size())
+ if (data_size != alphaAxis()->size())
throw std::runtime_error(
"Error in DepthProbeSimulation::validityCheck: length of simulation "
"element vector is not equal to the number of inclination angles");
@@ -205,7 +205,7 @@ void DepthProbeSimulation::normalize(size_t start_ind, size_t n_elements)
const double beam_intensity = beam().intensity();
for (size_t i = start_ind, stop_point = start_ind + n_elements; i < stop_point; ++i) {
auto& element = m_eles[i];
- const double alpha_i = -element.getAlphaI();
+ const double alpha_i = -element.alphaI();
const auto* footprint = beam().footprintFactor();
double intensity_factor = beam_intensity;
if (footprint != nullptr)
@@ -245,11 +245,11 @@ double DepthProbeSimulation::incidentAngle(size_t index) const
std::unique_ptr<OutputData<double>> DepthProbeSimulation::createIntensityData() const
{
std::unique_ptr<OutputData<double>> result = std::make_unique<OutputData<double>>();
- result->addAxis(*getAlphaAxis());
+ result->addAxis(*alphaAxis());
result->addAxis(*getZAxis());
std::vector<double> rawData;
- rawData.reserve(getAlphaAxis()->size() * getZAxis()->size());
+ rawData.reserve(alphaAxis()->size() * getZAxis()->size());
for (size_t i = 0, size = m_eles.size(); i < size; ++i) {
const std::valarray<double>& fixed_angle_result = m_eles[i].getIntensities();
rawData.insert(rawData.end(), std::begin(fixed_angle_result), std::end(fixed_angle_result));
@@ -263,7 +263,7 @@ std::vector<double> DepthProbeSimulation::rawResults() const
{
validityCheck();
const size_t z_size = getZAxis()->size();
- const size_t alpha_size = getAlphaAxis()->size();
+ const size_t alpha_size = alphaAxis()->size();
std::vector<double> result;
result.reserve(alpha_size * z_size);
@@ -282,7 +282,7 @@ void DepthProbeSimulation::setRawResults(const std::vector<double>& raw_results)
{
validityCheck();
const size_t z_size = getZAxis()->size();
- const size_t alpha_size = getAlphaAxis()->size();
+ const size_t alpha_size = alphaAxis()->size();
if (raw_results.size() != z_size * alpha_size)
throw std::runtime_error(
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index 71b2a0bcf71f860f1309632c8df730f73a168bfc..a2f453f66b08da7d0b4843136a7937d6a11e2c44 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -46,7 +46,7 @@ public:
void setZSpan(size_t n_bins, double z_min, double z_max);
//! Returns a pointer to incident angle axis.
- const IAxis* getAlphaAxis() const;
+ const IAxis* alphaAxis() const;
//! Returns a pointer to z-position axis.
const IAxis* getZAxis() const;
diff --git a/Core/Simulation/ISimulation2D.cpp b/Core/Simulation/ISimulation2D.cpp
index 9ad508bc2f0397347107773b9a48e01318008f42..9e3cf5c050da16c1a119d5e536763a21355571f6 100644
--- a/Core/Simulation/ISimulation2D.cpp
+++ b/Core/Simulation/ISimulation2D.cpp
@@ -122,7 +122,7 @@ void ISimulation2D::normalize(size_t start_ind, size_t n_elements)
const double beam_intensity = beam().intensity();
for (size_t i = start_ind, stop_point = start_ind + n_elements; i < stop_point; ++i) {
DiffuseElement& element = *m_eles[i];
- double sin_alpha_i = std::abs(std::sin(element.getAlphaI()));
+ double sin_alpha_i = std::abs(std::sin(element.alphaI()));
if (sin_alpha_i == 0.0) {
element.setIntensity(0);
continue;
diff --git a/GUI/Model/From/FromDomain.cpp b/GUI/Model/From/FromDomain.cpp
index d3ee899a3a87415679fc1a8a0b59f6025f61a6a3..ee8a201e42880ff7fa4667851da4de9bddbf001c 100644
--- a/GUI/Model/From/FromDomain.cpp
+++ b/GUI/Model/From/FromDomain.cpp
@@ -788,7 +788,7 @@ void GUI::Transform::FromDomain::setRotation(ItemWithParticles* item, const IRot
rotationItem->angle().set(Units::rad2deg(r->getAngle()));
} else if (const auto* r = dynamic_cast<const RotationEuler*>(rotation)) {
auto* rotationItem = transformationItem->setRotationType<EulerRotationItem>();
- rotationItem->alpha().set(Units::rad2deg(r->getAlpha()));
+ rotationItem->alpha().set(Units::rad2deg(r->alpha()));
rotationItem->beta().set(Units::rad2deg(r->getBeta()));
rotationItem->gamma().set(Units::rad2deg(r->getGamma()));
}
@@ -829,7 +829,7 @@ void GUI::Transform::FromDomain::setFormFactor(std::variant<ParticleItem*, MesoC
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
- formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
+ formFactorItem->setAlpha(Units::rad2deg(formFactor->alpha()));
} else if (const auto* formFactor = dynamic_cast<const FormFactorBarGauss*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<BarGaussItem>(parent);
formFactorItem->setLength(formFactor->getLength());
@@ -849,18 +849,18 @@ void GUI::Transform::FromDomain::setFormFactor(std::variant<ParticleItem*, MesoC
auto* formFactorItem = addFormFactorItem<ConeItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
formFactorItem->setHeight(formFactor->getHeight());
- formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
+ formFactorItem->setAlpha(Units::rad2deg(formFactor->alpha()));
} else if (const auto* formFactor = dynamic_cast<const FormFactorCone6*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<Cone6Item>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
- formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
+ formFactorItem->setAlpha(Units::rad2deg(formFactor->alpha()));
} else if (const auto* formFactor = dynamic_cast<const FormFactorCuboctahedron*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CuboctahedronItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setHeightRatio(formFactor->getHeightRatio());
- formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
+ formFactorItem->setAlpha(Units::rad2deg(formFactor->alpha()));
} else if (const auto* formFactor = dynamic_cast<const FormFactorCylinder*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CylinderItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
@@ -901,7 +901,7 @@ void GUI::Transform::FromDomain::setFormFactor(std::variant<ParticleItem*, MesoC
auto* formFactorItem = addFormFactorItem<PyramidItem>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
- formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
+ formFactorItem->setAlpha(Units::rad2deg(formFactor->alpha()));
} else if (const auto* formFactor =
dynamic_cast<const FormFactorCosineRippleBox*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CosineRippleBoxItem>(parent);
@@ -945,7 +945,7 @@ void GUI::Transform::FromDomain::setFormFactor(std::variant<ParticleItem*, MesoC
auto* formFactorItem = addFormFactorItem<TetrahedronItem>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
- formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
+ formFactorItem->setAlpha(Units::rad2deg(formFactor->alpha()));
} else if (const auto* formFactor = dynamic_cast<const FormFactorTruncatedCube*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<TruncatedCubeItem>(parent);
formFactorItem->setLength(formFactor->getLength());
diff --git a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
index a03b40e2cdf29a0e43afe6a0cd1252e3d827c5d9..1ef9eab33e4c67a7887d292a747d633644b0cc5d 100644
--- a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
+++ b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
@@ -131,7 +131,7 @@ GUI::RealSpace::BuilderUtils::implementParticleRotationfromIRotation(const IRota
} else if (const auto* rotZ = dynamic_cast<const RotationZ*>(rotation)) {
alpha = rotZ->getAngle(); // about z-axis
} else if (const auto* rotEuler = dynamic_cast<const RotationEuler*>(rotation)) {
- alpha = rotEuler->getAlpha();
+ alpha = rotEuler->alpha();
beta = rotEuler->getBeta();
gamma = rotEuler->getGamma();
}
diff --git a/GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp b/GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp
index cb90e3e7ec6d793260357330dac86785a29b4cac..4af06c08eb002f3d72095e003d206e02d975a73a 100644
--- a/GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp
@@ -35,7 +35,7 @@ bool isPositionInsideMesoCrystal(const IBornFF* outerShape, R3 positionInside)
double L = ff_AnisoPyramid->getLength();
double W = ff_AnisoPyramid->getWidth();
double H = ff_AnisoPyramid->getHeight();
- double alpha = ff_AnisoPyramid->getAlpha();
+ double alpha = ff_AnisoPyramid->alpha();
double l_z =
L / 2
@@ -73,7 +73,7 @@ bool isPositionInsideMesoCrystal(const IBornFF* outerShape, R3 positionInside)
} else if (const auto* ff_Cone = dynamic_cast<const FormFactorCone*>(outerShape)) {
double R = ff_Cone->getRadius();
double H = ff_Cone->getHeight();
- double alpha = ff_Cone->getAlpha();
+ double alpha = ff_Cone->alpha();
if (std::abs(positionInside.x()) > R || std::abs(positionInside.y()) > R
|| positionInside.z() < 0 || positionInside.z() > H)
@@ -85,7 +85,7 @@ bool isPositionInsideMesoCrystal(const IBornFF* outerShape, R3 positionInside)
} else if (const auto* ff_Cone6 = dynamic_cast<const FormFactorCone6*>(outerShape)) {
double B = ff_Cone6->getBaseEdge();
double H = ff_Cone6->getHeight();
- double alpha = ff_Cone6->getAlpha();
+ double alpha = ff_Cone6->alpha();
if (std::abs(positionInside.x()) > B || std::abs(positionInside.y()) > B
|| positionInside.z() < 0 || positionInside.z() > H)
@@ -108,7 +108,7 @@ bool isPositionInsideMesoCrystal(const IBornFF* outerShape, R3 positionInside)
double L = ff_Cuboctahedron->getLength();
double H = ff_Cuboctahedron->getHeight();
double rH = ff_Cuboctahedron->getHeightRatio();
- double alpha = ff_Cuboctahedron->getAlpha();
+ double alpha = ff_Cuboctahedron->alpha();
double total_Height = H + rH * H;
@@ -238,7 +238,7 @@ bool isPositionInsideMesoCrystal(const IBornFF* outerShape, R3 positionInside)
} else if (const auto* ff_Pyramid = dynamic_cast<const FormFactorPyramid*>(outerShape)) {
double B = ff_Pyramid->getBaseEdge();
double H = ff_Pyramid->getHeight();
- double alpha = ff_Pyramid->getAlpha();
+ double alpha = ff_Pyramid->alpha();
double l_z =
B / 2 - positionInside.z() / std::tan(alpha); // half-length of square at a given height
@@ -285,7 +285,7 @@ bool isPositionInsideMesoCrystal(const IBornFF* outerShape, R3 positionInside)
dynamic_cast<const FormFactorTetrahedron*>(outerShape)) {
double B = ff_Tetrahedron->getBaseEdge();
double H = ff_Tetrahedron->getHeight();
- double alpha = ff_Tetrahedron->getAlpha();
+ double alpha = ff_Tetrahedron->alpha();
double B_z =
B - positionInside.z() * 2 / std::tan(alpha); // edge of triangle at a given height
diff --git a/GUI/View/Realspace/TransformTo3D.cpp b/GUI/View/Realspace/TransformTo3D.cpp
index b8bad6d97416e800c8badba0bba22ee5436c840a..a6d8cf80c49c635d26910ba3055bdd27e255851c 100644
--- a/GUI/View/Realspace/TransformTo3D.cpp
+++ b/GUI/View/Realspace/TransformTo3D.cpp
@@ -83,7 +83,7 @@ GUI::View::TransformTo3D::createParticlefromFormfactor(const IBornFF* ff)
double length = ff_AnisoPyramid->getLength();
double width = ff_AnisoPyramid->getWidth();
double height = ff_AnisoPyramid->getHeight();
- double alpha = ff_AnisoPyramid->getAlpha();
+ double alpha = ff_AnisoPyramid->alpha();
return std::make_unique<GUI::RealSpace::Particles::AnisoPyramid>(length, width, height,
alpha);
}
@@ -108,20 +108,20 @@ GUI::View::TransformTo3D::createParticlefromFormfactor(const IBornFF* ff)
if (const auto* ff_Cone = dynamic_cast<const FormFactorCone*>(ff)) {
double radius = ff_Cone->getRadius();
double height = ff_Cone->getHeight();
- double alpha = ff_Cone->getAlpha();
+ double alpha = ff_Cone->alpha();
return std::make_unique<GUI::RealSpace::Particles::Cone>(radius, height, alpha);
}
if (const auto* ff_Cone6 = dynamic_cast<const FormFactorCone6*>(ff)) {
double baseedge = ff_Cone6->getBaseEdge();
double height = ff_Cone6->getHeight();
- double alpha = ff_Cone6->getAlpha();
+ double alpha = ff_Cone6->alpha();
return std::make_unique<GUI::RealSpace::Particles::Cone6>(baseedge, height, alpha);
}
if (const auto* ff_Cuboctahedron = dynamic_cast<const FormFactorCuboctahedron*>(ff)) {
double length = ff_Cuboctahedron->getLength();
double height = ff_Cuboctahedron->getHeight();
double height_ratio = ff_Cuboctahedron->getHeightRatio();
- double alpha = ff_Cuboctahedron->getAlpha();
+ double alpha = ff_Cuboctahedron->alpha();
return std::make_unique<GUI::RealSpace::Particles::Cuboctahedron>(length, height,
height_ratio, alpha);
}
@@ -175,7 +175,7 @@ GUI::View::TransformTo3D::createParticlefromFormfactor(const IBornFF* ff)
if (const auto* ff_Pyramid = dynamic_cast<const FormFactorPyramid*>(ff)) {
double baseedge = ff_Pyramid->getBaseEdge();
double height = ff_Pyramid->getHeight();
- double alpha = ff_Pyramid->getAlpha();
+ double alpha = ff_Pyramid->alpha();
return std::make_unique<GUI::RealSpace::Particles::Pyramid>(baseedge, height, alpha);
}
if (const auto* ff_CosineRippleBox = dynamic_cast<const FormFactorCosineRippleBox*>(ff)) {
@@ -225,7 +225,7 @@ GUI::View::TransformTo3D::createParticlefromFormfactor(const IBornFF* ff)
if (const auto* ff_Tetrahedron = dynamic_cast<const FormFactorTetrahedron*>(ff)) {
double baseedge = ff_Tetrahedron->getBaseEdge();
double height = ff_Tetrahedron->getHeight();
- double alpha = ff_Tetrahedron->getAlpha();
+ double alpha = ff_Tetrahedron->alpha();
return std::make_unique<GUI::RealSpace::Particles::Tetrahedron>(baseedge, height, alpha);
}
if (const auto* ff_TruncatedCube = dynamic_cast<const FormFactorTruncatedCube*>(ff)) {
diff --git a/Resample/Element/DiffuseElement.cpp b/Resample/Element/DiffuseElement.cpp
index a4442faf2e97f41f314032abff712cbcc6d47980..25036a47ac4d9c2389d576116f66db9d710f3d96 100644
--- a/Resample/Element/DiffuseElement.cpp
+++ b/Resample/Element/DiffuseElement.cpp
@@ -111,7 +111,7 @@ R3 DiffuseElement::getQ(double x, double y) const
return getKi() - m_pixel->getK(x, y, m_wavelength);
}
-double DiffuseElement::getAlpha(double x, double y) const
+double DiffuseElement::alpha(double x, double y) const
{
return M_PI_2 - getKf(x, y).theta();
}
diff --git a/Resample/Element/DiffuseElement.h b/Resample/Element/DiffuseElement.h
index 84301fa33d6b09c626611c45e36d7c36837d1e1b..a00fc0dbd4406143ad02213d41df9ce1467e6855 100644
--- a/Resample/Element/DiffuseElement.h
+++ b/Resample/Element/DiffuseElement.h
@@ -54,9 +54,9 @@ public:
const PolMatrices& polarizationHandler() const { return m_polpair; }
double wavelength() const { return m_wavelength; }
- double getAlphaI() const { return m_alpha_i; }
+ double alphaI() const { return m_alpha_i; }
double getPhiI() const { return m_phi_i; }
- double getAlphaMean() const { return getAlpha(0.5, 0.5); }
+ double alphaMean() const { return alpha(0.5, 0.5); }
double getPhiMean() const { return getPhi(0.5, 0.5); }
void setIntensity(double intensity) { m_intensity = intensity; }
void addIntensity(double intensity) { m_intensity += intensity; }
@@ -70,7 +70,7 @@ public:
double solidAngle() const;
- double getAlpha(double x, double y) const;
+ double alpha(double x, double y) const;
double getPhi(double x, double y) const;
WavevectorInfo wavevectorInfo() const;
diff --git a/Sample/HardParticle/FormFactorAnisoPyramid.h b/Sample/HardParticle/FormFactorAnisoPyramid.h
index 7b62e4f6abe34003fd09072bec2136ed99181eda..8fcd95cb9dadb7b0196f09b1bc020cc74fc6c7ce 100644
--- a/Sample/HardParticle/FormFactorAnisoPyramid.h
+++ b/Sample/HardParticle/FormFactorAnisoPyramid.h
@@ -35,7 +35,7 @@ public:
double getLength() const { return m_length; }
double getWidth() const { return m_width; }
double getHeight() const { return m_height; }
- double getAlpha() const { return m_alpha; }
+ double alpha() const { return m_alpha; }
protected:
DecoratedFF* sliceFormFactor(ZLimits limits, const IRotation* rot,
diff --git a/Sample/HardParticle/FormFactorCone.h b/Sample/HardParticle/FormFactorCone.h
index d7502ee015759c4e536238c2dd64e7a8c63d8187..4635e46366affc4859b265ee56387c329c37db38 100644
--- a/Sample/HardParticle/FormFactorCone.h
+++ b/Sample/HardParticle/FormFactorCone.h
@@ -33,7 +33,7 @@ public:
}
double getHeight() const { return m_height; }
- double getAlpha() const { return m_alpha; }
+ double alpha() const { return m_alpha; }
double getRadius() const { return m_radius; }
double radialExtension() const override { return m_radius; }
diff --git a/Sample/HardParticle/FormFactorCone6.h b/Sample/HardParticle/FormFactorCone6.h
index b238af90972eb4816c22278408d941447e94b00c..b963b7f7adeaa5ea3cdb4c06f7438bd0e49244fd 100644
--- a/Sample/HardParticle/FormFactorCone6.h
+++ b/Sample/HardParticle/FormFactorCone6.h
@@ -34,7 +34,7 @@ public:
double getBaseEdge() const { return m_base_edge; }
double getHeight() const { return m_height; }
- double getAlpha() const { return m_alpha; }
+ double alpha() const { return m_alpha; }
protected:
DecoratedFF* sliceFormFactor(ZLimits limits, const IRotation* rot,
diff --git a/Sample/HardParticle/FormFactorCuboctahedron.h b/Sample/HardParticle/FormFactorCuboctahedron.h
index 2557bd596ea2f40281bddeb8f6c55965edadd9db..a4be873ce075d3321a9a057a029751168bd555b4 100644
--- a/Sample/HardParticle/FormFactorCuboctahedron.h
+++ b/Sample/HardParticle/FormFactorCuboctahedron.h
@@ -35,7 +35,7 @@ public:
double getLength() const { return m_length; }
double getHeight() const { return m_height; }
double getHeightRatio() const { return m_height_ratio; }
- double getAlpha() const { return m_alpha; }
+ double alpha() const { return m_alpha; }
protected:
DecoratedFF* sliceFormFactor(ZLimits limits, const IRotation* rot,
diff --git a/Sample/HardParticle/FormFactorPyramid.h b/Sample/HardParticle/FormFactorPyramid.h
index 038afe1c51846bf85e16192e7fecbcc6788c4856..a02c6bce7d77489351e5ffbfcbf3786d90e4d8a8 100644
--- a/Sample/HardParticle/FormFactorPyramid.h
+++ b/Sample/HardParticle/FormFactorPyramid.h
@@ -34,7 +34,7 @@ public:
double getHeight() const { return m_height; }
double getBaseEdge() const { return m_base_edge; }
- double getAlpha() const { return m_alpha; }
+ double alpha() const { return m_alpha; }
protected:
DecoratedFF* sliceFormFactor(ZLimits limits, const IRotation* rot,
diff --git a/Sample/HardParticle/FormFactorTetrahedron.h b/Sample/HardParticle/FormFactorTetrahedron.h
index c487160b3d9ede30fb3c0a25f7f752bf1bbf6d1a..f8d599236937d9cbc92670e66f82045a7d59fdf9 100644
--- a/Sample/HardParticle/FormFactorTetrahedron.h
+++ b/Sample/HardParticle/FormFactorTetrahedron.h
@@ -34,7 +34,7 @@ public:
double getBaseEdge() const { return m_base_edge; }
double getHeight() const { return m_height; }
- double getAlpha() const { return m_alpha; }
+ double alpha() const { return m_alpha; }
protected:
DecoratedFF* sliceFormFactor(ZLimits limits, const IRotation* rot,
diff --git a/Sample/Scattering/Rotations.h b/Sample/Scattering/Rotations.h
index cb9f71e21c0b87d5cea65e2f1b6cad36db89224e..34c0531c07badc1c58a9504e6b8fff1fe6579931 100644
--- a/Sample/Scattering/Rotations.h
+++ b/Sample/Scattering/Rotations.h
@@ -141,7 +141,7 @@ public:
RotationEuler* clone() const override { return new RotationEuler(m_alpha, m_beta, m_gamma); }
IRotation* createInverse() const override;
- double getAlpha() const { return m_alpha; }
+ double alpha() const { return m_alpha; }
double getBeta() const { return m_beta; }
double getGamma() const { return m_gamma; }
diff --git a/Tests/Examples/PyPersistence.py.in b/Tests/Examples/PyPersistence.py.in
index 2ed417a995bd1d29b5b0e3385b4e0336874c72fb..573b049e7434d31c2a71658ece8ffb1cfe651c44 100644
--- a/Tests/Examples/PyPersistence.py.in
+++ b/Tests/Examples/PyPersistence.py.in
@@ -38,7 +38,7 @@ def get_simulation_DepthProbe():
simulation = example.get_simulation(example.get_sample())
beam = simulation.beam()
wavelength = beam.wavelength()
- incl_axis = simulation.getAlphaAxis()
+ incl_axis = simulation.alphaAxis()
z_axis = simulation.getZAxis()
footprint = beam.footprintFactor()
simulation.setBeamParameters(
diff --git a/Tests/Unit/Core/DepthProbeElementTest.cpp b/Tests/Unit/Core/DepthProbeElementTest.cpp
index 6e93c889388858197326de0d54f829a8397da012..acd87f47318c37e7bd09336c93fe63952b293407 100644
--- a/Tests/Unit/Core/DepthProbeElementTest.cpp
+++ b/Tests/Unit/Core/DepthProbeElementTest.cpp
@@ -31,7 +31,7 @@ TEST_F(DepthProbeElementTest, InitialState)
const DepthProbeElement& ele = createDefaultElement();
EXPECT_EQ(wavelength, ele.wavelength());
- EXPECT_EQ(angle, ele.getAlphaI());
+ EXPECT_EQ(angle, ele.alphaI());
bool intensity_comparison_result = (ele.getIntensities() == 0.0).min();
EXPECT_TRUE(intensity_comparison_result);
EXPECT_EQ(k_i, ele.getKi());
diff --git a/Tests/Unit/Core/DepthProbeSimulationTest.cpp b/Tests/Unit/Core/DepthProbeSimulationTest.cpp
index 45f47c54f617cab0e05f69d5211d87287fab3eba..1dfdf90e1e2b905b30ae1cb340b8674779f354cb 100644
--- a/Tests/Unit/Core/DepthProbeSimulationTest.cpp
+++ b/Tests/Unit/Core/DepthProbeSimulationTest.cpp
@@ -55,7 +55,7 @@ void DepthProbeSimulationTest::checkBeamState(const DepthProbeSimulation& sim)
void DepthProbeSimulationTest::checkEmptySimulation(DepthProbeSimulation& sim)
{
ASSERT_THROW(sim.runSimulation(), std::runtime_error);
- ASSERT_THROW(sim.getAlphaAxis(), std::runtime_error);
+ ASSERT_THROW(sim.alphaAxis(), std::runtime_error);
ASSERT_THROW(sim.getZAxis(), std::runtime_error);
EXPECT_EQ(nullptr, sim.sample());
ASSERT_THROW(sim.result(), std::runtime_error);
@@ -67,7 +67,7 @@ TEST_F(DepthProbeSimulationTest, CheckAxesOfDefaultSimulation)
{
auto sim = defaultSimulation();
- const auto* const alpha_axis = sim->getAlphaAxis();
+ const auto* const alpha_axis = sim->alphaAxis();
EXPECT_TRUE(dynamic_cast<const FixedBinAxis*>(alpha_axis));
EXPECT_EQ(alpha_axis->size(), 10u);
EXPECT_EQ(alpha_axis->lowerBound(), 0.0 * Units::deg);
@@ -86,9 +86,9 @@ TEST_F(DepthProbeSimulationTest, SetBeamParameters)
const auto& beam = sim.beam();
sim.setBeamParameters(1.0, 10, 1.0 * Units::deg, 10.0 * Units::deg);
- EXPECT_EQ(10u, sim.getAlphaAxis()->size());
- EXPECT_EQ(1.0 * Units::deg, sim.getAlphaAxis()->lowerBound());
- EXPECT_EQ(10.0 * Units::deg, sim.getAlphaAxis()->upperBound());
+ EXPECT_EQ(10u, sim.alphaAxis()->size());
+ EXPECT_EQ(1.0 * Units::deg, sim.alphaAxis()->lowerBound());
+ EXPECT_EQ(10.0 * Units::deg, sim.alphaAxis()->upperBound());
EXPECT_EQ(1.0, beam.intensity());
EXPECT_EQ(1.0, beam.wavelength());
EXPECT_EQ(0.0, beam.direction().alpha());
@@ -101,9 +101,9 @@ TEST_F(DepthProbeSimulationTest, SetBeamParameters)
EXPECT_THROW(sim.setBeamParameters(1.0, 0, 1.0, 2.0), std::runtime_error);
EXPECT_THROW(sim.setBeamParameters(-1.0, 1, 1.0, 2.0), std::runtime_error);
- EXPECT_EQ(10u, sim.getAlphaAxis()->size());
- EXPECT_EQ(1.0 * Units::deg, sim.getAlphaAxis()->lowerBound());
- EXPECT_EQ(10.0 * Units::deg, sim.getAlphaAxis()->upperBound());
+ EXPECT_EQ(10u, sim.alphaAxis()->size());
+ EXPECT_EQ(1.0 * Units::deg, sim.alphaAxis()->lowerBound());
+ EXPECT_EQ(10.0 * Units::deg, sim.alphaAxis()->upperBound());
EXPECT_EQ(1.0, beam.wavelength());
EXPECT_EQ(0.0, beam.direction().alpha());
EXPECT_EQ(0.0, beam.direction().phi());
diff --git a/Tests/Unit/GUI/TestFormFactorItems.cpp b/Tests/Unit/GUI/TestFormFactorItems.cpp
index 7ecf84a9b80612edbfd186f2b8c07f9a59ea5796..11b14ddc0cf0802d81e2c190cee6598dbc2c9012 100644
--- a/Tests/Unit/GUI/TestFormFactorItems.cpp
+++ b/Tests/Unit/GUI/TestFormFactorItems.cpp
@@ -21,5 +21,5 @@ TEST_F(TestFormFactorItems, AnisoPyramidItem)
EXPECT_EQ(p_ff->getLength(), 20.0);
EXPECT_EQ(p_ff->getWidth(), 16.0);
EXPECT_EQ(p_ff->getHeight(), 13.0);
- EXPECT_TRUE(BaseUtils::algo::almostEqual(p_ff->getAlpha(), Units::deg2rad(60.0)));
+ EXPECT_TRUE(BaseUtils::algo::almostEqual(p_ff->alpha(), Units::deg2rad(60.0)));
}
diff --git a/Tests/Unit/Sample/RotationTest.cpp b/Tests/Unit/Sample/RotationTest.cpp
index d2c04434293a99f5158482667187811cc104a604..3e6aebc7da90eaf5f724fc914803bbbd4c267717 100644
--- a/Tests/Unit/Sample/RotationTest.cpp
+++ b/Tests/Unit/Sample/RotationTest.cpp
@@ -50,7 +50,7 @@ TEST_F(RotationTest, EulerRotations)
auto P_rot = std::unique_ptr<IRotation>(IRotation::createRotation(rot_matrix));
auto* p_rot_cast = dynamic_cast<RotationEuler*>(P_rot.get());
ASSERT_NE(p_rot_cast, nullptr);
- EXPECT_DOUBLE_EQ(p_rot_cast->getAlpha(), alpha);
+ EXPECT_DOUBLE_EQ(p_rot_cast->alpha(), alpha);
EXPECT_DOUBLE_EQ(p_rot_cast->getBeta(), beta);
EXPECT_DOUBLE_EQ(p_rot_cast->getGamma(), gamma);
}
diff --git a/auto/Wrap/doxygenBase.i b/auto/Wrap/doxygenBase.i
index 0763f3c92442996770f015599bd41431585820d4..9af76ac097ecab2f892d1bf95ffe7cd623bef94a 100644
--- a/auto/Wrap/doxygenBase.i
+++ b/auto/Wrap/doxygenBase.i
@@ -241,7 +241,7 @@ Increments inner counter; at regular intervals updates progress handler.
%feature("docstring") DepthProbeElement::wavelength "double DepthProbeElement::wavelength() const
";
-%feature("docstring") DepthProbeElement::getAlphaI "double DepthProbeElement::getAlphaI() const
+%feature("docstring") DepthProbeElement::alphaI "double DepthProbeElement::alphaI() const
";
%feature("docstring") DepthProbeElement::getKi "R3 DepthProbeElement::getKi() const
diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i
index 7731fd34f765509a3f30502578026299c317431f..bb3a7f6065d1365dca3985b04679e32ca18bff6f 100644
--- a/auto/Wrap/doxygenCore.i
+++ b/auto/Wrap/doxygenCore.i
@@ -323,7 +323,7 @@ Sets beam parameters with alpha_i of the beam defined in the range.
Set z positions for intensity calculations. Negative z's correspond to the area under sample surface. The more negative z is, the deeper layer corresponds to it.
";
-%feature("docstring") DepthProbeSimulation::getAlphaAxis "const IAxis * DepthProbeSimulation::getAlphaAxis() const
+%feature("docstring") DepthProbeSimulation::alphaAxis "const IAxis * DepthProbeSimulation::alphaAxis() const
Returns a pointer to incident angle axis.
";
diff --git a/auto/Wrap/doxygenResample.i b/auto/Wrap/doxygenResample.i
index 021fec402d3753ee2cdff65662021fa8708b0ded..6c025f51d53708f52b26f9daf75187960c91bf40 100644
--- a/auto/Wrap/doxygenResample.i
+++ b/auto/Wrap/doxygenResample.i
@@ -79,13 +79,13 @@ Returns assigned PolarizerPair.
%feature("docstring") DiffuseElement::wavelength "double DiffuseElement::wavelength() const
";
-%feature("docstring") DiffuseElement::getAlphaI "double DiffuseElement::getAlphaI() const
+%feature("docstring") DiffuseElement::alphaI "double DiffuseElement::alphaI() const
";
%feature("docstring") DiffuseElement::getPhiI "double DiffuseElement::getPhiI() const
";
-%feature("docstring") DiffuseElement::getAlphaMean "double DiffuseElement::getAlphaMean() const
+%feature("docstring") DiffuseElement::alphaMean "double DiffuseElement::alphaMean() const
";
%feature("docstring") DiffuseElement::getPhiMean "double DiffuseElement::getPhiMean() const
@@ -120,7 +120,7 @@ Returns scattering vector Q, with Kf determined from in-pixel coordinates x,y. I
%feature("docstring") DiffuseElement::solidAngle "double DiffuseElement::solidAngle() const
";
-%feature("docstring") DiffuseElement::getAlpha "double DiffuseElement::getAlpha(double x, double y) const
+%feature("docstring") DiffuseElement::alpha "double DiffuseElement::alpha(double x, double y) const
";
%feature("docstring") DiffuseElement::getPhi "double DiffuseElement::getPhi(double x, double y) const
diff --git a/auto/Wrap/doxygenSample.i b/auto/Wrap/doxygenSample.i
index 17ae4a8da86c7d6e34057309aff3948abd042aee..97e1ccf8dd8c8679dc8665d5f25081c92f8f733a 100644
--- a/auto/Wrap/doxygenSample.i
+++ b/auto/Wrap/doxygenSample.i
@@ -389,7 +389,7 @@ Returns a clone of this ISampleNode object.
%feature("docstring") FormFactorAnisoPyramid::getHeight "double FormFactorAnisoPyramid::getHeight() const
";
-%feature("docstring") FormFactorAnisoPyramid::getAlpha "double FormFactorAnisoPyramid::getAlpha() const
+%feature("docstring") FormFactorAnisoPyramid::alpha "double FormFactorAnisoPyramid::alpha() const
";
@@ -601,7 +601,7 @@ Returns a clone of this ISampleNode object.
%feature("docstring") FormFactorCone::getHeight "double FormFactorCone::getHeight() const
";
-%feature("docstring") FormFactorCone::getAlpha "double FormFactorCone::getAlpha() const
+%feature("docstring") FormFactorCone::alpha "double FormFactorCone::alpha() const
";
%feature("docstring") FormFactorCone::getRadius "double FormFactorCone::getRadius() const
@@ -644,7 +644,7 @@ Returns a clone of this ISampleNode object.
%feature("docstring") FormFactorCone6::getHeight "double FormFactorCone6::getHeight() const
";
-%feature("docstring") FormFactorCone6::getAlpha "double FormFactorCone6::getAlpha() const
+%feature("docstring") FormFactorCone6::alpha "double FormFactorCone6::alpha() const
";
@@ -857,7 +857,7 @@ Returns a clone of this ISampleNode object.
%feature("docstring") FormFactorCuboctahedron::getHeightRatio "double FormFactorCuboctahedron::getHeightRatio() const
";
-%feature("docstring") FormFactorCuboctahedron::getAlpha "double FormFactorCuboctahedron::getAlpha() const
+%feature("docstring") FormFactorCuboctahedron::alpha "double FormFactorCuboctahedron::alpha() const
";
@@ -1335,7 +1335,7 @@ Returns a clone of this ISampleNode object.
%feature("docstring") FormFactorPyramid::getBaseEdge "double FormFactorPyramid::getBaseEdge() const
";
-%feature("docstring") FormFactorPyramid::getAlpha "double FormFactorPyramid::getAlpha() const
+%feature("docstring") FormFactorPyramid::alpha "double FormFactorPyramid::alpha() const
";
@@ -1503,7 +1503,7 @@ Returns a clone of this ISampleNode object.
%feature("docstring") FormFactorTetrahedron::getHeight "double FormFactorTetrahedron::getHeight() const
";
-%feature("docstring") FormFactorTetrahedron::getAlpha "double FormFactorTetrahedron::getAlpha() const
+%feature("docstring") FormFactorTetrahedron::alpha "double FormFactorTetrahedron::alpha() const
";
@@ -4853,7 +4853,7 @@ C++ includes: Rotations.h
Returns a new IRotation object that is the current object's inverse.
";
-%feature("docstring") RotationEuler::getAlpha "double RotationEuler::getAlpha() const
+%feature("docstring") RotationEuler::alpha "double RotationEuler::alpha() const
";
%feature("docstring") RotationEuler::getBeta "double RotationEuler::getBeta() const
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 2c1387f733a3796567d624038dff957ac3934cf7..427359eed3cc2bc19dfddb0c41fb7e5f038d22ee 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -4133,15 +4133,15 @@ class DepthProbeSimulation(ISimulation):
"""
return _libBornAgainCore.DepthProbeSimulation_setZSpan(self, n_bins, z_min, z_max)
- def getAlphaAxis(self):
+ def alphaAxis(self):
r"""
- getAlphaAxis(DepthProbeSimulation self) -> IAxis
- const IAxis * DepthProbeSimulation::getAlphaAxis() const
+ alphaAxis(DepthProbeSimulation self) -> IAxis
+ const IAxis * DepthProbeSimulation::alphaAxis() const
Returns a pointer to incident angle axis.
"""
- return _libBornAgainCore.DepthProbeSimulation_getAlphaAxis(self)
+ return _libBornAgainCore.DepthProbeSimulation_alphaAxis(self)
def getZAxis(self):
r"""
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index aadd412636b2d1cb6811086cc2760f07339efb37..0febb23553f99aed7e723cf8e0177f8a3ca34c63 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -43570,7 +43570,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DepthProbeSimulation_getAlphaAxis(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DepthProbeSimulation_alphaAxis(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
DepthProbeSimulation *arg1 = (DepthProbeSimulation *) 0 ;
void *argp1 = 0 ;
@@ -43582,10 +43582,10 @@ SWIGINTERN PyObject *_wrap_DepthProbeSimulation_getAlphaAxis(PyObject *SWIGUNUSE
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_DepthProbeSimulation, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_getAlphaAxis" "', argument " "1"" of type '" "DepthProbeSimulation const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DepthProbeSimulation_alphaAxis" "', argument " "1"" of type '" "DepthProbeSimulation const *""'");
}
arg1 = reinterpret_cast< DepthProbeSimulation * >(argp1);
- result = (IAxis *)((DepthProbeSimulation const *)arg1)->getAlphaAxis();
+ result = (IAxis *)((DepthProbeSimulation const *)arg1)->alphaAxis();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IAxis, 0 | 0 );
return resultobj;
fail:
@@ -47384,9 +47384,9 @@ static PyMethodDef SwigMethods[] = {
"Set z positions for intensity calculations. Negative z's correspond to the area under sample surface. The more negative z is, the deeper layer corresponds to it. \n"
"\n"
""},
- { "DepthProbeSimulation_getAlphaAxis", _wrap_DepthProbeSimulation_getAlphaAxis, METH_O, "\n"
- "DepthProbeSimulation_getAlphaAxis(DepthProbeSimulation self) -> IAxis\n"
- "const IAxis * DepthProbeSimulation::getAlphaAxis() const\n"
+ { "DepthProbeSimulation_alphaAxis", _wrap_DepthProbeSimulation_alphaAxis, METH_O, "\n"
+ "DepthProbeSimulation_alphaAxis(DepthProbeSimulation self) -> IAxis\n"
+ "const IAxis * DepthProbeSimulation::alphaAxis() const\n"
"\n"
"Returns a pointer to incident angle axis. \n"
"\n"
diff --git a/auto/Wrap/libBornAgainSample.py b/auto/Wrap/libBornAgainSample.py
index 7aa831d3250b16e311170ff1662511980b70e12b..f97915c44b55b655afe7962050a2797023fb69e4 100644
--- a/auto/Wrap/libBornAgainSample.py
+++ b/auto/Wrap/libBornAgainSample.py
@@ -4048,13 +4048,13 @@ class RotationEuler(IRotation):
"""
return _libBornAgainSample.RotationEuler_createInverse(self)
- def getAlpha(self):
+ def alpha(self):
r"""
- getAlpha(RotationEuler self) -> double
- double RotationEuler::getAlpha() const
+ alpha(RotationEuler self) -> double
+ double RotationEuler::alpha() const
"""
- return _libBornAgainSample.RotationEuler_getAlpha(self)
+ return _libBornAgainSample.RotationEuler_alpha(self)
def getBeta(self):
r"""
@@ -8700,13 +8700,13 @@ class FormFactorAnisoPyramid(IFormFactorPolyhedron):
"""
return _libBornAgainSample.FormFactorAnisoPyramid_getHeight(self)
- def getAlpha(self):
+ def alpha(self):
r"""
- getAlpha(FormFactorAnisoPyramid self) -> double
- double FormFactorAnisoPyramid::getAlpha() const
+ alpha(FormFactorAnisoPyramid self) -> double
+ double FormFactorAnisoPyramid::alpha() const
"""
- return _libBornAgainSample.FormFactorAnisoPyramid_getAlpha(self)
+ return _libBornAgainSample.FormFactorAnisoPyramid_alpha(self)
__swig_destroy__ = _libBornAgainSample.delete_FormFactorAnisoPyramid
# Register FormFactorAnisoPyramid in _libBornAgainSample:
@@ -8906,13 +8906,13 @@ class FormFactorCone(IBornFF):
"""
return _libBornAgainSample.FormFactorCone_getHeight(self)
- def getAlpha(self):
+ def alpha(self):
r"""
- getAlpha(FormFactorCone self) -> double
- double FormFactorCone::getAlpha() const
+ alpha(FormFactorCone self) -> double
+ double FormFactorCone::alpha() const
"""
- return _libBornAgainSample.FormFactorCone_getAlpha(self)
+ return _libBornAgainSample.FormFactorCone_alpha(self)
def getRadius(self):
r"""
@@ -9000,13 +9000,13 @@ class FormFactorCone6(IFormFactorPolyhedron):
"""
return _libBornAgainSample.FormFactorCone6_getHeight(self)
- def getAlpha(self):
+ def alpha(self):
r"""
- getAlpha(FormFactorCone6 self) -> double
- double FormFactorCone6::getAlpha() const
+ alpha(FormFactorCone6 self) -> double
+ double FormFactorCone6::alpha() const
"""
- return _libBornAgainSample.FormFactorCone6_getAlpha(self)
+ return _libBornAgainSample.FormFactorCone6_alpha(self)
__swig_destroy__ = _libBornAgainSample.delete_FormFactorCone6
# Register FormFactorCone6 in _libBornAgainSample:
@@ -9208,13 +9208,13 @@ class FormFactorCuboctahedron(IFormFactorPolyhedron):
"""
return _libBornAgainSample.FormFactorCuboctahedron_getHeightRatio(self)
- def getAlpha(self):
+ def alpha(self):
r"""
- getAlpha(FormFactorCuboctahedron self) -> double
- double FormFactorCuboctahedron::getAlpha() const
+ alpha(FormFactorCuboctahedron self) -> double
+ double FormFactorCuboctahedron::alpha() const
"""
- return _libBornAgainSample.FormFactorCuboctahedron_getAlpha(self)
+ return _libBornAgainSample.FormFactorCuboctahedron_alpha(self)
__swig_destroy__ = _libBornAgainSample.delete_FormFactorCuboctahedron
# Register FormFactorCuboctahedron in _libBornAgainSample:
@@ -10132,13 +10132,13 @@ class FormFactorPyramid(IFormFactorPolyhedron):
"""
return _libBornAgainSample.FormFactorPyramid_getBaseEdge(self)
- def getAlpha(self):
+ def alpha(self):
r"""
- getAlpha(FormFactorPyramid self) -> double
- double FormFactorPyramid::getAlpha() const
+ alpha(FormFactorPyramid self) -> double
+ double FormFactorPyramid::alpha() const
"""
- return _libBornAgainSample.FormFactorPyramid_getAlpha(self)
+ return _libBornAgainSample.FormFactorPyramid_alpha(self)
__swig_destroy__ = _libBornAgainSample.delete_FormFactorPyramid
# Register FormFactorPyramid in _libBornAgainSample:
@@ -10332,13 +10332,13 @@ class FormFactorTetrahedron(IFormFactorPolyhedron):
"""
return _libBornAgainSample.FormFactorTetrahedron_getHeight(self)
- def getAlpha(self):
+ def alpha(self):
r"""
- getAlpha(FormFactorTetrahedron self) -> double
- double FormFactorTetrahedron::getAlpha() const
+ alpha(FormFactorTetrahedron self) -> double
+ double FormFactorTetrahedron::alpha() const
"""
- return _libBornAgainSample.FormFactorTetrahedron_getAlpha(self)
+ return _libBornAgainSample.FormFactorTetrahedron_alpha(self)
__swig_destroy__ = _libBornAgainSample.delete_FormFactorTetrahedron
# Register FormFactorTetrahedron in _libBornAgainSample:
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index ecf0dd17f1b4f17bbba4ba9fa2301df6f5078569..d144d833624f9d9b1c3b5fe817dbcb30da4d3231 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -42629,7 +42629,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_RotationEuler_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_RotationEuler_alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
RotationEuler *arg1 = (RotationEuler *) 0 ;
void *argp1 = 0 ;
@@ -42641,10 +42641,10 @@ SWIGINTERN PyObject *_wrap_RotationEuler_getAlpha(PyObject *SWIGUNUSEDPARM(self)
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RotationEuler, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_getAlpha" "', argument " "1"" of type '" "RotationEuler const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RotationEuler_alpha" "', argument " "1"" of type '" "RotationEuler const *""'");
}
arg1 = reinterpret_cast< RotationEuler * >(argp1);
- result = (double)((RotationEuler const *)arg1)->getAlpha();
+ result = (double)((RotationEuler const *)arg1)->alpha();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -58020,7 +58020,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorAnisoPyramid *arg1 = (FormFactorAnisoPyramid *) 0 ;
void *argp1 = 0 ;
@@ -58032,10 +58032,10 @@ SWIGINTERN PyObject *_wrap_FormFactorAnisoPyramid_getAlpha(PyObject *SWIGUNUSEDP
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorAnisoPyramid, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_getAlpha" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorAnisoPyramid_alpha" "', argument " "1"" of type '" "FormFactorAnisoPyramid const *""'");
}
arg1 = reinterpret_cast< FormFactorAnisoPyramid * >(argp1);
- result = (double)((FormFactorAnisoPyramid const *)arg1)->getAlpha();
+ result = (double)((FormFactorAnisoPyramid const *)arg1)->alpha();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -58789,7 +58789,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FormFactorCone_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorCone_alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCone *arg1 = (FormFactorCone *) 0 ;
void *argp1 = 0 ;
@@ -58801,10 +58801,10 @@ SWIGINTERN PyObject *_wrap_FormFactorCone_getAlpha(PyObject *SWIGUNUSEDPARM(self
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_getAlpha" "', argument " "1"" of type '" "FormFactorCone const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone_alpha" "', argument " "1"" of type '" "FormFactorCone const *""'");
}
arg1 = reinterpret_cast< FormFactorCone * >(argp1);
- result = (double)((FormFactorCone const *)arg1)->getAlpha();
+ result = (double)((FormFactorCone const *)arg1)->alpha();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -59129,7 +59129,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FormFactorCone6_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorCone6_alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCone6 *arg1 = (FormFactorCone6 *) 0 ;
void *argp1 = 0 ;
@@ -59141,10 +59141,10 @@ SWIGINTERN PyObject *_wrap_FormFactorCone6_getAlpha(PyObject *SWIGUNUSEDPARM(sel
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCone6, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone6_getAlpha" "', argument " "1"" of type '" "FormFactorCone6 const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCone6_alpha" "', argument " "1"" of type '" "FormFactorCone6 const *""'");
}
arg1 = reinterpret_cast< FormFactorCone6 * >(argp1);
- result = (double)((FormFactorCone6 const *)arg1)->getAlpha();
+ result = (double)((FormFactorCone6 const *)arg1)->alpha();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -59983,7 +59983,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorCuboctahedron *arg1 = (FormFactorCuboctahedron *) 0 ;
void *argp1 = 0 ;
@@ -59995,10 +59995,10 @@ SWIGINTERN PyObject *_wrap_FormFactorCuboctahedron_getAlpha(PyObject *SWIGUNUSED
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorCuboctahedron, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_getAlpha" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCuboctahedron_alpha" "', argument " "1"" of type '" "FormFactorCuboctahedron const *""'");
}
arg1 = reinterpret_cast< FormFactorCuboctahedron * >(argp1);
- result = (double)((FormFactorCuboctahedron const *)arg1)->getAlpha();
+ result = (double)((FormFactorCuboctahedron const *)arg1)->alpha();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -63452,7 +63452,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FormFactorPyramid_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorPyramid_alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorPyramid *arg1 = (FormFactorPyramid *) 0 ;
void *argp1 = 0 ;
@@ -63464,10 +63464,10 @@ SWIGINTERN PyObject *_wrap_FormFactorPyramid_getAlpha(PyObject *SWIGUNUSEDPARM(s
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorPyramid, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPyramid_getAlpha" "', argument " "1"" of type '" "FormFactorPyramid const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorPyramid_alpha" "', argument " "1"" of type '" "FormFactorPyramid const *""'");
}
arg1 = reinterpret_cast< FormFactorPyramid * >(argp1);
- result = (double)((FormFactorPyramid const *)arg1)->getAlpha();
+ result = (double)((FormFactorPyramid const *)arg1)->alpha();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -64311,7 +64311,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_alpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
FormFactorTetrahedron *arg1 = (FormFactorTetrahedron *) 0 ;
void *argp1 = 0 ;
@@ -64323,10 +64323,10 @@ SWIGINTERN PyObject *_wrap_FormFactorTetrahedron_getAlpha(PyObject *SWIGUNUSEDPA
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FormFactorTetrahedron, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTetrahedron_getAlpha" "', argument " "1"" of type '" "FormFactorTetrahedron const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorTetrahedron_alpha" "', argument " "1"" of type '" "FormFactorTetrahedron const *""'");
}
arg1 = reinterpret_cast< FormFactorTetrahedron * >(argp1);
- result = (double)((FormFactorTetrahedron const *)arg1)->getAlpha();
+ result = (double)((FormFactorTetrahedron const *)arg1)->alpha();
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
@@ -69487,9 +69487,9 @@ static PyMethodDef SwigMethods[] = {
"Returns a new IRotation object that is the current object's inverse. \n"
"\n"
""},
- { "RotationEuler_getAlpha", _wrap_RotationEuler_getAlpha, METH_O, "\n"
- "RotationEuler_getAlpha(RotationEuler self) -> double\n"
- "double RotationEuler::getAlpha() const\n"
+ { "RotationEuler_alpha", _wrap_RotationEuler_alpha, METH_O, "\n"
+ "RotationEuler_alpha(RotationEuler self) -> double\n"
+ "double RotationEuler::alpha() const\n"
"\n"
""},
{ "RotationEuler_getBeta", _wrap_RotationEuler_getBeta, METH_O, "\n"
@@ -72166,9 +72166,9 @@ static PyMethodDef SwigMethods[] = {
"double FormFactorAnisoPyramid::getHeight() const\n"
"\n"
""},
- { "FormFactorAnisoPyramid_getAlpha", _wrap_FormFactorAnisoPyramid_getAlpha, METH_O, "\n"
- "FormFactorAnisoPyramid_getAlpha(FormFactorAnisoPyramid self) -> double\n"
- "double FormFactorAnisoPyramid::getAlpha() const\n"
+ { "FormFactorAnisoPyramid_alpha", _wrap_FormFactorAnisoPyramid_alpha, METH_O, "\n"
+ "FormFactorAnisoPyramid_alpha(FormFactorAnisoPyramid self) -> double\n"
+ "double FormFactorAnisoPyramid::alpha() const\n"
"\n"
""},
{ "delete_FormFactorAnisoPyramid", _wrap_delete_FormFactorAnisoPyramid, METH_O, "delete_FormFactorAnisoPyramid(FormFactorAnisoPyramid self)"},
@@ -72276,9 +72276,9 @@ static PyMethodDef SwigMethods[] = {
"double FormFactorCone::getHeight() const\n"
"\n"
""},
- { "FormFactorCone_getAlpha", _wrap_FormFactorCone_getAlpha, METH_O, "\n"
- "FormFactorCone_getAlpha(FormFactorCone self) -> double\n"
- "double FormFactorCone::getAlpha() const\n"
+ { "FormFactorCone_alpha", _wrap_FormFactorCone_alpha, METH_O, "\n"
+ "FormFactorCone_alpha(FormFactorCone self) -> double\n"
+ "double FormFactorCone::alpha() const\n"
"\n"
""},
{ "FormFactorCone_getRadius", _wrap_FormFactorCone_getRadius, METH_O, "\n"
@@ -72329,9 +72329,9 @@ static PyMethodDef SwigMethods[] = {
"double FormFactorCone6::getHeight() const\n"
"\n"
""},
- { "FormFactorCone6_getAlpha", _wrap_FormFactorCone6_getAlpha, METH_O, "\n"
- "FormFactorCone6_getAlpha(FormFactorCone6 self) -> double\n"
- "double FormFactorCone6::getAlpha() const\n"
+ { "FormFactorCone6_alpha", _wrap_FormFactorCone6_alpha, METH_O, "\n"
+ "FormFactorCone6_alpha(FormFactorCone6 self) -> double\n"
+ "double FormFactorCone6::alpha() const\n"
"\n"
""},
{ "delete_FormFactorCone6", _wrap_delete_FormFactorCone6, METH_O, "delete_FormFactorCone6(FormFactorCone6 self)"},
@@ -72433,9 +72433,9 @@ static PyMethodDef SwigMethods[] = {
"double FormFactorCuboctahedron::getHeightRatio() const\n"
"\n"
""},
- { "FormFactorCuboctahedron_getAlpha", _wrap_FormFactorCuboctahedron_getAlpha, METH_O, "\n"
- "FormFactorCuboctahedron_getAlpha(FormFactorCuboctahedron self) -> double\n"
- "double FormFactorCuboctahedron::getAlpha() const\n"
+ { "FormFactorCuboctahedron_alpha", _wrap_FormFactorCuboctahedron_alpha, METH_O, "\n"
+ "FormFactorCuboctahedron_alpha(FormFactorCuboctahedron self) -> double\n"
+ "double FormFactorCuboctahedron::alpha() const\n"
"\n"
""},
{ "delete_FormFactorCuboctahedron", _wrap_delete_FormFactorCuboctahedron, METH_O, "delete_FormFactorCuboctahedron(FormFactorCuboctahedron self)"},
@@ -72936,9 +72936,9 @@ static PyMethodDef SwigMethods[] = {
"double FormFactorPyramid::getBaseEdge() const\n"
"\n"
""},
- { "FormFactorPyramid_getAlpha", _wrap_FormFactorPyramid_getAlpha, METH_O, "\n"
- "FormFactorPyramid_getAlpha(FormFactorPyramid self) -> double\n"
- "double FormFactorPyramid::getAlpha() const\n"
+ { "FormFactorPyramid_alpha", _wrap_FormFactorPyramid_alpha, METH_O, "\n"
+ "FormFactorPyramid_alpha(FormFactorPyramid self) -> double\n"
+ "double FormFactorPyramid::alpha() const\n"
"\n"
""},
{ "delete_FormFactorPyramid", _wrap_delete_FormFactorPyramid, METH_O, "delete_FormFactorPyramid(FormFactorPyramid self)"},
@@ -73035,9 +73035,9 @@ static PyMethodDef SwigMethods[] = {
"double FormFactorTetrahedron::getHeight() const\n"
"\n"
""},
- { "FormFactorTetrahedron_getAlpha", _wrap_FormFactorTetrahedron_getAlpha, METH_O, "\n"
- "FormFactorTetrahedron_getAlpha(FormFactorTetrahedron self) -> double\n"
- "double FormFactorTetrahedron::getAlpha() const\n"
+ { "FormFactorTetrahedron_alpha", _wrap_FormFactorTetrahedron_alpha, METH_O, "\n"
+ "FormFactorTetrahedron_alpha(FormFactorTetrahedron self) -> double\n"
+ "double FormFactorTetrahedron::alpha() const\n"
"\n"
""},
{ "delete_FormFactorTetrahedron", _wrap_delete_FormFactorTetrahedron, METH_O, "delete_FormFactorTetrahedron(FormFactorTetrahedron self)"},