resolve merge conflicts

Author: glass-ships

.github/workflows/test-and-deploy.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   test-and-deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:

docs/release_notes.rst

@@ -20,6 +20,7 @@ Next
 ----
 
 **Of interest to the User**:
+- MR #141: Add instrument geometry settings to reduction workflow
 - MR #138: remove right-click option "Display Metadata..." from the reduction table
 - MR #135: update popup message for v4 deprecation
 - MR #134: add column in the reduction table for constant Q binning during reduction

docs/user/load-template.rst

@@ -19,14 +19,20 @@ Select `/SNS/REF_L/IPTS-26010/shared/autoreduce/REF_L_188298_auto_template.xml`.
 to proceed. There are several widgets on the UI. These are labeled with
 on the image below as follows:
 
-  A- The loaded files are listed in the table. The run numbers in green
-  are editable. The user can click these numbers and change them to use
-  the current template as a starting point.
+  A: Item A allows the user to enter or browse for data and normalization files.
 
-  The check boxes on the left of the table allow the user to populate
-  the main area of the UI (item B).
+  B: Item B allows the user change a number of reduction parameters, including:
+
+    - the TOF binning and output Q binning
+    - the calibration angle offset, which is given by the instrument scientist
+    - the dead time correction settings
+    - the instrument geometry parameters
+
+  C: Item C allows the user to pick a scaling factor file.
+
+  D: Panel D give basic information about the reflected run.
 
-  B- Each reflected run needs a normalization run (R is the ratio of the
+  E: Each reflected run needs a normalization run (R is the ratio of the
   reflected beam and the direct beam). For this reason the main area of
   the UI is presented as two tabs, one for the reflected data (called Data),
   and one for the normalization (called Normalization). They both
@@ -45,14 +51,12 @@ on the image below as follows:
   Double-clicking on the y vs counts plot will pop up a larger plot that
   makes it easier to visualize and select the peak.
 
-  C- Item C allows the user change the TOF binning and the output Q binning.
-
-  D- Item D allows the user to change the calibration angle offset, which
-  is given by the instrument scientist.
-
-  E- Item E allows the user to pick a scaling factor file.
+  F: The loaded files are listed in the table. The run numbers in green
+  are editable. The user can click these numbers and change them to use
+  the current template as a starting point.
 
-  F- Panel F give basic information about the reflected run.
+  The check boxes on the left of the table allow the user to populate
+  the main area of the UI (item E).
 
 .. image:: template-inspection.png
 

docs/user/template-inspection.png

@@ -14,7 +14,7 @@ dependencies:
   - pydantic
   - pip
   - pip:
-    - git+https://github.com/neutrons/LiquidsReflectometer.git@v2.1.10#egg=lr_reduction
+    - git+https://github.com/neutrons/LiquidsReflectometer.git@v2.1.11#egg=lr_reduction
 # documentation
   - sphinx
   - sphinx_rtd_theme

environment.yml

@@ -8,4 +8,4 @@ scipy
 PyQt5
 qtpy
 setuptools
-lr_reduction@git+https://github.com/neutrons/LiquidsReflectometer.git@v2.1.10#egg=lr_reduction
+lr_reduction@git+https://github.com/neutrons/LiquidsReflectometer.git@v2.1.11#egg=lr_reduction

requirements.txt

@@ -37,16 +37,18 @@ def test_mock_init(self, mock_main_window_init, mock_load_ui, mock_initialize_gu
     @mock.patch("qtpy.QtWidgets.QMainWindow.__init__")
     def test_load_configuration(
         self,
-        mock_main_window_init,  # noqa: ARG002
-        mock_load_ui,  # noqa: ARG002
-        mock_initialize_gui,  # noqa: ARG002
-        mock_file_loaded_signal,  # noqa: ARG002
-        mock_load_configuration,
+        mockMainWindowInit,
+        mockLoadUI,
+        mockInitializeGui,
+        mockFileLoadedSignal,
+        mockLoadConfiguration,
     ):
         parent = mock.Mock()
         main_gui = MainGui(parent=parent)
         main_gui.load_configuration()
-        mock_load_configuration.assert_called()
+        mockLoadConfiguration.assert_called()
+
+    # Deadtime Settings tests
 
     # Deadtime Settings tests