From 544399aa6b83ad4757701247d4ad525d7a1d77ec Mon Sep 17 00:00:00 2001 From: Walter Van Herck <w.van.herck@fz-juelich.de> Date: Mon, 13 Feb 2017 14:22:12 +0100 Subject: [PATCH] Rename method getZBottom -> bottomZ --- .../FormFactorDecoratorPositionFactor.cpp | 4 +- .../FormFactorDecoratorPositionFactor.h | 2 +- .../FormFactorDecoratorRotation.cpp | 4 +- .../FormFactorDecoratorRotation.h | 2 +- .../IFormFactorDecorator.h | 4 +- Core/Multilayer/FormFactorDWBA.cpp | 4 +- Core/Multilayer/FormFactorDWBA.h | 2 +- Core/Multilayer/FormFactorDWBAPol.cpp | 4 +- Core/Multilayer/FormFactorDWBAPol.h | 2 +- Core/Particle/FormFactorCrystal.cpp | 4 +- Core/Particle/FormFactorCrystal.h | 2 +- Core/Particle/FormFactorWeighted.cpp | 8 +- Core/Particle/FormFactorWeighted.h | 2 +- Core/Scattering/IFormFactor.cpp | 2 +- Core/Scattering/IFormFactor.h | 2 +- Core/Scattering/IFormFactorBorn.cpp | 2 +- Core/Scattering/IFormFactorBorn.h | 2 +- auto/Wrap/doxygen_core.i | 18 +-- auto/Wrap/libBornAgainCore.py | 40 +++---- auto/Wrap/libBornAgainCore_wrap.cpp | 110 +++++++++--------- auto/Wrap/libBornAgainCore_wrap.h | 4 +- 21 files changed, 112 insertions(+), 112 deletions(-) diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.cpp b/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.cpp index 17a372a3da3..21c0685ec42 100644 --- a/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.cpp +++ b/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.cpp @@ -25,11 +25,11 @@ FormFactorDecoratorPositionFactor::FormFactorDecoratorPositionFactor( setName(BornAgain::FormFactorDecoratorPositionFactorType); } -double FormFactorDecoratorPositionFactor::getZBottom(const IRotation& rotation) const +double FormFactorDecoratorPositionFactor::bottomZ(const IRotation& rotation) const { Transform3D transform = rotation.getTransform3D(); kvector_t rotated_translation = transform.transformed(m_position); - return mp_form_factor->getZBottom(rotation) + rotated_translation.z(); + return mp_form_factor->bottomZ(rotation) + rotated_translation.z(); } complex_t FormFactorDecoratorPositionFactor::evaluate( diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h b/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h index d1877ac372c..f7442ccadc5 100644 --- a/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h +++ b/Core/DecoratedFormFactor/FormFactorDecoratorPositionFactor.h @@ -32,7 +32,7 @@ public: void accept(INodeVisitor* visitor) const override final { visitor->visit(this); } - double getZBottom(const IRotation& rotation) const override final; + double bottomZ(const IRotation& rotation) const override final; complex_t evaluate(const WavevectorInfo& wavevectors) const override final; #ifndef SWIG diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorRotation.cpp b/Core/DecoratedFormFactor/FormFactorDecoratorRotation.cpp index a652d58fae5..75501669795 100644 --- a/Core/DecoratedFormFactor/FormFactorDecoratorRotation.cpp +++ b/Core/DecoratedFormFactor/FormFactorDecoratorRotation.cpp @@ -31,11 +31,11 @@ FormFactorDecoratorRotation* FormFactorDecoratorRotation::clone() const return new FormFactorDecoratorRotation(*mp_form_factor, m_transform); } -double FormFactorDecoratorRotation::getZBottom(const IRotation& rotation) const +double FormFactorDecoratorRotation::bottomZ(const IRotation& rotation) const { Transform3D transform = rotation.getTransform3D(); std::unique_ptr<IRotation> P_total_rotation(IRotation::createRotation(transform*m_transform)); - return mp_form_factor->getZBottom(*P_total_rotation); + return mp_form_factor->bottomZ(*P_total_rotation); } complex_t FormFactorDecoratorRotation::evaluate(const WavevectorInfo& wavevectors) const diff --git a/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h b/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h index f5a484f661f..26d89abc5f9 100644 --- a/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h +++ b/Core/DecoratedFormFactor/FormFactorDecoratorRotation.h @@ -32,7 +32,7 @@ public: void accept(INodeVisitor* visitor) const override final { visitor->visit(this); } - double getZBottom(const IRotation& rotation) const override final; + double bottomZ(const IRotation& rotation) const override final; complex_t evaluate(const WavevectorInfo& wavevectors) const override final; #ifndef SWIG diff --git a/Core/DecoratedFormFactor/IFormFactorDecorator.h b/Core/DecoratedFormFactor/IFormFactorDecorator.h index 4e3869a804f..b6d64cf8363 100644 --- a/Core/DecoratedFormFactor/IFormFactorDecorator.h +++ b/Core/DecoratedFormFactor/IFormFactorDecorator.h @@ -43,8 +43,8 @@ public: double getRadialExtension() const override { return mp_form_factor->getRadialExtension(); } - double getZBottom(const IRotation& rotation) const override { - return mp_form_factor->getZBottom(rotation); } + double bottomZ(const IRotation& rotation) const override { + return mp_form_factor->bottomZ(rotation); } protected: IFormFactor* mp_form_factor; diff --git a/Core/Multilayer/FormFactorDWBA.cpp b/Core/Multilayer/FormFactorDWBA.cpp index 4f03c5db43d..e1c1eb5a1e3 100644 --- a/Core/Multilayer/FormFactorDWBA.cpp +++ b/Core/Multilayer/FormFactorDWBA.cpp @@ -73,9 +73,9 @@ complex_t FormFactorDWBA::evaluate(const WavevectorInfo& wavevectors) const return term_S + term_RS + term_SR + term_RSR; } -double FormFactorDWBA::getZBottom(const IRotation& rotation) const +double FormFactorDWBA::bottomZ(const IRotation& rotation) const { - return mP_form_factor->getZBottom(rotation); + return mP_form_factor->bottomZ(rotation); } void FormFactorDWBA::setSpecularInfo(const ILayerRTCoefficients* p_in_coeffs, diff --git a/Core/Multilayer/FormFactorDWBA.h b/Core/Multilayer/FormFactorDWBA.h index 5262ca3bddc..69346e70740 100644 --- a/Core/Multilayer/FormFactorDWBA.h +++ b/Core/Multilayer/FormFactorDWBA.h @@ -41,7 +41,7 @@ public: double getRadialExtension() const override { return mP_form_factor->getRadialExtension(); } - double getZBottom(const IRotation& rotation) const override; + double bottomZ(const IRotation& rotation) const override; void setSpecularInfo (const ILayerRTCoefficients* p_in_coeffs, const ILayerRTCoefficients* p_out_coeffs) override; diff --git a/Core/Multilayer/FormFactorDWBAPol.cpp b/Core/Multilayer/FormFactorDWBAPol.cpp index e19969ed7e6..4900cc6ff4c 100644 --- a/Core/Multilayer/FormFactorDWBAPol.cpp +++ b/Core/Multilayer/FormFactorDWBAPol.cpp @@ -201,9 +201,9 @@ Eigen::Matrix2cd FormFactorDWBAPol::evaluatePol(const WavevectorInfo& wavevector M22_S + M22_RS + M22_SR + M22_RSR; } -double FormFactorDWBAPol::getZBottom(const IRotation& rotation) const +double FormFactorDWBAPol::bottomZ(const IRotation& rotation) const { - return mP_form_factor->getZBottom(rotation); + return mP_form_factor->bottomZ(rotation); } void FormFactorDWBAPol::setSpecularInfo(const ILayerRTCoefficients* p_in_coeffs, diff --git a/Core/Multilayer/FormFactorDWBAPol.h b/Core/Multilayer/FormFactorDWBAPol.h index b453969ae21..2d64091f330 100644 --- a/Core/Multilayer/FormFactorDWBAPol.h +++ b/Core/Multilayer/FormFactorDWBAPol.h @@ -45,7 +45,7 @@ public: double getRadialExtension() const override { return mP_form_factor->getRadialExtension(); } - double getZBottom(const IRotation& rotation) const override; + double bottomZ(const IRotation& rotation) const override; void setSpecularInfo(const ILayerRTCoefficients* p_in_coeffs, const ILayerRTCoefficients* p_out_coeffs) override; diff --git a/Core/Particle/FormFactorCrystal.cpp b/Core/Particle/FormFactorCrystal.cpp index 82c113678eb..02326283440 100644 --- a/Core/Particle/FormFactorCrystal.cpp +++ b/Core/Particle/FormFactorCrystal.cpp @@ -35,9 +35,9 @@ FormFactorCrystal::~FormFactorCrystal() delete mp_meso_form_factor; } -double FormFactorCrystal::getZBottom(const IRotation& rotation) const +double FormFactorCrystal::bottomZ(const IRotation& rotation) const { - return mp_meso_form_factor->getZBottom(rotation); + return mp_meso_form_factor->bottomZ(rotation); } complex_t FormFactorCrystal::evaluate(const WavevectorInfo& wavevectors) const diff --git a/Core/Particle/FormFactorCrystal.h b/Core/Particle/FormFactorCrystal.h index b3fe19e4812..92ea665575a 100644 --- a/Core/Particle/FormFactorCrystal.h +++ b/Core/Particle/FormFactorCrystal.h @@ -38,7 +38,7 @@ public: double getRadialExtension() const override final { return mp_meso_form_factor->getRadialExtension(); } - double getZBottom(const IRotation& rotation) const override; + double bottomZ(const IRotation& rotation) const override; complex_t evaluate(const WavevectorInfo& wavevectors) const override final; #ifndef SWIG diff --git a/Core/Particle/FormFactorWeighted.cpp b/Core/Particle/FormFactorWeighted.cpp index e47b1bb72e4..909f8e008db 100644 --- a/Core/Particle/FormFactorWeighted.cpp +++ b/Core/Particle/FormFactorWeighted.cpp @@ -44,14 +44,14 @@ double FormFactorWeighted::getRadialExtension() const return result; } -double FormFactorWeighted::getZBottom(const IRotation& rotation) const +double FormFactorWeighted::bottomZ(const IRotation& rotation) const { if (m_form_factors.size()==0) - throw std::runtime_error("FormFactorWeighted::getZBottom() -> Error: " + throw std::runtime_error("FormFactorWeighted::bottomZ() -> Error: " "'this' contains zero form factors."); - double zmin = m_form_factors[0]->getZBottom(rotation); + double zmin = m_form_factors[0]->bottomZ(rotation); for (size_t index=1; index<m_form_factors.size(); ++index ) - zmin = std::min(zmin, m_form_factors[index]->getZBottom(rotation)); + zmin = std::min(zmin, m_form_factors[index]->bottomZ(rotation)); return zmin; } diff --git a/Core/Particle/FormFactorWeighted.h b/Core/Particle/FormFactorWeighted.h index 99b33064829..0e06e7a35db 100644 --- a/Core/Particle/FormFactorWeighted.h +++ b/Core/Particle/FormFactorWeighted.h @@ -38,7 +38,7 @@ public: double getRadialExtension() const override final; - double getZBottom(const IRotation& rotation) const override final; + double bottomZ(const IRotation& rotation) const override final; void addFormFactor(const IFormFactor& form_factor, double weight=1.0); diff --git a/Core/Scattering/IFormFactor.cpp b/Core/Scattering/IFormFactor.cpp index e1725a733b2..1f7c6750e54 100644 --- a/Core/Scattering/IFormFactor.cpp +++ b/Core/Scattering/IFormFactor.cpp @@ -32,7 +32,7 @@ double IFormFactor::getVolume() const return std::abs(evaluate(zero_wavevectors)); } -double IFormFactor::getZBottom(const IRotation&) const +double IFormFactor::bottomZ(const IRotation&) const { return 0.0; } diff --git a/Core/Scattering/IFormFactor.h b/Core/Scattering/IFormFactor.h index ae4cc8d6d23..b595fbf5b9e 100644 --- a/Core/Scattering/IFormFactor.h +++ b/Core/Scattering/IFormFactor.h @@ -62,7 +62,7 @@ public: virtual double getRadialExtension() const=0; //! Returns the z-coordinate of the lowest point in this shape after a given rotation - virtual double getZBottom(const IRotation& rotation) const; + virtual double bottomZ(const IRotation& rotation) const; //! Sets reflection/transmission info virtual void setSpecularInfo(const ILayerRTCoefficients*, const ILayerRTCoefficients*) {} diff --git a/Core/Scattering/IFormFactorBorn.cpp b/Core/Scattering/IFormFactorBorn.cpp index 609daaaf80e..331758a54d5 100644 --- a/Core/Scattering/IFormFactorBorn.cpp +++ b/Core/Scattering/IFormFactorBorn.cpp @@ -27,7 +27,7 @@ Eigen::Matrix2cd IFormFactorBorn::evaluatePol(const WavevectorInfo &wavevectors) return evaluate_for_q_pol(wavevectors.getQ()); } -double IFormFactorBorn::getZBottom(const IRotation&) const +double IFormFactorBorn::bottomZ(const IRotation&) const { // TODO: remove this oversimplification! return 0.0; diff --git a/Core/Scattering/IFormFactorBorn.h b/Core/Scattering/IFormFactorBorn.h index 650fa5e4c14..833321b2720 100644 --- a/Core/Scattering/IFormFactorBorn.h +++ b/Core/Scattering/IFormFactorBorn.h @@ -41,7 +41,7 @@ public: Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const override; #endif - double getZBottom(const IRotation& rotation) const override; + double bottomZ(const IRotation& rotation) const override; //! 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. diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i index f305646bdc0..3d50a37822d 100644 --- a/auto/Wrap/doxygen_core.i +++ b/auto/Wrap/doxygen_core.i @@ -2788,7 +2788,7 @@ Returns the total volume of the particle of this form factor's shape. Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations "; -%feature("docstring") FormFactorCrystal::getZBottom "double FormFactorCrystal::getZBottom(const IRotation &rotation) const override +%feature("docstring") FormFactorCrystal::bottomZ "double FormFactorCrystal::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -2999,7 +2999,7 @@ Returns a clone of this ISample object. Calls the INodeVisitor's visit method. "; -%feature("docstring") FormFactorDecoratorPositionFactor::getZBottom "double FormFactorDecoratorPositionFactor::getZBottom(const IRotation &rotation) const overridefinal +%feature("docstring") FormFactorDecoratorPositionFactor::bottomZ "double FormFactorDecoratorPositionFactor::bottomZ(const IRotation &rotation) const overridefinal Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -3038,7 +3038,7 @@ Returns a clone of this ISample object. Calls the INodeVisitor's visit method. "; -%feature("docstring") FormFactorDecoratorRotation::getZBottom "double FormFactorDecoratorRotation::getZBottom(const IRotation &rotation) const overridefinal +%feature("docstring") FormFactorDecoratorRotation::bottomZ "double FormFactorDecoratorRotation::bottomZ(const IRotation &rotation) const overridefinal Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -3126,7 +3126,7 @@ Returns the total volume of the particle of this form factor's shape. Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations "; -%feature("docstring") FormFactorDWBA::getZBottom "double FormFactorDWBA::getZBottom(const IRotation &rotation) const override +%feature("docstring") FormFactorDWBA::bottomZ "double FormFactorDWBA::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -3181,7 +3181,7 @@ Returns the total volume of the particle of this form factor's shape. Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations "; -%feature("docstring") FormFactorDWBAPol::getZBottom "double FormFactorDWBAPol::getZBottom(const IRotation &rotation) const override +%feature("docstring") FormFactorDWBAPol::bottomZ "double FormFactorDWBAPol::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -4475,7 +4475,7 @@ Calls the INodeVisitor's visit method. Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations "; -%feature("docstring") FormFactorWeighted::getZBottom "double FormFactorWeighted::getZBottom(const IRotation &rotation) const overridefinal +%feature("docstring") FormFactorWeighted::bottomZ "double FormFactorWeighted::bottomZ(const IRotation &rotation) const overridefinal Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -6194,7 +6194,7 @@ Returns the total volume of the particle of this form factor's shape. Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations "; -%feature("docstring") IFormFactor::getZBottom "double IFormFactor::getZBottom(const IRotation &rotation) const +%feature("docstring") IFormFactor::bottomZ "double IFormFactor::bottomZ(const IRotation &rotation) const Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -6236,7 +6236,7 @@ Returns scattering amplitude for complex wavevectors ki, kf. Returns scattering amplitude for matrix interactions. "; -%feature("docstring") IFormFactorBorn::getZBottom "double IFormFactorBorn::getZBottom(const IRotation &rotation) const override +%feature("docstring") IFormFactorBorn::bottomZ "double IFormFactorBorn::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. "; @@ -6288,7 +6288,7 @@ Returns the total volume of the particle of this form factor's shape. Returns the (approximate in some cases) radial size of the particle of this form factor's shape. This is used for SSCA calculations "; -%feature("docstring") IFormFactorDecorator::getZBottom "double IFormFactorDecorator::getZBottom(const IRotation &rotation) const override +%feature("docstring") IFormFactorDecorator::bottomZ "double IFormFactorDecorator::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. "; diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py index 1327c8b90b9..55079fc30f4 100644 --- a/auto/Wrap/libBornAgainCore.py +++ b/auto/Wrap/libBornAgainCore.py @@ -10772,16 +10772,16 @@ class IFormFactor(ISample): return _libBornAgainCore.IFormFactor_getRadialExtension(self) - def getZBottom(self, rotation): + def bottomZ(self, rotation): """ - getZBottom(IFormFactor self, IRotation rotation) -> double + bottomZ(IFormFactor self, IRotation rotation) -> double - double IFormFactor::getZBottom(const IRotation &rotation) const + double IFormFactor::bottomZ(const IRotation &rotation) const Returns the z-coordinate of the lowest point in this shape after a given rotation. """ - return _libBornAgainCore.IFormFactor_getZBottom(self, rotation) + return _libBornAgainCore.IFormFactor_bottomZ(self, rotation) def setSpecularInfo(self, arg0, arg1): @@ -11079,16 +11079,16 @@ class IFormFactorBorn(IFormFactor): return _libBornAgainCore.IFormFactorBorn_evaluate(self, wavevectors) - def getZBottom(self, rotation): + def bottomZ(self, rotation): """ - getZBottom(IFormFactorBorn self, IRotation rotation) -> double + bottomZ(IFormFactorBorn self, IRotation rotation) -> double - double IFormFactorBorn::getZBottom(const IRotation &rotation) const override + double IFormFactorBorn::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. """ - return _libBornAgainCore.IFormFactorBorn_getZBottom(self, rotation) + return _libBornAgainCore.IFormFactorBorn_bottomZ(self, rotation) def evaluate_for_q(self, q): @@ -11196,16 +11196,16 @@ class IFormFactorDecorator(IFormFactor): return _libBornAgainCore.IFormFactorDecorator_getRadialExtension(self) - def getZBottom(self, rotation): + def bottomZ(self, rotation): """ - getZBottom(IFormFactorDecorator self, IRotation rotation) -> double + bottomZ(IFormFactorDecorator self, IRotation rotation) -> double - double IFormFactorDecorator::getZBottom(const IRotation &rotation) const override + double IFormFactorDecorator::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. """ - return _libBornAgainCore.IFormFactorDecorator_getZBottom(self, rotation) + return _libBornAgainCore.IFormFactorDecorator_bottomZ(self, rotation) IFormFactorDecorator_swigregister = _libBornAgainCore.IFormFactorDecorator_swigregister IFormFactorDecorator_swigregister(IFormFactorDecorator) @@ -12322,16 +12322,16 @@ class FormFactorCrystal(IFormFactor): return _libBornAgainCore.FormFactorCrystal_getRadialExtension(self) - def getZBottom(self, rotation): + def bottomZ(self, rotation): """ - getZBottom(FormFactorCrystal self, IRotation rotation) -> double + bottomZ(FormFactorCrystal self, IRotation rotation) -> double - double FormFactorCrystal::getZBottom(const IRotation &rotation) const override + double FormFactorCrystal::bottomZ(const IRotation &rotation) const override Returns the z-coordinate of the lowest point in this shape after a given rotation. """ - return _libBornAgainCore.FormFactorCrystal_getZBottom(self, rotation) + return _libBornAgainCore.FormFactorCrystal_bottomZ(self, rotation) def evaluate(self, wavevectors): @@ -15609,16 +15609,16 @@ class FormFactorWeighted(IFormFactor): return _libBornAgainCore.FormFactorWeighted_getRadialExtension(self) - def getZBottom(self, rotation): + def bottomZ(self, rotation): """ - getZBottom(FormFactorWeighted self, IRotation rotation) -> double + bottomZ(FormFactorWeighted self, IRotation rotation) -> double - double FormFactorWeighted::getZBottom(const IRotation &rotation) const overridefinal + double FormFactorWeighted::bottomZ(const IRotation &rotation) const overridefinal Returns the z-coordinate of the lowest point in this shape after a given rotation. """ - return _libBornAgainCore.FormFactorWeighted_getZBottom(self, rotation) + return _libBornAgainCore.FormFactorWeighted_bottomZ(self, rotation) def addFormFactor(self, form_factor, weight=1.0): diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp index 874607467e8..e74b299acd0 100644 --- a/auto/Wrap/libBornAgainCore_wrap.cpp +++ b/auto/Wrap/libBornAgainCore_wrap.cpp @@ -8593,7 +8593,7 @@ double SwigDirector_IFormFactor::getRadialExtension() const { } -double SwigDirector_IFormFactor::getZBottom(IRotation const &rotation) const { +double SwigDirector_IFormFactor::bottomZ(IRotation const &rotation) const { double c_result; swig::SwigVar_PyObject obj0; obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rotation), SWIGTYPE_p_IRotation, 0 ); @@ -8602,16 +8602,16 @@ double SwigDirector_IFormFactor::getZBottom(IRotation const &rotation) const { } #if defined(SWIG_PYTHON_DIRECTOR_VTABLE) const size_t swig_method_index = 14; - const char * const swig_method_name = "getZBottom"; + const char * const swig_method_name = "bottomZ"; PyObject* method = swig_get_method(swig_method_index, swig_method_name); swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0); #else - swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"getZBottom", (char *)"(O)" ,(PyObject *)obj0); + swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"bottomZ", (char *)"(O)" ,(PyObject *)obj0); #endif if (!result) { PyObject *error = PyErr_Occurred(); if (error) { - Swig::DirectorMethodException::raise("Error detected when calling 'IFormFactor.getZBottom'"); + Swig::DirectorMethodException::raise("Error detected when calling 'IFormFactor.bottomZ'"); } } double swig_val; @@ -9061,7 +9061,7 @@ double SwigDirector_IFormFactorBorn::getRadialExtension() const { } -double SwigDirector_IFormFactorBorn::getZBottom(IRotation const &rotation) const { +double SwigDirector_IFormFactorBorn::bottomZ(IRotation const &rotation) const { double c_result; swig::SwigVar_PyObject obj0; obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&rotation), SWIGTYPE_p_IRotation, 0 ); @@ -9070,16 +9070,16 @@ double SwigDirector_IFormFactorBorn::getZBottom(IRotation const &rotation) const } #if defined(SWIG_PYTHON_DIRECTOR_VTABLE) const size_t swig_method_index = 14; - const char * const swig_method_name = "getZBottom"; + const char * const swig_method_name = "bottomZ"; PyObject* method = swig_get_method(swig_method_index, swig_method_name); swig::SwigVar_PyObject result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0); #else - swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"getZBottom", (char *)"(O)" ,(PyObject *)obj0); + swig::SwigVar_PyObject result = PyObject_CallMethod(swig_get_self(), (char *)"bottomZ", (char *)"(O)" ,(PyObject *)obj0); #endif if (!result) { PyObject *error = PyErr_Occurred(); if (error) { - Swig::DirectorMethodException::raise("Error detected when calling 'IFormFactorBorn.getZBottom'"); + Swig::DirectorMethodException::raise("Error detected when calling 'IFormFactorBorn.bottomZ'"); } } double swig_val; @@ -61579,7 +61579,7 @@ fail: } -SWIGINTERN PyObject *_wrap_IFormFactor_getZBottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_IFormFactor_bottomZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; IFormFactor *arg1 = (IFormFactor *) 0 ; IRotation *arg2 = 0 ; @@ -61593,27 +61593,27 @@ SWIGINTERN PyObject *_wrap_IFormFactor_getZBottom(PyObject *SWIGUNUSEDPARM(self) bool upcall = false; double result; - if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactor_getZBottom",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactor_bottomZ",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactor, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactor_getZBottom" "', argument " "1"" of type '" "IFormFactor const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactor_bottomZ" "', argument " "1"" of type '" "IFormFactor const *""'"); } arg1 = reinterpret_cast< IFormFactor * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactor_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactor_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactor_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } arg2 = reinterpret_cast< IRotation * >(argp2); director = SWIG_DIRECTOR_CAST(arg1); upcall = (director && (director->swig_get_self()==obj0)); try { if (upcall) { - result = (double)((IFormFactor const *)arg1)->IFormFactor::getZBottom((IRotation const &)*arg2); + result = (double)((IFormFactor const *)arg1)->IFormFactor::bottomZ((IRotation const &)*arg2); } else { - result = (double)((IFormFactor const *)arg1)->getZBottom((IRotation const &)*arg2); + result = (double)((IFormFactor const *)arg1)->bottomZ((IRotation const &)*arg2); } } catch (Swig::DirectorException&) { SWIG_fail; @@ -63738,7 +63738,7 @@ fail: } -SWIGINTERN PyObject *_wrap_IFormFactorBorn_getZBottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_IFormFactorBorn_bottomZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; IFormFactorBorn *arg1 = (IFormFactorBorn *) 0 ; IRotation *arg2 = 0 ; @@ -63752,27 +63752,27 @@ SWIGINTERN PyObject *_wrap_IFormFactorBorn_getZBottom(PyObject *SWIGUNUSEDPARM(s bool upcall = false; double result; - if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_getZBottom",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorBorn_bottomZ",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorBorn, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_getZBottom" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorBorn_bottomZ" "', argument " "1"" of type '" "IFormFactorBorn const *""'"); } arg1 = reinterpret_cast< IFormFactorBorn * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorBorn_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorBorn_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorBorn_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } arg2 = reinterpret_cast< IRotation * >(argp2); director = SWIG_DIRECTOR_CAST(arg1); upcall = (director && (director->swig_get_self()==obj0)); try { if (upcall) { - result = (double)((IFormFactorBorn const *)arg1)->IFormFactorBorn::getZBottom((IRotation const &)*arg2); + result = (double)((IFormFactorBorn const *)arg1)->IFormFactorBorn::bottomZ((IRotation const &)*arg2); } else { - result = (double)((IFormFactorBorn const *)arg1)->getZBottom((IRotation const &)*arg2); + result = (double)((IFormFactorBorn const *)arg1)->bottomZ((IRotation const &)*arg2); } } catch (Swig::DirectorException&) { SWIG_fail; @@ -64017,7 +64017,7 @@ fail: } -SWIGINTERN PyObject *_wrap_IFormFactorDecorator_getZBottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_IFormFactorDecorator_bottomZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; IFormFactorDecorator *arg1 = (IFormFactorDecorator *) 0 ; IRotation *arg2 = 0 ; @@ -64029,21 +64029,21 @@ SWIGINTERN PyObject *_wrap_IFormFactorDecorator_getZBottom(PyObject *SWIGUNUSEDP PyObject * obj1 = 0 ; double result; - if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorDecorator_getZBottom",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:IFormFactorDecorator_bottomZ",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IFormFactorDecorator, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_getZBottom" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IFormFactorDecorator_bottomZ" "', argument " "1"" of type '" "IFormFactorDecorator const *""'"); } arg1 = reinterpret_cast< IFormFactorDecorator * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorDecorator_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IFormFactorDecorator_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorDecorator_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IFormFactorDecorator_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } arg2 = reinterpret_cast< IRotation * >(argp2); - result = (double)((IFormFactorDecorator const *)arg1)->getZBottom((IRotation const &)*arg2); + result = (double)((IFormFactorDecorator const *)arg1)->bottomZ((IRotation const &)*arg2); resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; fail: @@ -66560,7 +66560,7 @@ fail: } -SWIGINTERN PyObject *_wrap_FormFactorCrystal_getZBottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_FormFactorCrystal_bottomZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; FormFactorCrystal *arg1 = (FormFactorCrystal *) 0 ; IRotation *arg2 = 0 ; @@ -66572,21 +66572,21 @@ SWIGINTERN PyObject *_wrap_FormFactorCrystal_getZBottom(PyObject *SWIGUNUSEDPARM PyObject * obj1 = 0 ; double result; - if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCrystal_getZBottom",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorCrystal_bottomZ",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorCrystal, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_getZBottom" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorCrystal_bottomZ" "', argument " "1"" of type '" "FormFactorCrystal const *""'"); } arg1 = reinterpret_cast< FormFactorCrystal * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCrystal_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorCrystal_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorCrystal_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorCrystal_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } arg2 = reinterpret_cast< IRotation * >(argp2); - result = (double)((FormFactorCrystal const *)arg1)->getZBottom((IRotation const &)*arg2); + result = (double)((FormFactorCrystal const *)arg1)->bottomZ((IRotation const &)*arg2); resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; fail: @@ -73142,7 +73142,7 @@ fail: } -SWIGINTERN PyObject *_wrap_FormFactorWeighted_getZBottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_FormFactorWeighted_bottomZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; FormFactorWeighted *arg1 = (FormFactorWeighted *) 0 ; IRotation *arg2 = 0 ; @@ -73154,21 +73154,21 @@ SWIGINTERN PyObject *_wrap_FormFactorWeighted_getZBottom(PyObject *SWIGUNUSEDPAR PyObject * obj1 = 0 ; double result; - if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_getZBottom",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:FormFactorWeighted_bottomZ",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FormFactorWeighted, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_getZBottom" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FormFactorWeighted_bottomZ" "', argument " "1"" of type '" "FormFactorWeighted const *""'"); } arg1 = reinterpret_cast< FormFactorWeighted * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_IRotation, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FormFactorWeighted_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorWeighted_getZBottom" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FormFactorWeighted_bottomZ" "', argument " "2"" of type '" "IRotation const &""'"); } arg2 = reinterpret_cast< IRotation * >(argp2); - result = (double)((FormFactorWeighted const *)arg1)->getZBottom((IRotation const &)*arg2); + result = (double)((FormFactorWeighted const *)arg1)->bottomZ((IRotation const &)*arg2); resultobj = SWIG_From_double(static_cast< double >(result)); return resultobj; fail: @@ -113551,10 +113551,10 @@ static PyMethodDef SwigMethods[] = { "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" ""}, - { (char *)"IFormFactor_getZBottom", _wrap_IFormFactor_getZBottom, METH_VARARGS, (char *)"\n" - "IFormFactor_getZBottom(IFormFactor self, IRotation rotation) -> double\n" + { (char *)"IFormFactor_bottomZ", _wrap_IFormFactor_bottomZ, METH_VARARGS, (char *)"\n" + "IFormFactor_bottomZ(IFormFactor self, IRotation rotation) -> double\n" "\n" - "double IFormFactor::getZBottom(const IRotation &rotation) const\n" + "double IFormFactor::bottomZ(const IRotation &rotation) const\n" "\n" "Returns the z-coordinate of the lowest point in this shape after a given rotation. \n" "\n" @@ -113665,10 +113665,10 @@ static PyMethodDef SwigMethods[] = { "Returns scattering amplitude for complex wavevectors ki, kf. \n" "\n" ""}, - { (char *)"IFormFactorBorn_getZBottom", _wrap_IFormFactorBorn_getZBottom, METH_VARARGS, (char *)"\n" - "IFormFactorBorn_getZBottom(IFormFactorBorn self, IRotation rotation) -> double\n" + { (char *)"IFormFactorBorn_bottomZ", _wrap_IFormFactorBorn_bottomZ, METH_VARARGS, (char *)"\n" + "IFormFactorBorn_bottomZ(IFormFactorBorn self, IRotation rotation) -> double\n" "\n" - "double IFormFactorBorn::getZBottom(const IRotation &rotation) const override\n" + "double IFormFactorBorn::bottomZ(const IRotation &rotation) const override\n" "\n" "Returns the z-coordinate of the lowest point in this shape after a given rotation. \n" "\n" @@ -113729,10 +113729,10 @@ static PyMethodDef SwigMethods[] = { "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" ""}, - { (char *)"IFormFactorDecorator_getZBottom", _wrap_IFormFactorDecorator_getZBottom, METH_VARARGS, (char *)"\n" - "IFormFactorDecorator_getZBottom(IFormFactorDecorator self, IRotation rotation) -> double\n" + { (char *)"IFormFactorDecorator_bottomZ", _wrap_IFormFactorDecorator_bottomZ, METH_VARARGS, (char *)"\n" + "IFormFactorDecorator_bottomZ(IFormFactorDecorator self, IRotation rotation) -> double\n" "\n" - "double IFormFactorDecorator::getZBottom(const IRotation &rotation) const override\n" + "double IFormFactorDecorator::bottomZ(const IRotation &rotation) const override\n" "\n" "Returns the z-coordinate of the lowest point in this shape after a given rotation. \n" "\n" @@ -114297,10 +114297,10 @@ static PyMethodDef SwigMethods[] = { "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" ""}, - { (char *)"FormFactorCrystal_getZBottom", _wrap_FormFactorCrystal_getZBottom, METH_VARARGS, (char *)"\n" - "FormFactorCrystal_getZBottom(FormFactorCrystal self, IRotation rotation) -> double\n" + { (char *)"FormFactorCrystal_bottomZ", _wrap_FormFactorCrystal_bottomZ, METH_VARARGS, (char *)"\n" + "FormFactorCrystal_bottomZ(FormFactorCrystal self, IRotation rotation) -> double\n" "\n" - "double FormFactorCrystal::getZBottom(const IRotation &rotation) const override\n" + "double FormFactorCrystal::bottomZ(const IRotation &rotation) const override\n" "\n" "Returns the z-coordinate of the lowest point in this shape after a given rotation. \n" "\n" @@ -116009,10 +116009,10 @@ static PyMethodDef SwigMethods[] = { "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" ""}, - { (char *)"FormFactorWeighted_getZBottom", _wrap_FormFactorWeighted_getZBottom, METH_VARARGS, (char *)"\n" - "FormFactorWeighted_getZBottom(FormFactorWeighted self, IRotation rotation) -> double\n" + { (char *)"FormFactorWeighted_bottomZ", _wrap_FormFactorWeighted_bottomZ, METH_VARARGS, (char *)"\n" + "FormFactorWeighted_bottomZ(FormFactorWeighted self, IRotation rotation) -> double\n" "\n" - "double FormFactorWeighted::getZBottom(const IRotation &rotation) const overridefinal\n" + "double FormFactorWeighted::bottomZ(const IRotation &rotation) const overridefinal\n" "\n" "Returns the z-coordinate of the lowest point in this shape after a given rotation. \n" "\n" diff --git a/auto/Wrap/libBornAgainCore_wrap.h b/auto/Wrap/libBornAgainCore_wrap.h index d25758887ec..7f5ba551d24 100644 --- a/auto/Wrap/libBornAgainCore_wrap.h +++ b/auto/Wrap/libBornAgainCore_wrap.h @@ -329,7 +329,7 @@ public: virtual complex_t evaluate(WavevectorInfo const &wavevectors) const; virtual double getVolume() const; virtual double getRadialExtension() const; - virtual double getZBottom(IRotation const &rotation) const; + virtual double bottomZ(IRotation const &rotation) const; virtual void setSpecularInfo(ILayerRTCoefficients const *arg0, ILayerRTCoefficients const *arg1); /* Internal director utilities */ @@ -386,7 +386,7 @@ public: virtual complex_t evaluate(WavevectorInfo const &wavevectors) const; virtual double getVolume() const; virtual double getRadialExtension() const; - virtual double getZBottom(IRotation const &rotation) const; + virtual double bottomZ(IRotation const &rotation) const; virtual void setSpecularInfo(ILayerRTCoefficients const *arg0, ILayerRTCoefficients const *arg1); virtual complex_t evaluate_for_q(cvector_t const q) const; -- GitLab