diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp index 8a1be6ab078045f6e0fa7c89d793866c73cf38e6..66711fd3b37a527bfd77270eb3a891bf1a24e28b 100644 --- a/GUI/Model/FromCore/ItemizeSimulation.cpp +++ b/GUI/Model/FromCore/ItemizeSimulation.cpp @@ -468,9 +468,9 @@ SpecularInstrumentItem* createSpecularInstrumentItem(const SpecularSimulation& s beam_item->setAzimuthalAngle(0.0); // azimuthal angle is hardcoded auto* axis_item = beam_item->inclinationAxis(); - setAxisItem(axis_item, *simulation.coordinateAxis(), 1. / Units::deg); + setAxisItem(axis_item, *scan->coordinateAxis(), 1. / Units::deg); - setFootprintFactor(simulation.footprintFactor(), beam_item); + setFootprintFactor(scan->footprintFactor(), beam_item); const auto* alphaScan = dynamic_cast<const AlphaScan*>(scan); if (!alphaScan) diff --git a/Sim/Simulation/SpecularSimulation.cpp b/Sim/Simulation/SpecularSimulation.cpp index 99e9f70ced0b060b9763aee55d4713c9cf8c6d2c..b4cc2264233c87a20f59d4b2c099e1a25b7257ba 100644 --- a/Sim/Simulation/SpecularSimulation.cpp +++ b/Sim/Simulation/SpecularSimulation.cpp @@ -63,11 +63,6 @@ const IAxis* SpecularSimulation::coordinateAxis() const return m_scan->coordinateAxis(); } -const IFootprintFactor* SpecularSimulation::footprintFactor() const -{ - return m_scan->footprintFactor(); -} - size_t SpecularSimulation::intensityMapSize() const { return m_scan->coordinateAxis()->size(); diff --git a/Sim/Simulation/SpecularSimulation.h b/Sim/Simulation/SpecularSimulation.h index d2302bddbb8dcc2cea1e02fe62914ad8a3408f83..b887c1f3e6df69561fe407b4d5e9c05b48c18eba 100644 --- a/Sim/Simulation/SpecularSimulation.h +++ b/Sim/Simulation/SpecularSimulation.h @@ -41,9 +41,6 @@ public: //! Returns a pointer to coordinate axis. const IAxis* coordinateAxis() const; - //! Returns a pointer to footprint factor holder - const IFootprintFactor* footprintFactor() 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 c1a6544bf1552f9f33248cdc52dd6f8f906094ec..0ce5f02da082a2809a669f9941e17e5c3fcaab06 100644 --- a/auto/Wrap/doxygenSim.i +++ b/auto/Wrap/doxygenSim.i @@ -1939,11 +1939,6 @@ C++ includes: SpecularSimulation.h Returns a pointer to coordinate axis. "; -%feature("docstring") SpecularSimulation::footprintFactor "const IFootprintFactor * SpecularSimulation::footprintFactor() const - -Returns a pointer to footprint factor holder. -"; - %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 88fcbda622df5e3a8291baeebc378e730e476fc5..e044534cd67544a46ace4b2014c7a8b6fb353f80 100644 --- a/auto/Wrap/libBornAgainSim.py +++ b/auto/Wrap/libBornAgainSim.py @@ -3800,16 +3800,6 @@ class SpecularSimulation(ISimulation): """ return _libBornAgainSim.SpecularSimulation_coordinateAxis(self) - def footprintFactor(self): - r""" - footprintFactor(SpecularSimulation self) -> IFootprintFactor const * - const IFootprintFactor * SpecularSimulation::footprintFactor() const - - Returns a pointer to footprint factor holder. - - """ - return _libBornAgainSim.SpecularSimulation_footprintFactor(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 3d0d4b65f11bb3b14d18d2a1ff34054a3f14293a..e4c4ad519d48425fd822893b09357b2889e747a7 100644 --- a/auto/Wrap/libBornAgainSim_wrap.cpp +++ b/auto/Wrap/libBornAgainSim_wrap.cpp @@ -38991,29 +38991,6 @@ fail: } -SWIGINTERN PyObject *_wrap_SpecularSimulation_footprintFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - SpecularSimulation *arg1 = (SpecularSimulation *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject *swig_obj[1] ; - IFootprintFactor *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_footprintFactor" "', argument " "1"" of type '" "SpecularSimulation const *""'"); - } - arg1 = reinterpret_cast< SpecularSimulation * >(argp1); - result = (IFootprintFactor *)((SpecularSimulation const *)arg1)->footprintFactor(); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFootprintFactor, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_SpecularSimulation_intensityMapSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; SpecularSimulation *arg1 = (SpecularSimulation *) 0 ; @@ -42424,13 +42401,6 @@ static PyMethodDef SwigMethods[] = { "Returns a pointer to coordinate axis. \n" "\n" ""}, - { "SpecularSimulation_footprintFactor", _wrap_SpecularSimulation_footprintFactor, METH_O, "\n" - "SpecularSimulation_footprintFactor(SpecularSimulation self) -> IFootprintFactor const *\n" - "const IFootprintFactor * SpecularSimulation::footprintFactor() const\n" - "\n" - "Returns a pointer to footprint factor holder. \n" - "\n" - ""}, { "SpecularSimulation_intensityMapSize", _wrap_SpecularSimulation_intensityMapSize, METH_O, "\n" "SpecularSimulation_intensityMapSize(SpecularSimulation self) -> size_t\n" "size_t SpecularSimulation::intensityMapSize() const override\n"