.gitlab-ci.yml

@@ -122,6 +122,7 @@ mac_x64:
     - env
     - mkdir build
     - cd build
+    - cmake --version
     - >
       cmake .. -DCMAKE_PREFIX_PATH="$OPTDIR;$QTDIR/lib/cmake;$BREWDIR" -DCMAKE_BUILD_TYPE=Release
       -DPython3_ROOT_DIR="$PYPLAT" -DCMAKE_CXX_COMPILER_LAUNCHER="$CCACHE" -DBA_APPLE_BUNDLE=ON

Base/Axis/Frame.cpp

@@ -74,12 +74,6 @@ const Scale& Frame::yAxis() const
     return *m_axes.at(1);
 }
 
-size_t Frame::projectedSize(size_t k_axis) const
-{
-    ASSERT(k_axis < rank());
-    return m_axes[k_axis]->size();
-}
-
 double Frame::projectedCoord(size_t i_flat, size_t k_axis) const
 {
     return projectedBin(i_flat, k_axis).center();

Base/Axis/Frame.h

@@ -40,9 +40,6 @@ public:
     //! Returns total number of bins.
     size_t size() const { return m_size; }
 
-    //! Returns number of bins along axis.
-    size_t projectedSize(size_t k_axis) const;
-
     //! Returns axis with given serial number
     const Scale& axis(size_t k_axis) const;
     const Scale& xAxis() const;

CMakeLists.txt

@@ -5,6 +5,15 @@
 ### CMake configuration
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
+if (CMAKE_VERSION GREATER_EQUAL 3.30)
+   cmake_policy(SET CMP0167 OLD)
+endif()
+if (CMAKE_VERSION GREATER_EQUAL 3.31)
+   cmake_policy(SET CMP0175 NEW)
+endif()
+if (CMAKE_VERSION GREATER_EQUAL 3.31)
+   cmake_policy(SET CMP0177 OLD)
+endif()
 
 set(CMAKE_MODULE_PATH
     ${CMAKE_SOURCE_DIR}

Device/Mask/MaskStack.cpp

@@ -62,7 +62,7 @@ void MaskStack::pushMask(const IShape2D& shape, bool mask_value)
 
 bool MaskStack::isMasked(size_t i_flat, const Frame& frame) const
 {
-    size_t nx = frame.projectedSize(0);
+    size_t nx = frame.xAxis().size();
     size_t ix = i_flat % nx;
     size_t iy = i_flat / nx;
 

auto/Wrap/libBornAgainBase.py

@@ -1923,10 +1923,6 @@ class Frame(object):
         r"""size(Frame self) -> size_t"""
         return _libBornAgainBase.Frame_size(self)
 
-    def projectedSize(self, k_axis):
-        r"""projectedSize(Frame self, size_t k_axis) -> size_t"""
-        return _libBornAgainBase.Frame_projectedSize(self, k_axis)
-
     def axis(self, k_axis):
         r"""axis(Frame self, size_t k_axis) -> Scale"""
         return _libBornAgainBase.Frame_axis(self, k_axis)

auto/Wrap/libBornAgainBase_wrap.cpp

@@ -26794,47 +26794,6 @@ fail:
 }
-SWIGINTERN PyObject *_wrap_Frame_projectedSize(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  Frame *arg1 = (Frame *) 0 ;
-  size_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  size_t val2 ;
-  int ecode2 = 0 ;
-  PyObject *swig_obj[2] ;
-  size_t result;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "Frame_projectedSize", 2, 2, 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_projectedSize" "', 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_projectedSize" "', argument " "2"" of type '" "size_t""'");
-  } 
-  arg2 = static_cast< size_t >(val2);
-  {
-    try {
-      result = ((Frame const *)arg1)->projectedSize(arg2);
-    } catch (const std::exception& ex) {
-      // message shown in the Python interpreter
-      const std::string msg {
-        "BornAgain C++ Exception: " + std::string(ex.what())
-      };
-      SWIG_exception(SWIG_RuntimeError, msg.c_str());
-    }
-  }
-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_Frame_axis(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   Frame *arg1 = (Frame *) 0 ;
@@ -30370,7 +30329,6 @@ static PyMethodDef SwigMethods[] = {
 	 { "delete_Frame", _wrap_delete_Frame, METH_O, "delete_Frame(Frame self)"},
 	 { "Frame_rank", _wrap_Frame_rank, METH_O, "Frame_rank(Frame self) -> size_t"},
 	 { "Frame_size", _wrap_Frame_size, METH_O, "Frame_size(Frame self) -> size_t"},
-	 { "Frame_projectedSize", _wrap_Frame_projectedSize, METH_VARARGS, "Frame_projectedSize(Frame self, size_t k_axis) -> size_t"},
 	 { "Frame_axis", _wrap_Frame_axis, METH_VARARGS, "Frame_axis(Frame self, size_t k_axis) -> Scale"},
 	 { "Frame_xAxis", _wrap_Frame_xAxis, METH_O, "Frame_xAxis(Frame self) -> Scale"},
 	 { "Frame_yAxis", _wrap_Frame_yAxis, METH_O, "Frame_yAxis(Frame self) -> Scale"},

cmake/BornAgain/MakeLib.cmake

@@ -37,7 +37,6 @@ function(add_library_to_wheel lib)
         add_custom_command(TARGET ${lib}
             POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy "${lib_LIBRARY_PY}" ${_dst}
-            DEPENDS lib${lib}_py_wrappers
             COMMENT "Add Python wrapper-script of library ${lib} to the Python wheel..."
         )
     endif()