From aa2ded54b2fb767aebc0b16871e865b7b4e0b756 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 15 Nov 2020 19:44:03 +0100
Subject: [PATCH] rm Interference..SuperLattice::create..
---
.../InterferenceFunction2DSuperLattice.cpp | 22 -----
.../InterferenceFunction2DSuperLattice.h | 5 -
auto/Wrap/libBornAgainSample.py | 18 ----
auto/Wrap/libBornAgainSample_wrap.cpp | 94 -------------------
4 files changed, 139 deletions(-)
diff --git a/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp b/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp
index 8d7b58ecd57..e02256b309e 100644
--- a/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp
+++ b/Sample/Aggregate/InterferenceFunction2DSuperLattice.cpp
@@ -72,28 +72,6 @@ const IInterferenceFunction& InterferenceFunction2DSuperLattice::substructureIFF
return *m_substructure;
}
-//! Creates square lattice.
-// @param lattice_length: length of first and second lattice vectors in nanometers
-// @param xi: rotation of lattice with respect to x-axis in radians
-InterferenceFunction2DSuperLattice*
-InterferenceFunction2DSuperLattice::createSquare(double lattice_length, double xi, unsigned size_1,
- unsigned size_2)
-{
- return new InterferenceFunction2DSuperLattice(SquareLattice(lattice_length, xi), size_1,
- size_2);
-}
-
-//! Creates hexagonal lattice.
-// @param lattice_length: length of first and second lattice vectors in nanometers
-// @param xi: rotation of lattice with respect to x-axis in radians
-InterferenceFunction2DSuperLattice*
-InterferenceFunction2DSuperLattice::createHexagonal(double lattice_length, double xi,
- unsigned size_1, unsigned size_2)
-{
- return new InterferenceFunction2DSuperLattice(HexagonalLattice(lattice_length, xi), size_1,
- size_2);
-}
-
double InterferenceFunction2DSuperLattice::evaluate(const kvector_t q, double outer_iff) const
{
m_outer_iff = outer_iff;
diff --git a/Sample/Aggregate/InterferenceFunction2DSuperLattice.h b/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
index 9f6cff8f562..2dcd7264bfd 100644
--- a/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
+++ b/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
@@ -37,11 +37,6 @@ public:
void setSubstructureIFF(const IInterferenceFunction& sub_iff);
const IInterferenceFunction& substructureIFF() const;
- static InterferenceFunction2DSuperLattice* createSquare(double lattice_length, double xi,
- unsigned size_1, unsigned size_2);
- static InterferenceFunction2DSuperLattice* createHexagonal(double lattice_length, double xi,
- unsigned size_1, unsigned size_2);
-
double evaluate(const kvector_t q, double outer_iff = 1.0) const override final;
unsigned domainSize1() const { return m_size_1; }
unsigned domainSize2() const { return m_size_2; }
diff --git a/auto/Wrap/libBornAgainSample.py b/auto/Wrap/libBornAgainSample.py
index 786ec57068f..789a6fb62ff 100644
--- a/auto/Wrap/libBornAgainSample.py
+++ b/auto/Wrap/libBornAgainSample.py
@@ -7301,16 +7301,6 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
"""
return _libBornAgainSample.InterferenceFunction2DSuperLattice_substructureIFF(self)
- @staticmethod
- def createSquare(lattice_length, xi, size_1, size_2):
- r"""createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
- return _libBornAgainSample.InterferenceFunction2DSuperLattice_createSquare(lattice_length, xi, size_1, size_2)
-
- @staticmethod
- def createHexagonal(lattice_length, xi, size_1, size_2):
- r"""createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
- return _libBornAgainSample.InterferenceFunction2DSuperLattice_createHexagonal(lattice_length, xi, size_1, size_2)
-
def evaluate(self, q, outer_iff=1.0):
r"""
evaluate(InterferenceFunction2DSuperLattice self, kvector_t q, double outer_iff=1.0) -> double
@@ -7372,14 +7362,6 @@ class InterferenceFunction2DSuperLattice(IInterferenceFunction):
# Register InterferenceFunction2DSuperLattice in _libBornAgainSample:
_libBornAgainSample.InterferenceFunction2DSuperLattice_swigregister(InterferenceFunction2DSuperLattice)
-def InterferenceFunction2DSuperLattice_createSquare(lattice_length, xi, size_1, size_2):
- r"""InterferenceFunction2DSuperLattice_createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
- return _libBornAgainSample.InterferenceFunction2DSuperLattice_createSquare(lattice_length, xi, size_1, size_2)
-
-def InterferenceFunction2DSuperLattice_createHexagonal(lattice_length, xi, size_1, size_2):
- r"""InterferenceFunction2DSuperLattice_createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"""
- return _libBornAgainSample.InterferenceFunction2DSuperLattice_createHexagonal(lattice_length, xi, size_1, size_2)
-
class InterferenceFunction3DLattice(IInterferenceFunction):
r"""
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index f5ce2b76269..b054f0a41b3 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -53451,98 +53451,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_createSquare(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double arg2 ;
- unsigned int arg3 ;
- unsigned int arg4 ;
- double val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- unsigned int val3 ;
- int ecode3 = 0 ;
- unsigned int val4 ;
- int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
- InterferenceFunction2DSuperLattice *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_createSquare", 4, 4, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "3"" of type '" "unsigned int""'");
- }
- arg3 = static_cast< unsigned int >(val3);
- ecode4 = SWIG_AsVal_unsigned_SS_int(swig_obj[3], &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunction2DSuperLattice_createSquare" "', argument " "4"" of type '" "unsigned int""'");
- }
- arg4 = static_cast< unsigned int >(val4);
- result = (InterferenceFunction2DSuperLattice *)InterferenceFunction2DSuperLattice::createSquare(arg1,arg2,arg3,arg4);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_InterferenceFunction2DSuperLattice, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_createHexagonal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double arg2 ;
- unsigned int arg3 ;
- unsigned int arg4 ;
- double val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- unsigned int val3 ;
- int ecode3 = 0 ;
- unsigned int val4 ;
- int ecode4 = 0 ;
- PyObject *swig_obj[4] ;
- InterferenceFunction2DSuperLattice *result = 0 ;
-
- if (!SWIG_Python_UnpackTuple(args, "InterferenceFunction2DSuperLattice_createHexagonal", 4, 4, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_unsigned_SS_int(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "3"" of type '" "unsigned int""'");
- }
- arg3 = static_cast< unsigned int >(val3);
- ecode4 = SWIG_AsVal_unsigned_SS_int(swig_obj[3], &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "InterferenceFunction2DSuperLattice_createHexagonal" "', argument " "4"" of type '" "unsigned int""'");
- }
- arg4 = static_cast< unsigned int >(val4);
- result = (InterferenceFunction2DSuperLattice *)InterferenceFunction2DSuperLattice::createHexagonal(arg1,arg2,arg3,arg4);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_InterferenceFunction2DSuperLattice, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_InterferenceFunction2DSuperLattice_evaluate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
InterferenceFunction2DSuperLattice *arg1 = (InterferenceFunction2DSuperLattice *) 0 ;
@@ -73344,8 +73252,6 @@ static PyMethodDef SwigMethods[] = {
"const IInterferenceFunction & InterferenceFunction2DSuperLattice::substructureIFF() const\n"
"\n"
""},
- { "InterferenceFunction2DSuperLattice_createSquare", _wrap_InterferenceFunction2DSuperLattice_createSquare, METH_VARARGS, "InterferenceFunction2DSuperLattice_createSquare(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"},
- { "InterferenceFunction2DSuperLattice_createHexagonal", _wrap_InterferenceFunction2DSuperLattice_createHexagonal, METH_VARARGS, "InterferenceFunction2DSuperLattice_createHexagonal(double lattice_length, double xi, unsigned int size_1, unsigned int size_2) -> InterferenceFunction2DSuperLattice"},
{ "InterferenceFunction2DSuperLattice_evaluate", _wrap_InterferenceFunction2DSuperLattice_evaluate, METH_VARARGS, "\n"
"InterferenceFunction2DSuperLattice_evaluate(InterferenceFunction2DSuperLattice self, kvector_t q, double outer_iff=1.0) -> double\n"
"double InterferenceFunction2DSuperLattice::evaluate(const kvector_t q, double outer_iff=1.0) const override final\n"
--
GitLab