Refs #5453 and #5678. Forgot some parameters.

mantidproject · Aug 16, 2012 · 57a6329 · 57a6329
1 parent 01ecbd7
commit 57a6329
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp
@@ -111,6 +111,8 @@ namespace WorkflowAlgorithms
     // Numeric properties
     const double huge = reductionManager->getProperty("HighCounts");
     const double tiny = reductionManager->getProperty("LowCounts");
+    const double vanOutHi = reductionManager->getProperty("HighOutlier");
+    const double vanOutLo = reductionManager->getProperty("LowOutlier");
     const double vanHi = reductionManager->getProperty("MedianTestHigh");
     const double vanLo = reductionManager->getProperty("MedianTestLow");
     const double vanSigma = reductionManager->getProperty("ErrorBarCriterion");
@@ -256,6 +258,8 @@ namespace WorkflowAlgorithms
     diag->setProperty("SampleBackgroundWorkspace", backgroundIntWS);
     diag->setProperty("LowThreshold", tiny);
     diag->setProperty("HighThreshold", huge);
+    diag->setProperty("LowOutlier", vanOutLo);
+    diag->setProperty("HighOutlier", vanOutHi);
     diag->setProperty("LowThresholdFraction", vanLo);
     diag->setProperty("HighThresholdFraction", vanHi);
     diag->setProperty("SignificanceTest", vanSigma);

diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsReduction.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/DgsReduction.cpp
@@ -188,6 +188,14 @@ namespace WorkflowAlgorithms
         "Mask detectors below this threshold.");
     this->setPropertySettings("LowCounts",
         new VisibleWhenProperty("FindBadDetectors", IS_EQUAL_TO, "1"));
+    this->declareProperty("LowOutlier", 0.01,
+    	"Lower bound defining outliers as fraction of median value");
+    this->setPropertySettings("LowOutlier",
+    	new VisibleWhenProperty("FindBadDetectors", IS_EQUAL_TO, "1"));
+    this->declareProperty("HighOutlier", 100.,
+    	"Upper bound defining outliers as fraction of median value");
+    this->setPropertySettings("HighOutlier",
+    	new VisibleWhenProperty("FindBadDetectors", IS_EQUAL_TO, "1"));
     this->declareProperty("MedianTestHigh", 3.0, mustBePositive,
         "Mask detectors above this threshold.");
     this->setPropertySettings("MedianTestHigh",
@@ -261,6 +269,8 @@ namespace WorkflowAlgorithms
     this->setPropertyGroup("OutputMaskFile", findBadDets);
     this->setPropertyGroup("HighCounts", findBadDets);
     this->setPropertyGroup("LowCounts", findBadDets);
+    this->setPropertyGroup("LowOutlier", findBadDets);
+    this->setPropertyGroup("HighOutlier", findBadDets);
     this->setPropertyGroup("MedianTestHigh", findBadDets);
     this->setPropertyGroup("MedianTestLow", findBadDets);
     this->setPropertyGroup("ErrorBarCriterion", findBadDets);