diff --git a/Sample/HardParticle/IFormFactorPrism.cpp b/Sample/HardParticle/IFormfactorPrism.cpp similarity index 70% rename from Sample/HardParticle/IFormFactorPrism.cpp rename to Sample/HardParticle/IFormfactorPrism.cpp index e28b59c3ad23277bf8802b8f17cd9bf5f40bb648..b20a71d58ec3889ecb2f252021e9becd3611c5e5 100644 --- a/Sample/HardParticle/IFormFactorPrism.cpp +++ b/Sample/HardParticle/IFormfactorPrism.cpp @@ -2,8 +2,8 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Sample/HardParticle/IFormFactorPrism.cpp -//! @brief Implements interface IFormFactorPrism. +//! @file Sample/HardParticle/IFormfactorPrism.cpp +//! @brief Implements interface IFormfactorPrism. //! //! @homepage http://www.bornagainproject.org //! @license GNU General Public License v3 or higher (see COPYING) @@ -12,14 +12,14 @@ // // ************************************************************************************************ -#include "Sample/HardParticle/IFormFactorPrism.h" +#include "Sample/HardParticle/IFormfactorPrism.h" #include "Base/Util/Assert.h" #include "Sample/Particle/PolyhedralUtil.h" #include <ff/Prism.h> -IFormFactorPrism::IFormFactorPrism(const std::vector<double>& PValues) +IFormfactorPrism::IFormfactorPrism(const std::vector<double>& PValues) : IFormFactorPolyhedron(PValues) { } -IFormFactorPrism::~IFormFactorPrism() = default; +IFormfactorPrism::~IFormfactorPrism() = default; diff --git a/Sample/HardParticle/IFormFactorPrism.h b/Sample/HardParticle/IFormfactorPrism.h similarity index 81% rename from Sample/HardParticle/IFormFactorPrism.h rename to Sample/HardParticle/IFormfactorPrism.h index 8f0f09fef4a704386fd99dac4b3be5c049dd7b36..e0580c4867ee4fee48e22d9ae86163cb1172822b 100644 --- a/Sample/HardParticle/IFormFactorPrism.h +++ b/Sample/HardParticle/IFormfactorPrism.h @@ -2,8 +2,8 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Sample/HardParticle/IFormFactorPrism.h -//! @brief Defines interface IFormFactorPrism. +//! @file Sample/HardParticle/IFormfactorPrism.h +//! @brief Defines interface IFormfactorPrism. //! //! @homepage http://www.bornagainproject.org //! @license GNU General Public License v3 or higher (see COPYING) @@ -19,10 +19,10 @@ //! A prism with a polygonal base, for form factor computation. -class IFormFactorPrism : public IFormFactorPolyhedron { +class IFormfactorPrism : public IFormFactorPolyhedron { public: - IFormFactorPrism(const std::vector<double>& PValues); - ~IFormFactorPrism() override; + IFormfactorPrism(const std::vector<double>& PValues); + ~IFormfactorPrism() override; virtual double height() const = 0; diff --git a/Sample/HardParticle/Polyhedra.cpp b/Sample/HardParticle/Polyhedra.cpp index 94d8f5937ea1d204b60b06cef3480268c157f373..bc54440f0154695414850b26c474faab41aea5ac 100644 --- a/Sample/HardParticle/Polyhedra.cpp +++ b/Sample/HardParticle/Polyhedra.cpp @@ -24,7 +24,7 @@ using std::numbers::pi; // ************************************************************************************************ Box::Box(const std::vector<double> P) - : IFormFactorPrism(P) + : IFormfactorPrism(P) , m_length(m_P[0]) , m_width(m_P[1]) , m_height(m_P[2]) @@ -49,7 +49,7 @@ Box::Box(double length, double width, double height) Prism3::Prism3(const std::vector<double> P) - : IFormFactorPrism(P) + : IFormfactorPrism(P) , m_base_edge(m_P[0]) , m_height(m_P[1]) { @@ -90,7 +90,7 @@ Prism3::Prism3(double base_edge, double height) Prism6::Prism6(const std::vector<double> P) - : IFormFactorPrism(P) + : IFormfactorPrism(P) , m_base_edge(m_P[0]) , m_height(m_P[1]) { diff --git a/Sample/HardParticle/Polyhedra.h b/Sample/HardParticle/Polyhedra.h index 3aa9a005ea55d8fa151afbbe71305b887131536a..7a91dd751bdec174d0a8e489b9fb51f38b462c92 100644 --- a/Sample/HardParticle/Polyhedra.h +++ b/Sample/HardParticle/Polyhedra.h @@ -16,7 +16,7 @@ #define BORNAGAIN_SAMPLE_HARDPARTICLE_POLYHEDRA_H #include "Sample/HardParticle/IFormFactorPolyhedron.h" -#include "Sample/HardParticle/IFormFactorPrism.h" +#include "Sample/HardParticle/IFormfactorPrism.h" // ************************************************************************************************ // Prisms @@ -24,7 +24,7 @@ //! A rectangular prism (parallelepiped). -class Box : public IFormFactorPrism { +class Box : public IFormfactorPrism { public: Box(double length, double width, double height); Box(std::vector<double> P); @@ -51,7 +51,7 @@ private: //! A prism based on an equilateral triangle. -class Prism3 : public IFormFactorPrism { +class Prism3 : public IFormfactorPrism { public: Prism3(double base_edge, double height); Prism3(std::vector<double> P); @@ -72,7 +72,7 @@ private: //! A prism based on a regular hexagonal. -class Prism6 : public IFormFactorPrism { +class Prism6 : public IFormfactorPrism { public: Prism6(double base_edge, double height); Prism6(std::vector<double> P); diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i index 237c37dd6949604216fe7445cf8d4e731e856c76..93f8a1afd5ad64769da6c45639b3f11d46c6661c 100644 --- a/Wrap/Swig/libBornAgainSample.i +++ b/Wrap/Swig/libBornAgainSample.i @@ -104,7 +104,7 @@ %include "Sample/Interface/RoughnessModels.h" %include "Sample/HardParticle/IFormFactorPolyhedron.h" -%include "Sample/HardParticle/IFormFactorPrism.h" +%include "Sample/HardParticle/IFormfactorPrism.h" %include "Sample/HardParticle/IProfileRipple.h" %include "Sample/HardParticle/Polyhedra.h"