Merge remote-tracking branch 'origin/master' into to_pdfgetn_workflow_algorithm

.gitignore

@@ -166,7 +166,7 @@ Desktop.ini
 .tags
 .tags_sorted_by_file
 
-Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/LibHelper.h
+Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/LibHelper.h
 
 
 # Make sure Third_Party doesn't get checked into the main repository

MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp

@@ -447,6 +447,15 @@ void ISISEnergyTransfer::plotRaw() {
     return;
   }
 
+  if (m_uiForm.ckBackgroundRemoval->isChecked() == true) {
+    int startBack = m_uiForm.spBackgroundStart->value();
+    int endBack = m_uiForm.spBackgroundEnd->value();
+    if (startBack > endBack) {
+      emit showMessageBox("Background Start must be less than Background End");
+      return;
+    }
+  }
+
   QString rawFile = m_uiForm.dsRunFiles->getFirstFilename();
   auto pos = rawFile.lastIndexOf(".");
   auto extension = rawFile.right(rawFile.length() - pos);