Adding mask check to Instrument. Refs #4208.

mantidproject · Dec 8, 2011 · e7e8986 · e7e8986
1 parent d4649e1
commit e7e8986
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h
@@ -77,6 +77,9 @@ namespace Mantid
       Kernel::V3D getBeamDirection() const;
 
       IDetector_const_sptr getDetector(const detid_t &detector_id) const;
+      bool isDetectorMasked(const detid_t &detector_id) const;
+      bool isDetectorMasked(const std::set<detid_t> &detector_ids) const;
+
       /// Returns a pointer to the geometrical object for the given set of IDs
       IDetector_const_sptr getDetectorG(const std::vector<detid_t> &det_ids) const;
 

diff --git a/Code/Mantid/Framework/Geometry/src/Instrument.cpp b/Code/Mantid/Framework/Geometry/src/Instrument.cpp
@@ -427,6 +427,26 @@ namespace Mantid
       }
     }
 
+    bool Instrument::isDetectorMasked(const detid_t &detector_id) const
+    {
+      return m_instr->getDetector(detector_id)->isMasked();
+    }
+
+    bool Instrument::isDetectorMasked(const std::set<detid_t> &detector_ids) const
+    {
+      if (detector_ids.empty())
+      {
+        throw Kernel::Exception::NotFoundError("No detectors specified in isDetectorMasked", "");
+      }
+
+      for (std::set<detid_t>::const_iterator it = detector_ids.begin(); it != detector_ids.end(); ++it)
+      {
+        if (! this->isDetectorMasked(*it))
+          return false;
+      }
+      return true;
+    }
+
     /**
      * Returns a pointer to the geometrical object for the given set of IDs
      * @param det_ids :: A list of detector ids