Merge pull request #14531 from mantidproject/14527_Indirect_Bayes_ResNorm_validation

MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp

@@ -54,35 +54,40 @@ void ResNorm::setup() {}
 bool ResNorm::validate() {
   UserInputValidator uiv;
 
-  // Check vanadium input is _red ws
-  QString vanadiumName = m_uiForm.dsVanadium->getCurrentDataName();
-  int cutIndex = vanadiumName.lastIndexOf("_");
-  QString vanadiumSuffix =
-      vanadiumName.right(vanadiumName.size() - (cutIndex + 1));
-  if (vanadiumSuffix.compare("red") != 0) {
-    uiv.addErrorMessage("The Vanadium run is not a reduction (_red) workspace");
-  }
-
-  // Check Res and Vanadium are the same Run
+  const bool vanValid = uiv.checkDataSelectorIsValid("Vanadium", m_uiForm.dsVanadium);
+  const bool resValid = uiv.checkDataSelectorIsValid("Resolution", m_uiForm.dsResolution);
+
+  if (vanValid) {
+    // Check vanadium input is _red ws
+    QString vanadiumName = m_uiForm.dsVanadium->getCurrentDataName();
+    int cutIndex = vanadiumName.lastIndexOf("_");
+    QString vanadiumSuffix =
+        vanadiumName.right(vanadiumName.size() - (cutIndex + 1));
+    if (vanadiumSuffix.compare("red") != 0) {
+      uiv.addErrorMessage(
+          "The Vanadium run is not a reduction (_red) workspace");
+    }
 
-  // Check that Res file is still in ADS if not, load it
-  auto resolutionWs =
-      AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
-          m_uiForm.dsResolution->getCurrentDataName().toStdString());
-  auto vanadiumWs = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
-      vanadiumName.toStdString());
+    // Check Res and Vanadium are the same Run
+    if (resValid) {
+      // Check that Res file is still in ADS if not, load it
+      auto resolutionWs =
+          AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
+              m_uiForm.dsResolution->getCurrentDataName().toStdString());
+      auto vanadiumWs =
+          AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
+              vanadiumName.toStdString());
 
-  const int resRun = resolutionWs->getRunNumber();
-  const int vanRun = vanadiumWs->getRunNumber();
+      const int resRun = resolutionWs->getRunNumber();
+      const int vanRun = vanadiumWs->getRunNumber();
 
-  if (resRun != vanRun) {
-    uiv.addErrorMessage("The provided Vanadium and Resolution do not have "
-                        "matching run numbers");
+      if (resRun != vanRun) {
+        uiv.addErrorMessage("The provided Vanadium and Resolution do not have "
+                            "matching run numbers");
+      }
+    }
   }
 
-  uiv.checkDataSelectorIsValid("Vanadium", m_uiForm.dsVanadium);
-  uiv.checkDataSelectorIsValid("Resolution", m_uiForm.dsResolution);
-
   QString errors = uiv.generateErrorMessage();
   if (!errors.isEmpty()) {
     emit showMessageBox(errors);