Skip to content
Snippets Groups Projects
Commit 1d307ce3 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm indirecting fct

parent 5c2d4a5b
No related branches found
No related tags found
1 merge request!924DepthProbeSim w/o detector; rm Detector1D; merge IDetector2D into IDetector
......@@ -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();
......
......@@ -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;
......
......@@ -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.
......
......@@ -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
......
......@@ -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"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment