From 1d307ce3159dffc2713c523c0446ee5580943560 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 28 May 2022 08:42:29 +0200
Subject: [PATCH] rm indirecting fct
---
Sim/Simulation/SpecularSimulation.cpp | 8 +------
Sim/Simulation/SpecularSimulation.h | 3 ---
auto/Wrap/doxygenSim.i | 5 -----
auto/Wrap/libBornAgainSim.py | 10 ---------
auto/Wrap/libBornAgainSim_wrap.cpp | 30 ---------------------------
5 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/Sim/Simulation/SpecularSimulation.cpp b/Sim/Simulation/SpecularSimulation.cpp
index b4cc2264233..514b24afeb3 100644
--- a/Sim/Simulation/SpecularSimulation.cpp
+++ b/Sim/Simulation/SpecularSimulation.cpp
@@ -50,19 +50,13 @@ size_t SpecularSimulation::numberOfElements() const
SimulationResult SpecularSimulation::pack_result()
{
- Powerfield<double> data(*coordinateAxis());
+ Powerfield<double> data(*m_scan->coordinateAxis());
ASSERT(!m_eles.empty());
data.setRawDataVector(m_scan->createIntensities(m_eles));
return {data, createCoordSystem()};
}
-const IAxis* SpecularSimulation::coordinateAxis() const
-{
- ASSERT(m_scan->coordinateAxis());
- return m_scan->coordinateAxis();
-}
-
size_t SpecularSimulation::intensityMapSize() const
{
return m_scan->coordinateAxis()->size();
diff --git a/Sim/Simulation/SpecularSimulation.h b/Sim/Simulation/SpecularSimulation.h
index b887c1f3e6d..beda7c32b5a 100644
--- a/Sim/Simulation/SpecularSimulation.h
+++ b/Sim/Simulation/SpecularSimulation.h
@@ -38,9 +38,6 @@ public:
std::string className() const final { return "SpecularSimulation"; }
- //! Returns a pointer to coordinate axis.
- const IAxis* coordinateAxis() const;
-
//! Returns the total number of the intensity values in the simulation result
size_t intensityMapSize() const override;
diff --git a/auto/Wrap/doxygenSim.i b/auto/Wrap/doxygenSim.i
index 0ce5f02da08..03ec48e6170 100644
--- a/auto/Wrap/doxygenSim.i
+++ b/auto/Wrap/doxygenSim.i
@@ -1934,11 +1934,6 @@ C++ includes: SpecularSimulation.h
%feature("docstring") SpecularSimulation::className "std::string SpecularSimulation::className() const final
";
-%feature("docstring") SpecularSimulation::coordinateAxis "const IAxis * SpecularSimulation::coordinateAxis() const
-
-Returns a pointer to coordinate axis.
-";
-
%feature("docstring") SpecularSimulation::intensityMapSize "size_t SpecularSimulation::intensityMapSize() const override
Returns the total number of the intensity values in the simulation result.
diff --git a/auto/Wrap/libBornAgainSim.py b/auto/Wrap/libBornAgainSim.py
index e044534cd67..1d2665ec732 100644
--- a/auto/Wrap/libBornAgainSim.py
+++ b/auto/Wrap/libBornAgainSim.py
@@ -3790,16 +3790,6 @@ class SpecularSimulation(ISimulation):
"""
return _libBornAgainSim.SpecularSimulation_className(self)
- def coordinateAxis(self):
- r"""
- coordinateAxis(SpecularSimulation self) -> IAxis
- const IAxis * SpecularSimulation::coordinateAxis() const
-
- Returns a pointer to coordinate axis.
-
- """
- return _libBornAgainSim.SpecularSimulation_coordinateAxis(self)
-
def intensityMapSize(self):
r"""
intensityMapSize(SpecularSimulation self) -> size_t
diff --git a/auto/Wrap/libBornAgainSim_wrap.cpp b/auto/Wrap/libBornAgainSim_wrap.cpp
index e4c4ad519d4..da89bd3b51c 100644
--- a/auto/Wrap/libBornAgainSim_wrap.cpp
+++ b/auto/Wrap/libBornAgainSim_wrap.cpp
@@ -38968,29 +38968,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SpecularSimulation_coordinateAxis(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- IAxis *result = 0 ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SpecularSimulation, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpecularSimulation_coordinateAxis" "', argument " "1"" of type '" "SpecularSimulation const *""'");
- }
- arg1 = reinterpret_cast< SpecularSimulation * >(argp1);
- result = (IAxis *)((SpecularSimulation const *)arg1)->coordinateAxis();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IAxis, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_SpecularSimulation_intensityMapSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
SpecularSimulation *arg1 = (SpecularSimulation *) 0 ;
@@ -42394,13 +42371,6 @@ static PyMethodDef SwigMethods[] = {
"std::string SpecularSimulation::className() const final\n"
"\n"
""},
- { "SpecularSimulation_coordinateAxis", _wrap_SpecularSimulation_coordinateAxis, METH_O, "\n"
- "SpecularSimulation_coordinateAxis(SpecularSimulation self) -> IAxis\n"
- "const IAxis * SpecularSimulation::coordinateAxis() const\n"
- "\n"
- "Returns a pointer to coordinate axis. \n"
- "\n"
- ""},
{ "SpecularSimulation_intensityMapSize", _wrap_SpecularSimulation_intensityMapSize, METH_O, "\n"
"SpecularSimulation_intensityMapSize(SpecularSimulation self) -> size_t\n"
"size_t SpecularSimulation::intensityMapSize() const override\n"
--
GitLab