Refs #4814. Fixing a bug found during MedianDetectorTest conversion.

mantidproject · Feb 21, 2012 · c410162 · c410162
1 parent 00a743a
commit c410162
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/DetectorDiagnostic.cpp b/Code/Mantid/Framework/Algorithms/src/DetectorDiagnostic.cpp
@@ -147,9 +147,10 @@ namespace Mantid
         PARALLEL_START_INTERUPT_REGION
 
         if (checkForMask) {
-          if (instrument->isDetectorMasked(i))
+          const std::set<detid_t>& detids = input->getSpectrum(i)->getDetectorIDs();
+          if (instrument->isDetectorMasked(detids))
             continue;
-          if (instrument->isMonitor(i))
+          if (instrument->isMonitor(detids))
             continue;
         }
 

diff --git a/Code/Mantid/Framework/Algorithms/src/DetectorEfficiencyVariation.cpp b/Code/Mantid/Framework/Algorithms/src/DetectorEfficiencyVariation.cpp
@@ -239,9 +239,10 @@ namespace Mantid
 
         if (checkForMask)
         {
-          if(instrument->isMonitor(i))
+          const std::set<detid_t>& detids = counts1->getSpectrum(i)->getDetectorIDs();
+          if(instrument->isMonitor(detids))
             continue;
-          if(instrument->isDetectorMasked(i))
+          if(instrument->isDetectorMasked(detids))
           {
             // Ensure it is masked on the output
             maskWS->dataY(i)[0] = deadValue;

diff --git a/Code/Mantid/Framework/Algorithms/src/FindDetectorsOutsideLimits.cpp b/Code/Mantid/Framework/Algorithms/src/FindDetectorsOutsideLimits.cpp
@@ -146,12 +146,13 @@ namespace Mantid
 
         if (checkForMask)
         {
-          if (instrument->isMonitor(i))
+          const std::set<detid_t>& detids = countsWS->getSpectrum(i)->getDetectorIDs();
+          if (instrument->isMonitor(detids))
           {
             continue; // do include or exclude from mask
           }
 
-          if (instrument->isDetectorMasked(i))
+          if (instrument->isDetectorMasked(detids))
           {
             keepData = false;
           }