Skip to content

Commit

Permalink
Merge pull request #18857 from mantidproject/18856_indirect_diff_osir…
Browse files Browse the repository at this point in the history
…is_crash

Indirect Diffraction - OSIRIS diffonly interface crash
  • Loading branch information
SimonHeybrock committed Feb 16, 2017
2 parents 413f081 + 68e2143 commit a3147bb
Show file tree
Hide file tree
Showing 2 changed files with 8 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
2 changes: 2 additions & 0 deletions docs/source/release/v3.10.0/indirect_inelastic.rst
Expand Up @@ -31,4 +31,6 @@ Improvements
Bugfixes
--------

- The *Diffraction* Interface no longer crashes when in OSIRIS diffonly mode

`Full list of changes on GitHub <http://github.com/mantidproject/mantid/pulls?q=is%3Apr+milestone%3A%22Release+3.10%22+is%3Amerged+label%3A%22Component%3A+Indirect+Inelastic%22>`_

0 comments on commit a3147bb

Please sign in to comment.