Refs #4814. Added overload for isMonitor.

mantidproject · Feb 21, 2012 · 8b4ad1c · 8b4ad1c
1 parent bfdf820
commit 8b4ad1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h
@@ -79,6 +79,7 @@ namespace Mantid
 
       IDetector_const_sptr getDetector(const detid_t &detector_id) const;
       bool isMonitor(const detid_t &detector_id) const;
+      bool isMonitor(const std::set<detid_t> &detector_ids) const;
       bool isDetectorMasked(const detid_t &detector_id) const;
       bool isDetectorMasked(const std::set<detid_t> &detector_ids) const;
 

diff --git a/Code/Mantid/Framework/Geometry/src/Instrument.cpp b/Code/Mantid/Framework/Geometry/src/Instrument.cpp
@@ -465,6 +465,19 @@ namespace Mantid
       return det->isMonitor();
     }
 
+    bool Instrument::isMonitor(const std::set<detid_t> &detector_ids) const
+    {
+      if (detector_ids.empty())
+        return false;
+
+      for (std::set<detid_t>::const_iterator it = detector_ids.begin(); it != detector_ids.end(); ++it)
+      {
+        if (this->isMonitor(*it))
+          return true;
+      }
+      return false;
+    }
+
     //--------------------------------------------------------------------------
     /** Is the detector with the given ID masked?
      *