diff --git a/Core/Simulation/ISimulation.h b/Core/Simulation/ISimulation.h index 04e6a4472489ef5b0075e14adcda8ec7e0d5329d..39fc774780cda9d115751af2b715fa33ef538de9 100644 --- a/Core/Simulation/ISimulation.h +++ b/Core/Simulation/ISimulation.h @@ -43,9 +43,6 @@ public: ISimulation(); virtual ~ISimulation(); - //! Put into a clean state for running a simulation - virtual void prepareSimulation(); - //! Run a simulation, possibly averaged over parameter distributions void runSimulation(); @@ -102,6 +99,9 @@ public: #endif // SWIG protected: + //! Put into a clean state for running a simulation + virtual void prepareSimulation(); + //! Creates the appropriate data structure (e.g. 2D intensity map) from the calculated //! DiffuseElement objects virtual void transferResultsToIntensityMap() {} diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i index dbb31555369a6a54d283bbcb9862c3887c4b1970..346f7c8706092f7fb97fe91dc69162fd5755788b 100644 --- a/auto/Wrap/doxygenCore.i +++ b/auto/Wrap/doxygenCore.i @@ -943,11 +943,6 @@ C++ includes: ISimulation.h %feature("docstring") ISimulation::~ISimulation "ISimulation::~ISimulation() "; -%feature("docstring") ISimulation::prepareSimulation "void ISimulation::prepareSimulation() - -Put into a clean state for running a simulation. -"; - %feature("docstring") ISimulation::runSimulation "void ISimulation::runSimulation() Run a simulation, possibly averaged over parameter distributions. diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py index 2dc23a0f0453586d2c295458cef60c84c76c1320..92e578d742a01ab95ba57fafc3e4e985454fbf1e 100644 --- a/auto/Wrap/libBornAgainCore.py +++ b/auto/Wrap/libBornAgainCore.py @@ -3476,16 +3476,6 @@ class ISimulation(libBornAgainParam.INode): __repr__ = _swig_repr __swig_destroy__ = _libBornAgainCore.delete_ISimulation - def prepareSimulation(self): - r""" - prepareSimulation(ISimulation self) - void ISimulation::prepareSimulation() - - Put into a clean state for running a simulation. - - """ - return _libBornAgainCore.ISimulation_prepareSimulation(self) - def runSimulation(self): r""" runSimulation(ISimulation self) diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp index d86e4117070743401bdc31c609cc6d73021e37a3..bb96bc420f90ba79d273e4201a65b32f585ccd09 100644 --- a/auto/Wrap/libBornAgainCore_wrap.cpp +++ b/auto/Wrap/libBornAgainCore_wrap.cpp @@ -38771,28 +38771,6 @@ fail: } -SWIGINTERN PyObject *_wrap_ISimulation_prepareSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - ISimulation *arg1 = (ISimulation *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - - if (!args) SWIG_fail; - swig_obj[0] = args; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISimulation, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISimulation_prepareSimulation" "', argument " "1"" of type '" "ISimulation *""'"); - } - arg1 = reinterpret_cast< ISimulation * >(argp1); - (arg1)->prepareSimulation(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_ISimulation_runSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; ISimulation *arg1 = (ISimulation *) 0 ; @@ -44331,13 +44309,6 @@ static PyMethodDef SwigMethods[] = { "ISimulation::~ISimulation()\n" "\n" ""}, - { "ISimulation_prepareSimulation", _wrap_ISimulation_prepareSimulation, METH_O, "\n" - "ISimulation_prepareSimulation(ISimulation self)\n" - "void ISimulation::prepareSimulation()\n" - "\n" - "Put into a clean state for running a simulation. \n" - "\n" - ""}, { "ISimulation_runSimulation", _wrap_ISimulation_runSimulation, METH_O, "\n" "ISimulation_runSimulation(ISimulation self)\n" "void ISimulation::runSimulation()\n"