diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
index 85b1ab7b4ddb5498a991341eb50b0f4ad0b4fccd..75a0e432b648f8dd11f3a71275f0271ef1e1a772 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectILLReductionQENS.py
@@ -271,7 +271,7 @@ class IndirectILLReductionQENS(PythonAlgorithm):
for item in mtd[tmp_int]:
for index in range(item.getNumberHistograms()):
if item.readY(index)[0] <= 0:
- raise RuntimeError('Negative or 0 integral in spectrum #{0} {1}'.format(index,message))
+ self.log().warning('Negative or 0 integral in spectrum #{0} {1}'.format(index,message))
DeleteWorkspace(tmp_int)
diff --git a/docs/source/images/WorkspaceWidgetSortSize.png b/docs/source/images/WorkspaceWidgetSortSize.png
index 91127401ba4d7156a24a4c6d4fd57aa0392beeaa..f34977d4088e4bbf9a3017e479c53f7bd3f4bbe1 100644
Binary files a/docs/source/images/WorkspaceWidgetSortSize.png and b/docs/source/images/WorkspaceWidgetSortSize.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-add-workspace.png b/docs/source/images/multidataset-fitting/multidataset-add-workspace.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccdd0256b0fefcb5433a3d9e5fb789c5f42a4293
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-add-workspace.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-edit-local-params.png b/docs/source/images/multidataset-fitting/multidataset-edit-local-params.png
new file mode 100644
index 0000000000000000000000000000000000000000..fea1760a63d650b19bc9b5b5be899be784f8b144
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-edit-local-params.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-fit-prop-dialog.png b/docs/source/images/multidataset-fitting/multidataset-fit-prop-dialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..31b5adaded851d375e6ff6e047e66fb759414f5e
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-fit-prop-dialog.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-fit-prop-right-click.png b/docs/source/images/multidataset-fitting/multidataset-fit-prop-right-click.png
new file mode 100644
index 0000000000000000000000000000000000000000..09cc78db0ceacd71821c681e5051afea241689ca
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-fit-prop-right-click.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-fit-prop-with-model.png b/docs/source/images/multidataset-fitting/multidataset-fit-prop-with-model.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb3629bc2d9cccb9862383d632466e7bd32f5f31
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-fit-prop-with-model.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-fit-prop.png b/docs/source/images/multidataset-fitting/multidataset-fit-prop.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc87b2804e0e73b3ae46ca008042f89e245c2b37
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-fit-prop.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-fitting-labelled.png b/docs/source/images/multidataset-fitting/multidataset-fitting-labelled.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8575520352e8b7992be365392e74d7593be88ec
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-fitting-labelled.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-global-param.png b/docs/source/images/multidataset-fitting/multidataset-global-param.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b917176326d5ae1480feb77756c7b9f17d82ac6
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-global-param.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-local-params.png b/docs/source/images/multidataset-fitting/multidataset-local-params.png
new file mode 100644
index 0000000000000000000000000000000000000000..47846cb257e80d4b4ce7a6b027fd575680a4ad37
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-local-params.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-set-tie.png b/docs/source/images/multidataset-fitting/multidataset-set-tie.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cbb51d4cfe45a18ec701b41f8175398405a1566
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-set-tie.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-spectra.png b/docs/source/images/multidataset-fitting/multidataset-spectra.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b2813173ab9dc2c289072a4de7dceb6c7d3096f
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-spectra.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-spectrum-view.png b/docs/source/images/multidataset-fitting/multidataset-spectrum-view.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2557d0ab8b6efb3d9d491f3291a24f822111e9c
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-spectrum-view.png differ
diff --git a/docs/source/images/multidataset-fitting/multidataset-tie-added.png b/docs/source/images/multidataset-fitting/multidataset-tie-added.png
new file mode 100644
index 0000000000000000000000000000000000000000..33e2eb2fc075b4b16eaaa623e8441c83e8ec9469
Binary files /dev/null and b/docs/source/images/multidataset-fitting/multidataset-tie-added.png differ
diff --git a/docs/source/interfaces/Multi-dataset Fitting.rst b/docs/source/interfaces/Multi-dataset Fitting.rst
new file mode 100644
index 0000000000000000000000000000000000000000..ee282c362704018cabdd63453cea08f158888f71
--- /dev/null
+++ b/docs/source/interfaces/Multi-dataset Fitting.rst
@@ -0,0 +1,203 @@
+.. _Multi-dataset-Fitting-Interface:
+
+Multi-dataset Fitting Interface
+===============================
+
+.. contents:: Table of Contents
+ :local:
+
+Interface Overview
+------------------
+
+The Multi-dataset fitting interface can be used to fit multiple spectra using
+the same model and starting parameters for each spectrum. This interface can be
+accessed from the main menu of MantidPlot, in *Interfaces → General →
+Multi-dataset Fitting*. The interface consists of three major parts: The fit
+property window, the spectrum & fit viewer, and the list of spectra to operate
+on.
+
+.. figure:: ../images/multidataset-fitting/multidataset-fitting-labelled.png
+ :align: center
+ :width: 1000px
+
+ A high level overview of the various sections of the multidataset fitting
+ interface.
+
+List of Spectra
+---------------
+
+To start fitting data with this interface some data of interest first needs to
+be loaded into the view. Using the "Add workspace" button you can choose a
+workspace to add spectra from. This will let you choose from a list of loaded
+workspaces and optionally select which workspace indices to include for
+fitting. Spectra can be removed by highlighting a corresponding row (or rows)
+and clicking "Remove". To remove all spectra click the "workspace" column name
+and then click the "Remove" button.
+
+.. figure:: ../images/multidataset-fitting/multidataset-add-workspace.png
+ :align: center
+ :width: 800px
+
+ The dialog box shown after clicking "Add workspace".
+
+
+After a list of spectra have been imported from a workspace the table of
+spectra will be populated with one entry for each spectrum. Here you can see
+which workspace the spectrum came from, what the workspace index was, and what
+the start and end `x` values are for this particular spectrum for each fit. The
+start and end values are editable and can be changed by the user by double
+clicking on an entry.
+
+.. figure:: ../images/multidataset-fitting/multidataset-spectra.png
+ :align: center
+ :width: 800px
+
+ The list of spectra after loading a workspace.
+
+Fit Property Browser
+--------------------
+
+The fit property browser is located on the left of the interface. The operation
+of the fit property browser is very similar to the `general fitting view
+<https://www.mantidproject.org/MBC_Setup_And_Execute_First_Fit>`_ available in
+Mantid but with slightly reduced functionality. The fit property browser is
+split into two major parts. The top panel allows the user to define the
+specifics of the model they wish to fit to the dataset. The bottom panel
+contains the parameters for the minimizer and general parameters not associated
+with the model (e.g. the number of iterations). The bottom panel also allows
+the user to choose between simultaneous and sequential fitting mode:
+
+* **Simultaneous Fitting**: Fit all spectra at the same time as a multi-domain
+ function.
+
+* **Sequential Fitting**: Has two different modes of operation specified by the
+ "Fit Type" property:
+
+ * *Sequential*: in which the fitted parameters of the previous spectrum are
+ used as the starting values for the next one.
+ * *Individual*: when all spectra have the same starting values.
+
+Another import general option in the bottom panel is the *CreateOutput* option
+(available in sequential mode). With this checked, as well as the output
+parameters, the fit will also output a workspace with the normalised covariance
+matrices and workspace with parameters for each spectrum. It will also output
+one workspace for each spectrum containing the data, fitted model, and
+difference between model and data.
+
+.. figure:: ../images/multidataset-fitting/multidataset-fit-prop.png
+ :align: center
+ :width: 300px
+
+ The fit property browser. The top panel contains the specifics of the model
+ to fit. The bottom panel contains general parameters not associated with
+ the model.
+
+
+A model can be created by right clicking and choosing "Add function" in the top
+panel of the fit property window. This will produce a dialog box containing a
+large number of different fit functions which can be added to the model.
+
+.. figure:: ../images/multidataset-fitting/multidataset-fit-prop-dialog.png
+ :align: center
+ :width: 400px
+
+ The dialog containing the list of fit functions that can be added to the
+ model.
+
+After adding a function a new entry will appear in the top left panel with the
+name of the fit function and a list of fitting parameters. The user can enter
+appropriate guesses at starting values for the model parameters. Once a model
+has been created the "Plot Guess" checkbox can be used to show a plot of the
+model in the spectrum viewer using the starting parameter. To fit the model
+click the "Fit" button.
+
+
+.. figure:: ../images/multidataset-fitting/multidataset-fit-prop-with-model.png
+ :align: center
+ :width: 300px
+
+ The fit property browser with a model added. The browser shows the current
+ starting values for each of the parameters of the model.
+
+Global Parameters & Ties
+^^^^^^^^^^^^^^^^^^^^^^^^
+In the simultaneous fitting model parameters can be set as global. This means
+the same parameter will be shared across all spectra. To set a parameter as
+global click the checkbox in the "Global" column of the fit property browser
+next to the name and value of the model parameter.
+
+.. figure:: ../images/multidataset-fitting/multidataset-global-param.png
+ :align: center
+ :width: 300px
+
+ Setting a model parameter to be global.
+
+Model parameters can also be tied together or fixed to a given value. This can
+be done by right clicking on the parameter and choosing either "Tie" or "Fix".
+A fixed parameter's value will not change during a fit. A tied parameter can be
+used to either bound a parameter to a range or to tie the values of two
+parameters together.
+
+.. figure:: ../images/multidataset-fitting/multidataset-fit-prop-right-click.png
+ :align: center
+ :width: 300px
+
+ Right clicking on a parameter shows the context menu with the fix, tie, and
+ contraint options
+
+.. figure:: ../images/multidataset-fitting/multidataset-set-tie.png
+ :align: center
+ :width: 300px
+
+ Tieing the height parameter to the sigma parameter. More complex expressions
+ are allowed. See the documentation in the :ref:`Fit <algm-Fit-v1>`
+ algorithm.
+
+.. figure:: ../images/multidataset-fitting/multidataset-tie-added.png
+ :align: center
+ :width: 300px
+
+ The fit property browser after the tie has been added to the parameter.
+
+Local Parameters
+^^^^^^^^^^^^^^^^
+As well as setting the starting values for global parameters, the local
+parameter values of the model used for each spectrum can be set individually.
+The local parameter values can be edited by clicking on the value you wish to
+modify, then clicking on the "..." button next to the value. This will open a
+dialog of values for every spectrum. Here individual values can be set, fixed,
+and tied as with the global parameters.
+
+.. figure:: ../images/multidataset-fitting/multidataset-edit-local-params.png
+ :align: center
+ :width: 400px
+
+ Button to open the window to edit local parameter values.
+
+.. figure:: ../images/multidataset-fitting/multidataset-local-params.png
+ :align: center
+ :width: 800px
+
+ Editing local parameter values for each spectrum.
+
+Spectrum Viewer
+---------------
+
+The spectrum viewer is shown in the bottom panel of the interface. This shows a
+plot of a single spectrum from the loaded list. It also shows a plot of the
+model with the current parameters overlaid on the spectrum. Using the buttons
+shown in the screenshot below the user can select which spectrum they wish to
+view. The plot is interactive and can be panned and zoomed.
+
+The user can also interactively select `x` bounds either for a single spectrum
+or for all spectra by selecting the "Apply to all spectra option. To select
+`x` bounds click and drag the blue dashed vertical lines to move define the
+fitting window.
+
+.. figure:: ../images/multidataset-fitting/multidataset-spectrum-view.png
+ :align: center
+ :width: 800px
+
+ The spectrum view in the multidataset fitting interface.
+
+.. categories:: Interfaces Fitting
diff --git a/docs/source/release/v3.13.0/framework.rst b/docs/source/release/v3.13.0/framework.rst
index 9d92983ad682b1eefd08c7ca32a38ad54636a03b..dc5e9719f56eeb2e1839f63ed112ae9b71cd343c 100644
--- a/docs/source/release/v3.13.0/framework.rst
+++ b/docs/source/release/v3.13.0/framework.rst
@@ -31,7 +31,7 @@ Algorithms
New
###
-- Sometimes the algorithm you are looking at is close to what you want, but not quite, to help you find the right one a list of Related Algorithms has been added to each algorithm, and is displayed in the documentation page of each algorithm as part of it's summary.
+- Sometimes the algorithm you are looking at is close to what you want, but not quite, to help you find the right one a list of related algorithms has been added to each algorithm, and is displayed in the documentation page of each algorithm as part of it's summary.
New Algorithms
**************
diff --git a/docs/source/release/v3.13.0/index.rst b/docs/source/release/v3.13.0/index.rst
index 2e20ee15545a56340c4ce9b5613f3cbfccf89cca..d2ce930b2e3c1f95203fc5c08030da0c250ded67 100644
--- a/docs/source/release/v3.13.0/index.rst
+++ b/docs/source/release/v3.13.0/index.rst
@@ -8,7 +8,7 @@ Mantid 3.13.0 Release Notes
:class: screenshot
:align: right
- Mantid introduces project recovery for Mantidplot, Mantid maintains a recovery script while running, in the event of a crash or unexpected shutdown of Mantidplot Mantid will attempt to recover to it's most recent recovery checkpoint.
+ Mantid introduces project recovery for Mantidplot.
.. contents:: Table of Contents
:local:
@@ -16,7 +16,7 @@ Mantid 3.13.0 Release Notes
We are proud to announce version 3.13.0 of Mantid.
-This release includes a first implementation of Project Recovery for Mantidplot to allow Mantid to handle scanning workspaces, Mantid maintains a recovery script while running, in the event of a crash or unexpected shutdown of Mantidplot Mantid will attempt to recover to it's most recent recovery checkpoint. This feature may not fully recover in all situations, but we will continue to improve it in future releases. There have also been some significant performance enhancements in the instrument view.
+This release includes a first implementation of Project Recovery for Mantidplot, Mantid maintains a recovery script while running, in the event of a crash or unexpected shutdown of Mantidplot Mantid will attempt to recover to it's most recent recovery checkpoint. This feature may not fully recover in all situations, but we will continue to improve it in future releases. There have also been some significant performance enhancements in the instrument view, improvements in error reporting, and the peaks view within the slice viewer now handles non-orthogonal axes.
These are just some of the many improvements in this release, so please take a
look at the release notes, which are filled with details of the
diff --git a/docs/source/release/v3.13.0/ui.rst b/docs/source/release/v3.13.0/ui.rst
index 8ef871f513c8218b267535d992ef0428e74f92f7..6dd5dbad52f737b4d3732de3bb3f1e465e3c64dc 100644
--- a/docs/source/release/v3.13.0/ui.rst
+++ b/docs/source/release/v3.13.0/ui.rst
@@ -5,30 +5,51 @@ UI & Usability Changes
.. contents:: Table of Contents
:local:
-:ref:`Release 3.13.0 <v3.13.0>`
MantidPlot
----------
- MantidPlot's pyplot API has been removed.
+-
+.. figure:: ../../images/WorkspaceWidgetSortSize.png
+ :class: screenshot
+ :align: right
+ :figwidth: 70%
Improvements
############
- Added functionality to sort based on Memory Size of the workspace
-.. figure:: ../../images/WorkspaceWidgetSortSize.png
- :class: screenshot
- :align: center
- :figwidth: 70%
-
Bugfixes
########
- A bug in the load dialog where bad filename input would cause the last file to be loaded has been fixed.
- Fix crash when starting the Mantid VSI on MacOS.
+SliceViewer
+-----------
+
+Improvements
+############
+
+- A peaks workspace can now be overlaid on the slice viewer when the non-orthogonal view is displayed.
+
+.. figure:: ../../images/NonOrthogonalPeaksSV.png
+ :class: screenshot
+ :align: center
+ :figwidth: 70%
+
+
+DGS Planner
+-----------
+
+New
+###
+
+- DGSPlanner has an option to load the UB matrix from the Nexus file metadata
+
Instrument View
---------------
@@ -36,7 +57,7 @@ Improvements
############
.. figure:: ../../images/instrument-view.png
- :align: center
+ :align: right
:width: 700px
The instrument view showing data from WISH.
@@ -45,7 +66,7 @@ The `Instrument View
<https://www.mantidproject.org/MantidPlot:_Instrument_View>`__ visualization
tool in Mantid has undergone some major changes under-the-hood which has
resulted in a smoother, more responsive interface. Instruments generally load
-faster as well. Below are a few noteworthy improvements to load times:
+faster as well. Below are a few noteworthy improvements to load times (as tested on Windows 10):
+------------+-----------+
| Instrument | Speedup |
@@ -63,27 +84,5 @@ faster as well. Below are a few noteworthy improvements to load times:
| CNCS | 2x |
+------------+-----------+
-Tested on Windows 10.
-
-
-SliceViewer
------------
-Improvements
-############
-
-- A peaks workspace can now be overlaid on the slice viewer when the non-orthogonal view is displayed.
-
-.. figure:: ../../images/NonOrthogonalPeaksSV.png
- :class: screenshot
- :align: center
- :figwidth: 70%
-
-
-DGS Planner
------------
-
-New
-###
-
-- DGSPlanner has an option to load the UB matrix from the Nexus file metadata
+:ref:`Release 3.13.0 <v3.13.0>`
\ No newline at end of file