diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp index eb8d8e4ca09ea88a30df3b82c23f3d981521c4e0..e8ebd276f88dc431cf33ee1a74d9d55dee6839fc 100644 --- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp +++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp @@ -612,7 +612,6 @@ void EnggDiffractionPresenter::runFittingAlgs( FocusedFitPeaksTableName + " workspace could not be found. " "Please check the log messages for more details."); - return; }; ITableWorkspace_sptr table = @@ -742,7 +741,6 @@ void EnggDiffractionPresenter::runCropWorkspaceAlg(std::string workspaceName) { cropWS->initialize(); cropWS->setProperty("InputWorkspace", workspaceName); cropWS->setProperty("OutputWorkspace", workspaceName); - std::string outputWorkspace = "engggui_fitting_single_peaks"; cropWS->setProperty("StartWorkspaceIndex", 1); cropWS->setProperty("EndWorkspaceIndex", 1); cropWS->execute(); diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp index 7ca46e018c86acb8a63691f760340a08acaeb58f..57af3533f3f8c87a176e9c4f5c03eb3b54997c70 100644 --- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp +++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp @@ -1218,15 +1218,14 @@ std::string EnggDiffractionViewQtGUI::fittingPeaksData() const { m_uiTabFitting.lineEdit_fitting_peaks->text().toStdString(); size_t strLength = exptPeaks.length() - 1; - char ch = ','; if (!exptPeaks.empty()) { - if (exptPeaks.at(size_t(0)) == ch) { + if (exptPeaks.at(size_t(0)) == ',') { exptPeaks.erase(size_t(0), 1); strLength -= size_t(1); } - if (exptPeaks.at(strLength) == ch) { + if (exptPeaks.at(strLength) == ',') { exptPeaks.erase(strLength, 1); } } diff --git a/docs/source/interfaces/Engineering_Diffraction.rst b/docs/source/interfaces/Engineering_Diffraction.rst index b02fad0755aaedd51a53870497d78563920240db..30bfeea1644e4b939ab52275b09795b9628b51d6 100644 --- a/docs/source/interfaces/Engineering_Diffraction.rst +++ b/docs/source/interfaces/Engineering_Diffraction.rst @@ -300,7 +300,7 @@ Output Once the Fit button has been clicked, wait until the Fitting process has completed and upon completion you should be able to view on the Fitting -tab the focused workspace plotted in the background in black, whereas the +tab plots the focused workspace in the background in black, whereas the expected peaks plotted in various colours over lapping the focused workspace peaks.