diff --git a/Base/Axis/Frame.cpp b/Base/Axis/Frame.cpp index 9946df688482296736bc647fa0d8d75cc929d4c9..9432436da1a69649ac216373f3fc0b798c1d8fcb 100644 --- a/Base/Axis/Frame.cpp +++ b/Base/Axis/Frame.cpp @@ -33,12 +33,6 @@ double Frame::projectedCoord(size_t i_flat, size_t k_axis) const return (*m_axes[k_axis])[axis_index]; } -Bin1D Frame::projectedBin(size_t i_flat, size_t k_axis) const -{ - auto axis_index = projectedIndex(i_flat, k_axis); - return m_axes[k_axis]->bin(axis_index); -} - std::vector<int> Frame::allIndices(size_t i_flat) const { std::vector<int> result(rank()); diff --git a/Base/Axis/Frame.h b/Base/Axis/Frame.h index 5862e6c3873c11d3b70f578ae7d4befc1be42292..f329c4016dfb9101046685c2c7c73d32b8a961cb 100644 --- a/Base/Axis/Frame.h +++ b/Base/Axis/Frame.h @@ -42,12 +42,6 @@ public: //! @return corresponding bin center of selected axis double projectedCoord(size_t i_flat, size_t k_axis) const; - //! Returns bin of selected axis for given i_flat. - //! @param i_flat The global index of this data structure. - //! @param k_axis Serial number of selected axis. - //! @return Corresponding Bin1D object - Bin1D projectedBin(size_t i_flat, size_t k_axis) const; - //! Returns vector of axes indices for given global index //! @param i_flat The global index of this data structure. //! @return Vector of bin indices for all axes defined diff --git a/auto/Wrap/doxygenBase.i b/auto/Wrap/doxygenBase.i index 53de6eea9a8e9e6bb76b95271206d7229b2788b9..2e101d0d94fd42f1d6fde51fa1175c30d21020d8 100644 --- a/auto/Wrap/doxygenBase.i +++ b/auto/Wrap/doxygenBase.i @@ -380,22 +380,6 @@ Serial number of selected axis. corresponding bin center of selected axis "; -%feature("docstring") Frame::projectedBin "Bin1D Frame::projectedBin(size_t i_flat, size_t k_axis) const - -Returns bin of selected axis for given i_flat. - -Parameters: ------------ - -i_flat: -The global index of this data structure. - -k_axis: -Serial number of selected axis. - -Corresponding Bin1D object -"; - %feature("docstring") Frame::allIndices "std::vector< int > Frame::allIndices(size_t i_flat) const Returns vector of axes indices for given global index diff --git a/auto/Wrap/libBornAgainBase.py b/auto/Wrap/libBornAgainBase.py index 77df65142e137fb10164a1d950f49a3aa83625af..2f0952e279da2c81a26d5f90acfa23b787be3799 100644 --- a/auto/Wrap/libBornAgainBase.py +++ b/auto/Wrap/libBornAgainBase.py @@ -2817,27 +2817,6 @@ class Frame(object): """ return _libBornAgainBase.Frame_projectedCoord(self, i_flat, k_axis) - def projectedBin(self, i_flat, k_axis): - r""" - projectedBin(Frame self, size_t i_flat, size_t k_axis) -> Bin1D - Bin1D Frame::projectedBin(size_t i_flat, size_t k_axis) const - - Returns bin of selected axis for given i_flat. - - Parameters: - ----------- - - i_flat: - The global index of this data structure. - - k_axis: - Serial number of selected axis. - - Corresponding Bin1D object - - """ - return _libBornAgainBase.Frame_projectedBin(self, i_flat, k_axis) - def allIndices(self, i_flat): r""" allIndices(Frame self, size_t i_flat) -> vector_integer_t diff --git a/auto/Wrap/libBornAgainBase_wrap.cpp b/auto/Wrap/libBornAgainBase_wrap.cpp index 81ecbbe8d983ba9987226b9e84d445c7e0f9d64d..50e1080d69bf34370b790eeeb1717da0dbd46913 100644 --- a/auto/Wrap/libBornAgainBase_wrap.cpp +++ b/auto/Wrap/libBornAgainBase_wrap.cpp @@ -27398,44 +27398,6 @@ fail: } -SWIGINTERN PyObject *_wrap_Frame_projectedBin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - Frame *arg1 = (Frame *) 0 ; - size_t arg2 ; - size_t arg3 ; - void *argp1 = 0 ; - int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - size_t val3 ; - int ecode3 = 0 ; - PyObject *swig_obj[3] ; - Bin1D result; - - if (!SWIG_Python_UnpackTuple(args, "Frame_projectedBin", 3, 3, swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Frame, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Frame_projectedBin" "', argument " "1"" of type '" "Frame const *""'"); - } - arg1 = reinterpret_cast< Frame * >(argp1); - ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Frame_projectedBin" "', argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - ecode3 = SWIG_AsVal_size_t(swig_obj[2], &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Frame_projectedBin" "', argument " "3"" of type '" "size_t""'"); - } - arg3 = static_cast< size_t >(val3); - result = ((Frame const *)arg1)->projectedBin(arg2,arg3); - resultobj = SWIG_NewPointerObj((new Bin1D(static_cast< const Bin1D& >(result))), SWIGTYPE_p_Bin1D, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_Frame_allIndices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Frame *arg1 = (Frame *) 0 ; @@ -30195,24 +30157,6 @@ static PyMethodDef SwigMethods[] = { "corresponding bin center of selected axis \n" "\n" ""}, - { "Frame_projectedBin", _wrap_Frame_projectedBin, METH_VARARGS, "\n" - "Frame_projectedBin(Frame self, size_t i_flat, size_t k_axis) -> Bin1D\n" - "Bin1D Frame::projectedBin(size_t i_flat, size_t k_axis) const\n" - "\n" - "Returns bin of selected axis for given i_flat.\n" - "\n" - "Parameters:\n" - "-----------\n" - "\n" - "i_flat: \n" - "The global index of this data structure.\n" - "\n" - "k_axis: \n" - "Serial number of selected axis.\n" - "\n" - "Corresponding Bin1D object \n" - "\n" - ""}, { "Frame_allIndices", _wrap_Frame_allIndices, METH_VARARGS, "\n" "Frame_allIndices(Frame self, size_t i_flat) -> vector_integer_t\n" "std::vector< int > Frame::allIndices(size_t i_flat) const\n"