Fix an error when exporting Sliceviewer pixel cuts from MDHisto workspaces

docs/source/release/v6.13.0/Workbench/SliceViewer/Bugfixes/36084.rst

@@ -0,0 +1 @@
+- Sliceviwer no longer raises an error when exporting a pixel cut from a MDHistoWorkspace

qt/python/mantidqt/mantidqt/widgets/sliceviewer/models/model.py

@@ -269,6 +269,7 @@ def export_cuts_to_workspace_mdevent(
         :param limits: An optional ND sequence containing limits for plotting dimensions. If
                        not provided the full extent of each dimension is used
         :param transpose: If true then the limits are transposed w.r.t to the data
+        :param dimension_indices: A list where the value (None, 0, or 1) at index i denotes the index of the axis
         :param cut: A string denoting which type to export. Options=s,c,x,y.
         """
         workspace = self._get_ws()
@@ -356,6 +357,7 @@ def export_roi_to_workspace_mdhisto(
         :param limits: An optional ND sequence containing limits for plotting dimensions. If
                        not provided the full extent of each dimension is used
         :param transpose: If true then the limits are transposed w.r.t to the data
+        :param dimension_indices: A list where the value (None, 0, or 1) at index i denotes the index of the axis
         """
         workspace = self._get_ws()
         dim_limits = _dimension_limits(workspace, slicepoint, bin_params, dimension_indices, limits)
@@ -391,6 +393,7 @@ def export_cuts_to_workspace_mdhisto(
         :param limits: An optional ND sequence containing limits for plotting dimensions. If
                        not provided the full extent of each dimension is used
         :param transpose: If true then the limits are transposed w.r.t to the data
+        :param dimension_indices: A list where the value (None, 0, or 1) at index i denotes the index of the axis
         :param cut: A string denoting which type to export. Options=c,x,y.
         """
         workspace = self._get_ws()
@@ -426,6 +429,7 @@ def export_cuts_to_workspace_matrix(
         :param limits: An optional ND sequence containing limits for plotting dimensions. If
                        not provided the full extent of each dimension is used
         :param transpose: If true then the limits are transposed .w.r.t. the data
+        :param dimension_indices: A list where the value (None, 0, or 1) at index i denotes the index of the axis
         :param cut: A string denoting which cut to export. Options=c,x,y.
         """
         workspace = self._get_ws()
@@ -452,41 +456,75 @@ def export_roi_to_workspace_matrix(self, slicepoint, bin_params, limits: tuple,
         :param limits: An ND sequence containing limits for plotting dimensions. If
                        not provided the full extent of each dimension is used
         :param transpose:  If true then the limits are transposed .w.r.t. the data
+        :param dimension_indices: A list where the value (None, 0, or 1) at index i denotes the index of the axis
         """
         if transpose:
             # swap back to model order
             limits = limits[1], limits[0]
         extract_roi_matrix(self._get_ws(), *limits[0], *limits[1], transpose, self._roi_name)
         return f"ROI created: {self._roi_name}"
 
-    def export_pixel_cut_to_workspace_md(self, slicepoint, bin_params, pos: tuple, transpose: bool, axis: str):
+    def export_pixel_cut_to_workspace_md(
+        self, slicepoint, bin_params, pos: tuple, transpose: bool, dimension_indices: Sequence[int], axis: str
+    ):
         """
         Export a single row/column as a workspace. Signature matches other export functions
         slicepoint, bin_params are unused
         :param pos: A 2-tuple containing the position of the pixel whose row/column should be exported
         :param transpose:  If true then the limits are transposed .w.r.t. the data
-        :param axis: A string 'x' or 'y' identifying the axis to cut along
+        :param dimension_indices: A list where the value (None, 0, or 1) at index i denotes the index of the axis
+        :param axis: A string 'x' or 'y' or 'c' identifying the axis to cut along
         """
-        # Form single pixel limits for a cut
+        ws_type = WorkspaceInfo.get_ws_type(self._get_ws())
+        if ws_type not in [WS_TYPE.MDE, WS_TYPE.MDH]:
+            raise ValueError("Unexpected workspace type, workspace should be a MD workspace")
+
+        if ws_type == WS_TYPE.MDE:
+            export_cut_fun = self.export_cuts_to_workspace_mdevent
+        elif ws_type == WS_TYPE.MDH:
+            export_cut_fun = self.export_cuts_to_workspace_mdhisto
+
         xindex, yindex = WorkspaceInfo.display_indices(slicepoint, transpose)
         workspace = self._get_ws()
-        deltax, deltay = workspace.getDimension(xindex).getBinWidth(), workspace.getDimension(yindex).getBinWidth()
+        xdim = workspace.getDimension(xindex)
+        ydim = workspace.getDimension(yindex)
+        deltax, deltay = xdim.getBinWidth(), ydim.getBinWidth()
+
+        if ws_type is WS_TYPE.MDE:
+            deltax, deltay = deltax / bin_params[xindex], deltay / bin_params[yindex]
+
         xpos, ypos = pos
-        limits = (xpos - 0.5 * deltax, xpos + 0.5 * deltax), (ypos - 0.5 * deltay, ypos + 0.5 * deltay)
-        return self.export_cuts_to_workspace_mdevent(slicepoint, bin_params, limits, transpose, axis)
 
-    def export_pixel_cut_to_workspace_matrix(self, slicepoint, bin_params, pos: tuple, transpose: bool, axis: str):
+        limits_x = ((xdim.getMinimum(), xdim.getMaximum()), (ypos - 0.5 * deltay, ypos + 0.5 * deltay))
+        limits_y = ((xpos - 0.5 * deltax, xpos + 0.5 * deltax), (ydim.getMinimum(), ydim.getMaximum()))
+
+        if axis == "c":
+            export_cut_fun(slicepoint, bin_params, limits_x, transpose, dimension_indices, "x")
+            export_cut_fun(slicepoint, bin_params, limits_y, transpose, dimension_indices, "y")
+
+            xcut_name, ycut_name = self._xcut_name, self._ycut_name
+            return f"Cuts along X/Y created: {xcut_name} & {ycut_name}"
+        elif axis == "x":
+            return export_cut_fun(slicepoint, bin_params, limits_x, transpose, dimension_indices, axis)
+        elif axis == "y":
+            return export_cut_fun(slicepoint, bin_params, limits_y, transpose, dimension_indices, axis)
+        else:
+            raise ValueError("Unexpected axis type: possible values are axis=(c, x, y)")
+
+    def export_pixel_cut_to_workspace_matrix(
+        self, slicepoint, bin_params, pos: tuple, transpose: bool, dimension_indices: Sequence[int], axis: str
+    ):
         """
         Export a single row/column as a workspace. Signature matches other export functions
         slicepoint, bin_params are unused
         :param pos: A 2-tuple containing the position of the pixel whose row/column should be exported
         :param transpose:  If true then the limits are transposed .w.r.t. the data
+        :param dimension_indices: A list where the value (None, 0, or 1) at index i denotes the index of the axis
         :param axis: A string 'x' or 'y' identifying the axis to cut along
         """
         workspace = self._get_ws()
         xpos, ypos = pos
         if transpose:
-            # swap back to model order
             xpos, ypos = ypos, xpos
 
         xcut_name, ycut_name, help_msg = self._cut_names(axis)

qt/python/mantidqt/mantidqt/widgets/sliceviewer/presenters/presenter.py

@@ -294,6 +294,7 @@ def export_pixel_cut(self, pos, axis):
                     bin_params=data_view.dimensions.get_bin_params(),
                     pos=pos,
                     transpose=data_view.dimensions.transpose,
+                    dimension_indices=data_view.dimensions.get_states(),
                     axis=axis,
                 )
             )

qt/python/mantidqt/mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py

@@ -677,6 +677,221 @@ def assert_call_as_expected(mock_ws, transpose, export_type, is_spectra, is_ragg
             mock_ws.name.return_value = "mock_ws"
             assert_call_as_expected(mock_ws, transpose=False, export_type=export_type, is_spectra=is_spectra, is_ragged=is_ragged)
 
+    @patch("mantidqt.widgets.sliceviewer.models.model.IntegrateMDHistoWorkspace")
+    @patch("mantidqt.widgets.sliceviewer.models.model.TransposeMD")
+    def test_export_pixel_cut_to_workspace_mdhisto(self, mock_transpose, mock_intMD):
+        slicepoint = [None, None, 0.5]
+        bin_params = [100, 100, 0.1]
+
+        def assert_call_as_expected(transpose, cut_type):
+            xpos, ypos = 0.0, 2.0
+            xidx, yidx = 0, 1
+            dimension_indices = [0, 1, None]
+            if transpose:
+                xpos, ypos = ypos, xpos
+                xidx, yidx = yidx, xidx
+                dimension_indices = [1, 0, None]
+
+            model = SliceViewerModel(self.ws_MD_3D)
+            help_msg = model.export_pixel_cut_to_workspace(slicepoint, bin_params, (xpos, ypos), transpose, dimension_indices, cut_type)
+
+            xdim = self.ws_MD_3D.getDimension(xidx)
+            ydim = self.ws_MD_3D.getDimension(yidx)
+
+            deltax = xdim.getBinWidth()
+            deltay = ydim.getBinWidth()
+
+            limits_x = ((xdim.getMinimum(), xdim.getMaximum()), (ypos - 0.5 * deltay, ypos + 0.5 * deltay))
+            limits_y = ((xpos - 0.5 * deltax, xpos + 0.5 * deltax), (ydim.getMinimum(), ydim.getMaximum()))
+
+            zmin, zmax = 0.45, 0.55
+
+            assert_called = mock_intMD.assert_called_with if cut_type == "c" else mock_intMD.assert_called_once_with
+
+            if not transpose:
+                if cut_type == "y" or cut_type == "c":
+                    xmin, xmax = limits_y[xidx]
+                    ymin, ymax = limits_y[yidx]
+
+                    ycut_params = dict(
+                        InputWorkspace=self.ws_MD_3D,
+                        P1Bin=[xmin, xmax],
+                        P2Bin=[ymin, 0, ymax],
+                        P3Bin=[zmin, zmax],
+                        OutputWorkspace="ws_MD_3D_cut_y",
+                    )
+                    assert_called(**ycut_params)
+                elif cut_type == "x" or cut_type == "c":
+                    xmin, xmax = limits_x[xidx]
+                    ymin, ymax = limits_x[yidx]
+
+                    xcut_params = dict(
+                        InputWorkspace=self.ws_MD_3D,
+                        P1Bin=[xmin, 0, xmax],
+                        P2Bin=[ymin, ymax],
+                        P3Bin=[zmin, zmax],
+                        OutputWorkspace="ws_MD_3D_cut_x",
+                    )
+                    assert_called(**xcut_params)
+            else:
+                if cut_type == "y" or cut_type == "c":
+                    xmin, xmax = limits_y[xidx]
+                    ymin, ymax = limits_y[yidx]
+
+                    ycut_params = dict(
+                        InputWorkspace=self.ws_MD_3D,
+                        P1Bin=[xmin, 0, xmax],
+                        P2Bin=[ymin, ymax],
+                        P3Bin=[zmin, zmax],
+                        OutputWorkspace="ws_MD_3D_cut_y",
+                    )
+                    assert_called(**ycut_params)
+
+                elif cut_type == "x" or cut_type == "c":
+                    xmin, xmax = limits_x[xidx]
+                    ymin, ymax = limits_x[yidx]
+
+                    xcut_params = dict(
+                        InputWorkspace=self.ws_MD_3D,
+                        P1Bin=[xmin, xmax],
+                        P2Bin=[ymin, 0, ymax],
+                        P3Bin=[zmin, zmax],
+                        OutputWorkspace="ws_MD_3D_cut_x",
+                    )
+                    assert_called(**xcut_params)
+
+            if cut_type == "c":
+                self.assertEqual("Cuts along X/Y created: ws_MD_3D_cut_x & ws_MD_3D_cut_y", help_msg)
+            elif cut_type == "x":
+                self.assertEqual("Cut along X created: ws_MD_3D_cut_x", help_msg)
+            elif cut_type == "y":
+                self.assertEqual("Cut along Y created: ws_MD_3D_cut_y", help_msg)
+
+            mock_intMD.reset_mock()
+
+        for cut_type in ("x", "y", "c"):
+            assert_call_as_expected(transpose=False, cut_type=cut_type)
+            assert_call_as_expected(transpose=True, cut_type=cut_type)
+
+    @patch("mantidqt.widgets.sliceviewer.models.model.BinMD")
+    @patch("mantidqt.widgets.sliceviewer.models.model.TransposeMD")
+    def test_export_pixel_cut_to_workspace_mdevent(self, mock_transpose, mock_binmd):
+        slicepoint = [None, None, 0.5]
+        bin_params = [100, 100, 0.1]
+
+        def assert_call_as_expected(transpose, cut_type):
+            xpos, ypos = 0.0, 2.0
+            xidx, yidx = 0, 1
+            dimension_indices = [0, 1, None]
+            if transpose:
+                xpos, ypos = ypos, xpos
+                xidx, yidx = yidx, xidx
+                dimension_indices = [1, 0, None]
+
+            model = SliceViewerModel(self.ws_MDE_3D)
+            help_msg = model.export_pixel_cut_to_workspace(slicepoint, bin_params, (xpos, ypos), transpose, dimension_indices, cut_type)
+
+            xdim = self.ws_MDE_3D.getDimension(xidx)
+            ydim = self.ws_MDE_3D.getDimension(yidx)
+
+            deltax = xdim.getBinWidth() / bin_params[xidx]
+            deltay = ydim.getBinWidth() / bin_params[yidx]
+
+            if cut_type == "x":
+                xmin, xmax = xdim.getMinimum(), xdim.getMaximum()
+                ymin, ymax = ypos - 0.5 * deltay, ypos + 0.5 * deltay
+            else:
+                xmin, xmax = xpos - 0.5 * deltax, xpos + 0.5 * deltax
+                ymin, ymax = ydim.getMinimum(), ydim.getMaximum()
+
+            zmin, zmax = 0.45, 0.55
+
+            common_params = dict(
+                InputWorkspace=self.ws_MDE_3D,
+                AxisAligned=False,
+                BasisVector0="h,rlu,1.0,0.0,0.0",
+                BasisVector1="k,rlu,0.0,1.0,0.0",
+                BasisVector2="l,rlu,0.0,0.0,1.0",
+            )
+
+            assert_called = mock_binmd.assert_called_with if cut_type == "c" else mock_binmd.assert_called_once_with
+
+            if not transpose:
+                extents = [xmin, xmax, ymin, ymax, zmin, zmax]
+
+                if cut_type == "y" or cut_type == "c":
+                    expected_bins = [1, 100, 1]
+                    expected_ws = "ws_MDE_3D_cut_y"
+                    expected_msg = "Cut along Y created: ws_MDE_3D_cut_y"
+
+                    assert_called(**common_params, OutputExtents=extents, OutputBins=expected_bins, OutputWorkspace=expected_ws)
+                elif cut_type == "x" or cut_type == "c":
+                    expected_bins = [100, 1, 1]
+                    expected_ws = "ws_MDE_3D_cut_x"
+                    expected_msg = "Cut along X created: ws_MDE_3D_cut_x"
+
+                    assert_called(**common_params, OutputExtents=extents, OutputBins=expected_bins, OutputWorkspace=expected_ws)
+
+            else:
+                extents = [ymin, ymax, xmin, xmax, zmin, zmax]
+
+                if cut_type == "y" or cut_type == "c":
+                    expected_bins = [100, 1, 1]
+                    expected_ws = "ws_MDE_3D_cut_y"
+                    expected_msg = "Cut along Y created: ws_MDE_3D_cut_y"
+                    assert_called(**common_params, OutputExtents=extents, OutputBins=expected_bins, OutputWorkspace=expected_ws)
+                elif cut_type == "x" or cut_type == "c":
+                    expected_bins = [1, 100, 1]
+                    expected_ws = "ws_MDE_3D_cut_x"
+                    expected_msg = "Cut along X created: ws_MDE_3D_cut_x"
+                    assert_called(**common_params, OutputExtents=extents, OutputBins=expected_bins, OutputWorkspace=expected_ws)
+
+            if cut_type == "c":
+                expected_msg = "Cuts along X/Y created: ws_MDE_3D_cut_x & ws_MDE_3D_cut_y"
+            elif cut_type == "x":
+                expected_msg = "Cut along X created: ws_MDE_3D_cut_x"
+            elif cut_type == "y":
+                expected_msg = "Cut along Y created: ws_MDE_3D_cut_y"
+
+            self.assertEqual(expected_msg, help_msg)
+            mock_binmd.reset_mock()
+
+        for cut_type in ("x", "y", "c"):
+            assert_call_as_expected(transpose=False, cut_type=cut_type)
+            assert_call_as_expected(transpose=True, cut_type=cut_type)
+
+    @patch("mantidqt.widgets.sliceviewer.models.roi.extract_roi_matrix")
+    def test_export_pixel_cut_to_workspace_matrix(self, mock_extract_roi):
+        slicepoint = [None, None]
+        bin_params = [100, 100]
+        dimension_indices = [0, 1]
+        xpos, ypos = 1.5, 3.0
+
+        def assert_call_as_expected(transpose, cut_type):
+            model = SliceViewerModel(self.ws2d_histo)
+            mock_extract_roi.reset_mock()
+
+            help_msg = model.export_pixel_cut_to_workspace(slicepoint, bin_params, (xpos, ypos), transpose, dimension_indices, cut_type)
+
+            if not transpose:
+                if cut_type == "x":
+                    mock_extract_roi.assert_called_once_with(self.ws2d_histo, None, None, ypos, ypos, False, "ws2d_histo_cut_x")
+                    self.assertEqual("Cut along X created: ws2d_histo_cut_x", help_msg)
+                elif cut_type == "y":
+                    mock_extract_roi.assert_called_once_with(self.ws2d_histo, xpos, xpos, None, None, True, "ws2d_histo_cut_y")
+                    self.assertEqual("Cut along Y created: ws2d_histo_cut_y", help_msg)
+            else:
+                if cut_type == "x":
+                    mock_extract_roi.assert_called_once_with(self.ws2d_histo, ypos, ypos, None, None, True, "ws2d_histo_cut_y")
+                    self.assertEqual("Cut along X created: ws2d_histo_cut_y", help_msg)
+                elif cut_type == "y":
+                    mock_extract_roi.assert_called_once_with(self.ws2d_histo, None, None, xpos, xpos, False, "ws2d_histo_cut_x")
+                    self.assertEqual("Cut along Y created: ws2d_histo_cut_x", help_msg)
+
+            for cut_type in ("x", "y"):
+                assert_call_as_expected(transpose=False, cut_type=cut_type)
+                assert_call_as_expected(transpose=False, cut_type=cut_type)
+
     @patch("mantidqt.widgets.sliceviewer.models.model.TransposeMD")
     @patch("mantidqt.widgets.sliceviewer.models.model.IntegrateMDHistoWorkspace")
     def test_export_region_for_mdhisto_workspace(self, mock_intMD, mock_transposemd):