From 909f9a9cc85d40c54ba200f0678f45fb8418dfb5 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Tue, 10 Nov 2020 21:51:06 +0100 Subject: [PATCH] ctd --- Core/Simulation/Simulation.cpp | 5 ----- Core/Simulation/Simulation.h | 1 - auto/Wrap/doxygenCore.i | 3 --- auto/Wrap/libBornAgainCore.py | 8 -------- auto/Wrap/libBornAgainCore_wrap.cpp | 27 --------------------------- 5 files changed, 44 deletions(-) diff --git a/Core/Simulation/Simulation.cpp b/Core/Simulation/Simulation.cpp index 02f10d87e50..097d113d6af 100644 --- a/Core/Simulation/Simulation.cpp +++ b/Core/Simulation/Simulation.cpp @@ -158,11 +158,6 @@ void Simulation::setDetectorResolutionFunction(const IResolutionFunction2D& reso instrument().setDetectorResolutionFunction(resolution_function); } -void Simulation::removeDetectorResolutionFunction() -{ - instrument().removeDetectorResolution(); -} - //! Sets the polarization analyzer characteristics of the detector void Simulation::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission) diff --git a/Core/Simulation/Simulation.h b/Core/Simulation/Simulation.h index 8dda1d7137c..e3d6c5e2c26 100644 --- a/Core/Simulation/Simulation.h +++ b/Core/Simulation/Simulation.h @@ -61,7 +61,6 @@ public: void setBeamPolarization(const kvector_t bloch_vector); void setDetectorResolutionFunction(const IResolutionFunction2D& resolution_function); - void removeDetectorResolutionFunction(); void setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission); diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i index 77e96876936..1a914850962 100644 --- a/auto/Wrap/doxygenCore.i +++ b/auto/Wrap/doxygenCore.i @@ -2013,9 +2013,6 @@ Sets the beam polarization according to the given Bloch vector. %feature("docstring") Simulation::setDetectorResolutionFunction "void Simulation::setDetectorResolutionFunction(const IResolutionFunction2D &resolution_function) "; -%feature("docstring") Simulation::removeDetectorResolutionFunction "void Simulation::removeDetectorResolutionFunction() -"; - %feature("docstring") Simulation::setAnalyzerProperties "void Simulation::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission) Sets the polarization analyzer characteristics of the detector. diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py index a51214000b7..4f87c61aca4 100644 --- a/auto/Wrap/libBornAgainCore.py +++ b/auto/Wrap/libBornAgainCore.py @@ -3689,14 +3689,6 @@ class Simulation(libBornAgainBase.ICloneable, libBornAgainParam.INode): """ return _libBornAgainCore.Simulation_setDetectorResolutionFunction(self, resolution_function) - def removeDetectorResolutionFunction(self): - r""" - removeDetectorResolutionFunction(Simulation self) - void Simulation::removeDetectorResolutionFunction() - - """ - return _libBornAgainCore.Simulation_removeDetectorResolutionFunction(self) - def setAnalyzerProperties(self, direction, efficiency, total_transmission): r""" setAnalyzerProperties(Simulation self, kvector_t direction, double efficiency, double total_transmission) diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp index c474f1ac296..43e8de257f3 100644 --- a/auto/Wrap/libBornAgainCore_wrap.cpp +++ b/auto/Wrap/libBornAgainCore_wrap.cpp @@ -39532,28 +39532,6 @@ fail: } -SWIGINTERN PyObject *_wrap_Simulation_removeDetectorResolutionFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - Simulation *arg1 = (Simulation *) 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_Simulation, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Simulation_removeDetectorResolutionFunction" "', argument " "1"" of type '" "Simulation *""'"); - } - arg1 = reinterpret_cast< Simulation * >(argp1); - (arg1)->removeDetectorResolutionFunction(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_Simulation_setAnalyzerProperties(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Simulation *arg1 = (Simulation *) 0 ; @@ -44027,11 +44005,6 @@ static PyMethodDef SwigMethods[] = { "void Simulation::setDetectorResolutionFunction(const IResolutionFunction2D &resolution_function)\n" "\n" ""}, - { "Simulation_removeDetectorResolutionFunction", _wrap_Simulation_removeDetectorResolutionFunction, METH_O, "\n" - "Simulation_removeDetectorResolutionFunction(Simulation self)\n" - "void Simulation::removeDetectorResolutionFunction()\n" - "\n" - ""}, { "Simulation_setAnalyzerProperties", _wrap_Simulation_setAnalyzerProperties, METH_VARARGS, "\n" "Simulation_setAnalyzerProperties(Simulation self, kvector_t direction, double efficiency, double total_transmission)\n" "void Simulation::setAnalyzerProperties(const kvector_t direction, double efficiency, double total_transmission)\n" -- GitLab