From ffc61101c7996b80df6751064d54d8f707de656c Mon Sep 17 00:00:00 2001
From: Vickie Lynch <lynchve@ornl.gov>
Date: Sat, 5 Mar 2011 15:42:14 +0000
Subject: [PATCH] Refs #2320 Add masking to MultipleScattering and SaveGSS
---
.../Framework/Algorithms/src/MultipleScatteringAbsorption.cpp | 2 +-
Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/Framework/Algorithms/src/MultipleScatteringAbsorption.cpp b/Code/Mantid/Framework/Algorithms/src/MultipleScatteringAbsorption.cpp
index e4570e7cc99..4bc3c97bed2 100644
--- a/Code/Mantid/Framework/Algorithms/src/MultipleScatteringAbsorption.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/MultipleScatteringAbsorption.cpp
@@ -111,7 +111,7 @@ void MultipleScatteringAbsorption::exec()
MantidVec tof_vec = in_WS->readX(index);
MantidVec y_vec = in_WS->readY(index);
- apply_msa_correction( total_path, tth_rad, radius,
+ if ( !det->isMasked() ) apply_msa_correction( total_path, tth_rad, radius,
coeff1, coeff2, coeff3,
tof_vec, y_vec);
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp b/Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp
index 106060da21e..672d5b129f5 100644
--- a/Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp
@@ -125,6 +125,8 @@ void SaveGSS::exec()
double l1, l2, tth;
for (int i=0;i<nHist;i++)
{
+ Geometry::IDetector_const_sptr det = inputWS->getDetector(i);
+ if ( det->isMasked() ) break;
getFocusedPos(inputWS, i, l1, l2, tth);
if (!split && i==0) // Assign only one file
{
--
GitLab