Refs #4814. Fixed potential bug when instrument is null.

mantidproject · Feb 21, 2012 · 00066c1 · 00066c1
1 parent fc17b2b
commit 00066c1
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/FindDetectorsOutsideLimits.cpp b/Code/Mantid/Framework/Algorithms/src/FindDetectorsOutsideLimits.cpp
@@ -144,14 +144,17 @@ namespace Mantid
           interruption_point();
         }
 
-        if (instrument->isMonitor(i))
+        if (checkForMask)
         {
-          continue; // do include or exclude from mask
-        }
+          if (instrument->isMonitor(i))
+          {
+            continue; // do include or exclude from mask
+          }
 
-        if (instrument->isDetectorMasked(i))
-        {
-          keepData = false;
+          if (instrument->isDetectorMasked(i))
+          {
+            keepData = false;
+          }
         }
 
         const double & yValue = countsWS->readY(i)[0];