From b48663d89bd44919da1983e9cf024cc33d32644b Mon Sep 17 00:00:00 2001
From: Gagik Vardanyan <vardanyan@ill.fr>
Date: Tue, 20 Nov 2018 13:28:57 +0100
Subject: [PATCH] Re #23692 make MaskBinsIf to mask bins, instead of flag
masked
---
Framework/Algorithms/src/MaskBinsIf.cpp | 2 +-
.../mantid/api/src/Exports/MatrixWorkspace.cpp | 7 +++----
docs/source/algorithms/MaskBinsIf-v1.rst | 2 --
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Framework/Algorithms/src/MaskBinsIf.cpp b/Framework/Algorithms/src/MaskBinsIf.cpp
index 898895c2913..46f49a02170 100644
--- a/Framework/Algorithms/src/MaskBinsIf.cpp
+++ b/Framework/Algorithms/src/MaskBinsIf.cpp
@@ -115,7 +115,7 @@ void MaskBinsIf::exec() {
e = it->countStandardDeviation();
dx = hasDx ? it->centerError() : 0.;
if (parser.Eval() != 0.) {
- outputWorkspace->flagMasked(index, bin);
+ outputWorkspace->maskBin(index, bin);
}
}
progress->report();
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index 97946fea7b7..4eb12c63631 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -187,11 +187,10 @@ Mantid::API::Run &getSampleDetailsDeprecated(MatrixWorkspace &self) {
}
/**
- * @brief maskedBinsIndices This is an anonymous wrapper around the homonym
- * method of MatrixWorkspace. This takes int as argument and returns a vector of
- * ints to python, unlike the C++ size_t, since python does not speak unsigned
+ * This is an anonymous wrapper around the homonym method of MatrixWorkspace.
+ * This takes int as argument since python does not speak unsigned.
* @param self
- * @param i : workspace index
+ * @param i : workspace index [int]
* @return bin indices of masked bins at the workspace index given
*/
std::vector<size_t> maskedBinsIndices(MatrixWorkspace &self, const int i) {
diff --git a/docs/source/algorithms/MaskBinsIf-v1.rst b/docs/source/algorithms/MaskBinsIf-v1.rst
index 7157b5a3a67..c7abb846c31 100644
--- a/docs/source/algorithms/MaskBinsIf-v1.rst
+++ b/docs/source/algorithms/MaskBinsIf-v1.rst
@@ -19,8 +19,6 @@ The variables entering the criteria are reserved as follows:
- dx : the error on the bin center
- s : the value of spectrum axis, which has to be SpectraAxis or NumericAxis.
-Note that it preserves the data in the masked bins, just flags them as masked.
-
Usage
-----
--
GitLab