Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Indirect Diffraction - OSIRIS diffonly interface crash #18857

Merged
merged 3 commits into from Feb 16, 2017
Merged

Indirect Diffraction - OSIRIS diffonly interface crash #18857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abc0d75
Refs #18856 don't run general diffraction if OSIRIS diffonly
louisemccann Feb 14, 2017
7a233cf
Refs #18856 spelling etc
louisemccann Feb 14, 2017
68e2143
Refs #18856 release notes
louisemccann Feb 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions MantidQt/CustomInterfaces/src/Indirect/IndirectDiffractionReduction.cpp
View file
Open in desktop
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
View file
Open in desktop
Expand Up @@ -26,4 +26,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>`_