Skip to content

Commit

Permalink
Cherry pick pull request #18857
Browse files Browse the repository at this point in the history
Refs #18856 don't run general diffraction if OSIRIS diffonly

(cherry picked from commit abc0d75)

Refs #18856 spelling etc

(cherry picked from commit 7a233cf)

Add patch release note
  • Loading branch information
louisemccann authored and martyngigg committed Feb 23, 2017
1 parent 2cd3b15 commit b55eca5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
Expand Up @@ -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();
Expand All @@ -131,8 +131,8 @@ void IndirectDiffractionReduction::run() {
showInformationBox("Rebinning parameters are incorrect.");
return;
}
runGenericReduction(instName, mode);
}
runGenericReduction(instName, mode);
}

/**
Expand Down Expand Up @@ -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");

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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() {
Expand Down
3 changes: 3 additions & 0 deletions docs/source/release/v3.9.1/index.rst
Expand Up @@ -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
Expand All @@ -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** |
Expand Down

0 comments on commit b55eca5

Please sign in to comment.