Moved cut end calculation into function

Author: SilkeSchomann

src/mslice/models/alg_workspace_ops.py

@@ -13,6 +13,8 @@ def get_number_of_steps(axis):
 
     return int(np.ceil(step_num))
 
+def get_range_end(start, end, width):
+    return min(start + width, end) if width is not None else end
 
 def get_axis_range(workspace, dimension_name):
     workspace = get_workspace_handle(workspace)

src/mslice/presenters/cut_plotter_presenter.py

@@ -6,6 +6,7 @@
     cut_figure_exists,
     get_current_plot,
 )
+from mslice.models.alg_workspace_ops import get_range_end
 from mslice.models.cut.cut import SampleTempValueError
 from mslice.models.cut.cut_functions import compute_cut
 from mslice.models.labels import generate_legend
@@ -123,20 +124,14 @@ def _plot_with_width(self, workspace, cut, plot_over):
         integration_start = cut.integration_axis.start
         integration_end = cut.integration_axis.end
         cut_start = integration_start
-        if cut.width is not None:
-            cut_end = min(integration_start + cut.width, integration_end)
-        else:
-            cut_end = integration_end
+        cut_end = get_range_end(integration_start, integration_end, cut.width)
         while cut_start != cut_end:
             cut.integration_axis.start = cut_start
             cut.integration_axis.end = cut_end
             final_plot = True if cut_start + cut.width == integration_end else False
             self._plot_cut(workspace, cut, plot_over, final_plot=final_plot)
             cut_start = cut_end
-            if cut.width is not None:
-                cut_end = min(cut_end + cut.width, integration_end)
-            else:
-                cut_end = integration_end
+            cut_end = get_range_end(cut_end, integration_end, cut.width)
             cut.cut_ws = None
             # The first plot will respect which button the user pressed. The rest will over plot
             plot_over = True

src/mslice/scripting/helperfunctions.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from mslice.models.alg_workspace_ops import get_range_end
 from mslice.models.labels import get_recoil_key
 from mslice.util.intensity_correction import IntensityType, IntensityCache
 import re
@@ -221,10 +222,7 @@ def add_cut_lines_with_width(errorbars, script_lines, cuts, intensity_correction
         integration_start = cut.integration_axis.start
         integration_end = cut.integration_axis.end
         cut_start = integration_start
-        if cut.width is not None:
-            cut_end = min(integration_start + cut.width, integration_end)
-        else:
-            cut_end = integration_end
+        cut_end = get_range_end(integration_start, integration_end, cut.width)
         intensity_range = (cut.intensity_start, cut.intensity_end)
         norm_to_one = cut.norm_to_one
         algo_str = "" if "Rebin" in cut.algorithm else f', Algorithm="{cut.algorithm}"'
@@ -268,12 +266,8 @@ def add_cut_lines_with_width(errorbars, script_lines, cuts, intensity_correction
                 )
 
             cut_start = cut_end
-            if cut.width is not None:
-                cut_end = min(cut_end + cut.width, integration_end)
-            else:
-                cut_end = integration_end
+            cut_end = get_range_end(cut_end, integration_end, cut.width)
             index += 1
-            
         cut.reset_integration_axis(cut.start, cut.end)
     return return_ws_vars
 

tests/scripting_helperfunctions_test.py

@@ -535,7 +535,6 @@ def test_that_add_cut_lines_with_width_works_as_expected_with_multiple_cuts(self
                 label="error_label_{}".format(i),
             )
         errorbars = plt.gca().containers
-
         cut_0 = Cut(
             Axis("|Q|", "1", "3", "1"),
             Axis("DeltaE", "-1", "1", "0"),