Refs #4814. Simplest conversion ever. Needs work.

mantidproject · Feb 21, 2012 · 330ce42 · 330ce42
1 parent b285d08
commit 330ce42
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/MedianDetectorTest.cpp b/Code/Mantid/Framework/Algorithms/src/MedianDetectorTest.cpp
@@ -114,7 +114,13 @@ namespace Mantid
                        << "\tNumber of failures - " << numFailed << "\n";
 
       setProperty("NumberOfFailures", numFailed);
-      setProperty("OutputWorkspace", countsWS);
+
+      // extract and set the mask result
+      IAlgorithm_sptr childAlg = createSubAlgorithm("ExtractMask");
+      childAlg->setProperty( "InputWorkspace", countsWS );
+      childAlg->executeAsSubAlg();
+      MatrixWorkspace_sptr maskWS = childAlg->getProperty("OutputWorkspace");
+      setProperty("OutputWorkspace", maskWS);
     }
 
     /** Loads and checks the values passed to the algorithm

diff --git a/Code/Mantid/Framework/Algorithms/test/MedianDetectorTestTest.h b/Code/Mantid/Framework/Algorithms/test/MedianDetectorTestTest.h
@@ -190,7 +190,7 @@ class MedianDetectorTestTest : public CxxTest::TestSuite
   double m_YSum;
   enum spectraIndexConsts{ THEMASKED = 40, SAVEDBYERRORBAR = 143, Nhist = 144 };
   //these values must match the values in MedianDetectorTest.h
-  enum FLAGS{ BAD_VAL = 0, GOOD_VAL = 1 };
+  enum FLAGS{ BAD_VAL = 1, GOOD_VAL = 0 };
 
 };