Re #11619. Unit test for ExtractSpectra.

mantidproject · Apr 28, 2015 · 0bd1993 · 0bd1993
1 parent 2e0326d
commit 0bd1993
Show file tree

Hide file tree

Showing 4 changed files with 384 additions and 24 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/CropWorkspace.cpp b/Code/Mantid/Framework/Algorithms/src/CropWorkspace.cpp
@@ -69,7 +69,7 @@ void CropWorkspace::init() {
  */
 void CropWorkspace::exec() {
 
-  auto extract = createChildAlgorithm("ExtractSpectra");
+  auto extract = createChildAlgorithm("ExtractSpectra", 0, 1);
   extract->initialize();
   extract->setRethrows(true);
 

diff --git a/Code/Mantid/Framework/Algorithms/src/ExtractSpectra.cpp b/Code/Mantid/Framework/Algorithms/src/ExtractSpectra.cpp
@@ -29,7 +29,7 @@ DECLARE_ALGORITHM(ExtractSpectra)
 /** Constructor
  */
 ExtractSpectra::ExtractSpectra()
-    : Algorithm(), m_minX(0), m_maxX(0), //m_minSpec(-1), m_maxSpec(-1),
+    : Algorithm(), m_minX(0), m_maxX(0),
       m_commonBoundaries(false), m_histogram(false), m_croppingInX(false) {}
 
 //----------------------------------------------------------------------------------------------

diff --git a/Code/Mantid/Framework/Algorithms/src/RemoveMaskedSpectra.cpp b/Code/Mantid/Framework/Algorithms/src/RemoveMaskedSpectra.cpp
@@ -80,7 +80,7 @@ void RemoveMaskedSpectra::exec() {
   std::vector<specid_t> indices;
   makeIndexList(indices, maskedWorkspace.get());
 
-  auto extract = createChildAlgorithm("ExtractSpectra");
+  auto extract = createChildAlgorithm("ExtractSpectra", 0, 1);
   extract->initialize();
   extract->setRethrows(true);
 
@@ -114,7 +114,7 @@ void RemoveMaskedSpectra::makeIndexList(
       } catch (Exception::NotFoundError &) {
         continue;
       }
-      if (det->isMasked()) {
+      if (!det->isMasked()) {
         indices.push_back(static_cast<specid_t>(i));
       }
     }