Refs #4826. More appropriate return for isDetectorMasked.

mantidproject · Feb 21, 2012 · dfae42f · dfae42f
1 parent 330ce42
commit dfae42f
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/Detector.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/Detector.cpp
@@ -124,13 +124,11 @@ bool Detector::isMasked() const
   if (m_isParametrized)
   {
     Parameter_sptr par = m_map->get(m_base,"masked");
-    return par ? true : false;
-  }
-  else
-  {
-    // If you get to here, instead of the Detector method, then it isn't masked
-    return false;
+    if (par)
+      return par->value<bool>();
   }
+  // If you get to here, instead of the Detector method, then it isn't masked
+  return false;
 }
 
 /// Is the detector a monitor?