Correct for Solid Angle option in DgsReduction diagnostic. Refs #7787

Also fixed SaveVanadium option to be visible in the auto-generated gui

Code/Mantid/Framework/Algorithms/src/DetectorDiagnostic.cpp

@@ -125,6 +125,8 @@ namespace Mantid
       this->setPropertyGroup("LowOutlier", medianDetTestGrp);
       this->declareProperty("HighOutlier", 100., "Upper bound defining outliers as fraction of median value");
       this->setPropertyGroup("HighOutlier", medianDetTestGrp);
+      this->declareProperty("CorrectForSolidAngle", false, "Flag to correct for solid angle efficiency. False by default.");
+      this->setPropertyGroup("CorrectForSolidAngle", medianDetTestGrp);
       this->declareProperty("ExcludeZeroesFromMedian", false, "If false (default) zeroes will be included in "
           "the median calculation, otherwise they will not be included but they will be left unmasked");
       this->setPropertyGroup("ExcludeZeroesFromMedian", medianDetTestGrp);
@@ -163,6 +165,9 @@ namespace Mantid
           "Error criterion as a multiple of error bar i.e. to fail the test, the magnitude of the\n"
           "difference with respect to the median value must also exceed this number of error bars");
       this->setPropertyGroup("SampleBkgSignificanceTest", backgroundCheck);
+      this->declareProperty("SampleCorrectForSolidAngle", false,
+          "Flag to correct for solid angle efficiency for background check MedianDetectorTest. False by default.");
+      this->setPropertyGroup("SampleCorrectForSolidAngle",backgroundCheck);
 
       string psdBleedMaskGrp("Create PSD Bleed Mask");
       this->declareProperty(new WorkspaceProperty<>("SampleWorkspace", "",
@@ -298,6 +303,7 @@ namespace Mantid
         double significanceTest = this->getProperty("SampleBkgSignificanceTest");
         double lowThreshold = this->getProperty("SampleBkgLowAcceptanceFactor");
         double highThreshold = this->getProperty("SampleBkgHighAcceptanceFactor");
+        bool correctSA=this->getProperty("SampleCorrectForSolidAngle");
 
         // run the ChildAlgorithm
         IAlgorithm_sptr alg = this->createChildAlgorithm("MedianDetectorTest",
@@ -312,6 +318,7 @@ namespace Mantid
         alg->setProperty("LowOutlier", 0.0);
         alg->setProperty("HighOutlier", 1.0e100);
         alg->setProperty("ExcludeZeroesFromMedian", true);
+        alg->setProperty("CorrectForSolidAngle",correctSA);
         alg->executeAsChildAlg();
         MatrixWorkspace_sptr localMaskWS = alg->getProperty("OutputWorkspace");
         applyMask(inputWS, localMaskWS);
@@ -411,6 +418,7 @@ namespace Mantid
       double lowOutlier = this->getProperty("LowOutlier");
       double highOutlier = this->getProperty("HighOutlier");
       bool excludeZeroes = this->getProperty("ExcludeZeroesFromMedian");
+      bool correctforSA = this->getProperty("CorrectForSolidAngle");
 
       // MedianDetectorTest
       // apply mask to what we are going to input
@@ -432,6 +440,7 @@ namespace Mantid
       mdt->setProperty("LowOutlier", lowOutlier);
       mdt->setProperty("HighOutlier", highOutlier);
       mdt->setProperty("ExcludeZeroesFromMedian", excludeZeroes);
+      mdt->setProperty("CorrectForSolidAngle",correctforSA);
       mdt->executeAsChildAlg();
       localMask = mdt->getProperty("OutputWorkspace");
       localFails = mdt->getProperty("NumberOfFailures");

Code/Mantid/Framework/WorkflowAlgorithms/src/DgsDiagnose.cpp

@@ -130,6 +130,8 @@ namespace Mantid
           reductionManager, "diag_samp_zero", detVanWS);
       const bool createPsdBleed = getBoolPropOrParam("PsdBleed",
           reductionManager, "diag_bleed_test", detVanWS);
+      const bool vanSA = getBoolPropOrParam("MediantestCorectForSolidAngle",
+          reductionManager, "diag_correct_solid_angle", detVanWS);
 
       // Numeric properties
       const double huge = getDblPropOrParam("HighCounts",
@@ -306,6 +308,7 @@ namespace Mantid
       diag->setProperty("LowThresholdFraction", vanLo);
       diag->setProperty("HighThresholdFraction", vanHi);
       diag->setProperty("LevelsUp",vanLevelsUp);
+      diag->setProperty("CorrectForSolidAngle",vanSA);
       diag->setProperty("SignificanceTest", vanSigma);
       diag->setProperty("DetVanRatioVariation", variation);
       diag->setProperty("SampleBkgLowAcceptanceFactor", samLo);

Code/Mantid/Framework/WorkflowAlgorithms/src/DgsReduction.cpp

@@ -178,7 +178,7 @@ namespace Mantid
       this->declareProperty("SaveProcessedDetVan", false,
           "Save the processed detector vanadium workspace");
       this->setPropertySettings("SaveProcessedDetVan",
-          new VisibleWhenProperty("SaveProcessedDetVan", IS_EQUAL_TO, "1"));
+          new VisibleWhenProperty("DetectorVanadiumInputFile", IS_NOT_EQUAL_TO, ""));
       this->declareProperty(new FileProperty("SaveProcDetVanFilename", "",
           FileProperty::OptionalSave, ".nxs"),
           "Provide a filename for saving the processed detector vanadium.");
@@ -253,6 +253,10 @@ namespace Mantid
           "Mask detectors below this threshold.");
       this->setPropertySettings("MedianTestLevelsUp",
           new VisibleWhenProperty("DetectorVanadiumInputFile", IS_NOT_EQUAL_TO, ""));
+      this->declareProperty("MedianTestCorrectForSolidAngle", false,
+          "Flag to correct for solid angle efficiency.");
+      this->setPropertySettings("MedianTestCorrectForSolidAngle",
+          new VisibleWhenProperty("DetectorVanadiumInputFile", IS_NOT_EQUAL_TO, ""));
       this->declareProperty("ErrorBarCriterion", EMPTY_DBL(), mustBePositive,
           "Some selection criteria for the detector tests.");
       this->setPropertySettings("ErrorBarCriterion",
@@ -311,7 +315,8 @@ namespace Mantid
       this->setPropertyGroup("HighOutlier", findBadDets);
       this->setPropertyGroup("MedianTestHigh", findBadDets);
       this->setPropertyGroup("MedianTestLow", findBadDets);
-      this->setPropertyGroup("MediantestLevelsUp", findBadDets);
+      this->setPropertyGroup("MedianTestLevelsUp", findBadDets);
+      this->setPropertyGroup("MedianTestCorrectForSolidAngle", findBadDets);
       this->setPropertyGroup("ErrorBarCriterion", findBadDets);
       this->setPropertyGroup("DetectorVanadium2InputFile", findBadDets);
       this->setPropertyGroup("DetectorVanadium2InputWorkspace", findBadDets);