re #11550 Fix for EQSANSLoad

mantidproject · Apr 17, 2015 · b0bbb4e · b0bbb4e
1 parent 2e3ee85
commit b0bbb4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
@@ -202,7 +202,7 @@ void DgsConvertToEnergyTransfer::exec() {
         Workspace_sptr monWSOutput = loadmon->getProperty("OutputWorkspace");
         // the algorithm can return a group workspace if the file is multi period
         monWS = boost::dynamic_pointer_cast<MatrixWorkspace>(monWSOutput);
-        if (!monWS) {
+        if ((monWSOutput) && (!monWS)) {
           //this was a group workspace - DGSReduction does not support multi period data yet
           throw Exception::NotImplementedError(
             "The file contains multi period data, support for this is not implemented in DGSReduction yet");

diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
@@ -517,8 +517,8 @@ void EQSANSLoad::exec() {
     if (loadMonitors && loadAlg->existsProperty("MonitorWorkspace")) {
       Workspace_sptr monWSOutput = loadAlg->getProperty("MonitorWorkspace");
       MatrixWorkspace_sptr monWS = boost::dynamic_pointer_cast<MatrixWorkspace>(monWSOutput);
-      if (!monWS) {
-        //this was a group workspace - DGSReduction does not support multi period data yet
+      if ((monWSOutput) && (!monWS)) {
+        //this was a group workspace - EQSansLoad does not support multi period data yet
         throw Exception::NotImplementedError(
           "The file contains multi period data, support for this is not implemented in EQSANSLoad yet");
       }