refs #6667 Modified WFA helper to understand bool property

this should fix DGSReduction algorithm
mantidproject · Jul 7, 2013 · 2d4a934 · 2d4a934
1 parent 0559208
commit 2d4a934
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/WorkflowAlgorithmHelpers.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/WorkflowAlgorithmHelpers.cpp
@@ -80,11 +80,24 @@ namespace WorkflowAlgorithmHelpers
     }
     else
     {
-      std::vector<double> params = ws->getInstrument()->getNumberParameter(instParam);
-      if (!params.empty())
-      {
-        param = (params[0] != 0.0);
-      }
+        try
+        {
+           std::vector<bool> params = ws->getInstrument()->getBoolParameter(instParam);
+           if (!params.empty())
+                param = params[0];
+           else
+               param = false;
+        }
+        catch(std::runtime_error &) // Old style bool parameter expressed as double
+        {
+           std::vector<double> params = ws->getInstrument()->getNumberParameter(instParam);
+           if (!params.empty())
+           {
+                param = (params[0] != 0.0);
+           }
+        }
+
+
     }
     if(defaultValue != overrideValue)
     {