Refs #5855. Fixes to get things to work.

mantidproject · Sep 12, 2012 · 73e9fb3 · 73e9fb3
1 parent 8671337
commit 73e9fb3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsRemap.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsRemap.cpp
@@ -59,9 +59,11 @@ namespace WorkflowAlgorithms
     this->declareProperty(new WorkspaceProperty<MatrixWorkspace>("InputWorkspace",
         "", Direction::Input), "An input workspace to mask and group.");
     this->declareProperty(new WorkspaceProperty<MatrixWorkspace>("MaskWorkspace",
-        "", Direction::Input), "A workspace containing masking information.");
+        "", Direction::Input, PropertyMode::Optional),
+        "A workspace containing masking information.");
     this->declareProperty(new WorkspaceProperty<MatrixWorkspace>("GroupingWorkspace",
-        "", Direction::Input), "A workspace containing grouping information");
+        "", Direction::Input, PropertyMode::Optional),
+        "A workspace containing grouping information");
     this->declareProperty(new WorkspaceProperty<MatrixWorkspace>("OutputWorkspace",
         "", Direction::Output), "The resulting workspace.");
   }
@@ -93,10 +95,11 @@ namespace WorkflowAlgorithms
 
       IAlgorithm_sptr group = this->createSubAlgorithm("GroupDetectors");
       group->setProperty("InputWorkspace", inputWS);
-      group->setProperty("OutputWorkspace", outputWS);
+      group->setProperty("OutputWorkspace", inputWS);
       group->setProperty("DetectorList", groupDetIdList);
       group->setProperty("Behaviour", "Average");
       group->executeAsSubAlg();
+      outputWS = group->getProperty("OutputWorkspace");
     }
 
     this->setProperty("OutputWorkspace", outputWS);