From b55eca529fb4cbf5baeceb28dd2a57454e6526cc Mon Sep 17 00:00:00 2001
From: Louise McCann <louise.mccann@stfc.ac.uk>
Date: Tue, 14 Feb 2017 17:56:36 +0000
Subject: [PATCH] Cherry pick pull request #18857

Refs #18856 don't run general diffraction if OSIRIS diffonly

(cherry picked from commit abc0d75e2af600a7385a1dbe09394956752b19ff)

Refs #18856 spelling etc

(cherry picked from commit 7a233cfb2bac1f029b13786cd1eb29fbf9218a2e)

Add patch release note
---
 .../src/Indirect/IndirectDiffractionReduction.cpp    | 12 ++++++------
 docs/source/release/v3.9.1/index.rst                 |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp b/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
index 26f5dce2adda..aaf4cd9ae869 100644
--- a/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
+++ b/MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
@@ -115,7 +115,7 @@ void IndirectDiffractionReduction::run() {
   if (instName == "OSIRIS") {
     if (mode == "diffonly") {
       if (!validateVanCal()) {
-        showInformationBox("Vaniduium and Calibration input is invalid.");
+        showInformationBox("Vanadium and Calibration input is invalid.");
         return;
       }
       runOSIRISdiffonlyReduction();
@@ -131,8 +131,8 @@ void IndirectDiffractionReduction::run() {
       showInformationBox("Rebinning parameters are incorrect.");
       return;
     }
+    runGenericReduction(instName, mode);
   }
-  runGenericReduction(instName, mode);
 }
 
 /**
@@ -364,7 +364,7 @@ void IndirectDiffractionReduction::runGenericReduction(QString instName,
                                     m_uiForm.spCanScale->value());
   }
 
-  // Add the pproperty for grouping policy if needed
+  // Add the property for grouping policy if needed
   if (m_uiForm.ckIndividualGrouping->isChecked())
     msgDiffReduction->setProperty("GroupingPolicy", "Individual");
 
@@ -470,7 +470,7 @@ void IndirectDiffractionReduction::runOSIRISdiffonlyReduction() {
  *
  * Optionally loads an IPF if a reflection was provided.
  *
- * @param instrumentName Name of an inelastic indiretc instrument (IRIS, OSIRIN,
+ * @param instrumentName Name of an inelastic indirect instrument (IRIS, OSIRIS,
  *TOSCA, VESUVIO)
  * @param reflection Reflection mode to load parameters for (diffspec or
  *diffonly)
@@ -645,7 +645,7 @@ void IndirectDiffractionReduction::saveSettings() {
 /**
  * Validates the rebinning fields and updates invalid markers.
  *
- * @returns True if reinning options are valid, flase otherwise
+ * @returns True if reining options are valid, false otherwise
  */
 bool IndirectDiffractionReduction::validateRebin() {
   QString rebStartTxt = m_uiForm.leRebinStart->text();
@@ -736,7 +736,7 @@ bool IndirectDiffractionReduction::validateCalOnly() {
 }
 
 /**
- * Disables and shows message on run button indicating that run files have benn
+ * Disables and shows message on run button indicating that run files have been
  * changed.
  */
 void IndirectDiffractionReduction::runFilesChanged() {
diff --git a/docs/source/release/v3.9.1/index.rst b/docs/source/release/v3.9.1/index.rst
index 82a67b6fafd0..01f52da141b3 100644
--- a/docs/source/release/v3.9.1/index.rst
+++ b/docs/source/release/v3.9.1/index.rst
@@ -25,6 +25,7 @@ Changes in this version
 -----------------------
 
 * `18833 <https://www.github.com/mantidproject/mantid/pull/18833>`_ Added check for if nonorthogonal axes should be displayed
+* `18857 <https://www.github.com/mantidproject/mantid/pull/18857>`_ Indirect Diffraction - OSIRIS diffonly interface crash
 * `18865 <https://www.github.com/mantidproject/mantid/pull/18865>`_ Fix bug in reflectometry GUI
 * `18875 <https://www.github.com/mantidproject/mantid/pull/18875>`_ U correction not correctly applied to viewport
 * `18891 <https://www.github.com/mantidproject/mantid/pull/18891>`_ Fix bug in gd_prtn_chrg for chunked data
@@ -43,6 +44,8 @@ Summary of impact
 +=======+===================================================================================+=============================================+==============+
 | 18833 | HKL axes now respect the non-orthogonal checkbox                                  | Add check if button is in a checked state   | **low**      |
 +-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
+| 18857 | Diffraction reduction in diffonly mode does not crash fro OSIRIS                  | Only run OSIRIS-specific reduction          | **low**      |
++-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
 | 18865 | Correct behaviour when no transmission run is provided                            | Add check if runs are provided              | **low**      |
 +-------+-----------------------------------------------------------------------------------+---------------------------------------------+--------------+
 | 18875 | Displays all of instrument when U correction applied                              | Apply U correction in appropriate all places| **medium**   |