From 6b21d2037ca652325288895b8e78af32f8c1d703 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 29 Jun 2020 07:20:34 +0200
Subject: [PATCH] Core Polyhedron: rm unused member and getter
---
Core/HardParticle/FormFactorPolyhedron.h | 2 --
auto/Wrap/doxygen_core.i | 3 ---
auto/Wrap/libBornAgainCore.py | 8 -------
auto/Wrap/libBornAgainCore_wrap.cpp | 28 ------------------------
4 files changed, 41 deletions(-)
diff --git a/Core/HardParticle/FormFactorPolyhedron.h b/Core/HardParticle/FormFactorPolyhedron.h
index 3c61a11e723..9f8ac8cebb5 100644
--- a/Core/HardParticle/FormFactorPolyhedron.h
+++ b/Core/HardParticle/FormFactorPolyhedron.h
@@ -67,7 +67,6 @@ public:
bool _sym_S2 = false);
double area() const { return m_area; }
- kvector_t center() const { return m_center; }
double pyramidalVolume() const { return m_rperp * m_area / 3; }
double radius3d() const { return m_radius_3d; }
//! Returns conj(q)*normal [BasicVector3D::dot is antilinear in 'this' argument]
@@ -88,7 +87,6 @@ private:
double m_rperp; //!< distance of this polygon's plane from the origin, along 'm_normal'
double m_radius_2d; //!< radius of enclosing cylinder
double m_radius_3d; //!< radius of enclosing sphere
- kvector_t m_center; //!< center of mass
void decompose_q(cvector_t q, complex_t& qperp, cvector_t& qpa) const;
complex_t ff_n_core(int m, cvector_t qpa, complex_t qperp) const;
diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i
index 197cecb221e..825014fe66e 100644
--- a/auto/Wrap/doxygen_core.i
+++ b/auto/Wrap/doxygen_core.i
@@ -13049,9 +13049,6 @@ true if face has a perpedicular two-fold symmetry axis
%feature("docstring") PolyhedralFace::area "double PolyhedralFace::area() const
";
-%feature("docstring") PolyhedralFace::center "kvector_t PolyhedralFace::center() const
-";
-
%feature("docstring") PolyhedralFace::pyramidalVolume "double PolyhedralFace::pyramidalVolume() const
";
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 0f0ff976ab6..3c6202b7a2a 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -9278,14 +9278,6 @@ class PolyhedralFace(object):
"""
return _libBornAgainCore.PolyhedralFace_area(self)
- def center(self):
- r"""
- center(PolyhedralFace self) -> kvector_t
- kvector_t PolyhedralFace::center() const
-
- """
- return _libBornAgainCore.PolyhedralFace_center(self)
-
def pyramidalVolume(self):
r"""
pyramidalVolume(PolyhedralFace self) -> double
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 8a0a4d7994d..97eca9d516d 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -68197,29 +68197,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_PolyhedralFace_center(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- PolyhedralFace *arg1 = (PolyhedralFace *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- kvector_t result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PolyhedralFace, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolyhedralFace_center" "', argument " "1"" of type '" "PolyhedralFace const *""'");
- }
- arg1 = reinterpret_cast< PolyhedralFace * >(argp1);
- result = ((PolyhedralFace const *)arg1)->center();
- resultobj = SWIG_NewPointerObj((new kvector_t(static_cast< const kvector_t& >(result))), SWIGTYPE_p_BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_PolyhedralFace_pyramidalVolume(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
PolyhedralFace *arg1 = (PolyhedralFace *) 0 ;
@@ -126678,11 +126655,6 @@ static PyMethodDef SwigMethods[] = {
"double PolyhedralFace::area() const\n"
"\n"
""},
- { "PolyhedralFace_center", _wrap_PolyhedralFace_center, METH_O, "\n"
- "PolyhedralFace_center(PolyhedralFace self) -> kvector_t\n"
- "kvector_t PolyhedralFace::center() const\n"
- "\n"
- ""},
{ "PolyhedralFace_pyramidalVolume", _wrap_PolyhedralFace_pyramidalVolume, METH_O, "\n"
"PolyhedralFace_pyramidalVolume(PolyhedralFace self) -> double\n"
"double PolyhedralFace::pyramidalVolume() const\n"
--
GitLab