diff --git a/Framework/API/test/MatrixWorkspaceTest.h b/Framework/API/test/MatrixWorkspaceTest.h
index 179b650cd338bfa50bbc0cfcfb955251895c73e0..0a4b1b727b2c9e26e333c680def7cb28c39466fe 100644
--- a/Framework/API/test/MatrixWorkspaceTest.h
+++ b/Framework/API/test/MatrixWorkspaceTest.h
@@ -328,7 +328,7 @@ public:
auto workspace = makeWorkspaceWithDetectors(numHist, 1);
std::atomic<bool> parallelException{false};
std::atomic<int> threadCount{1};
- PARALLEL_FOR1(workspace)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*workspace))
for (int i = 0; i < numHist; ++i) {
// Note: Cannot use INTERUPT_REGION macros since not inside an Algorithm.
threadCount = PARALLEL_NUMBER_OF_THREADS;
diff --git a/Framework/API/test/SpectrumInfoTest.h b/Framework/API/test/SpectrumInfoTest.h
index 0b691a0b0ce3e437881a81fcfefed03e6b9bf93c..b5032e7a6ea9f6e4fca896b01f9f76dfedb38cd3 100644
--- a/Framework/API/test/SpectrumInfoTest.h
+++ b/Framework/API/test/SpectrumInfoTest.h
@@ -97,7 +97,7 @@ public:
SpectrumInfo info(*ws);
// This attempts to test threading, but probably it is not really exercising
// much.
- PARALLEL_FOR1(ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*ws))
for (int i = 0; i < count; ++i)
TS_ASSERT_EQUALS(info.isMasked(static_cast<size_t>(i)), i % 2 == 0);
}
diff --git a/Framework/Algorithms/src/BinaryOperation.cpp b/Framework/Algorithms/src/BinaryOperation.cpp
index 2408a18fd52dd668977a88e0344204d54f3ead14..a6b1ff5a1e6e84356472a89c49bca87ea0c80f94 100644
--- a/Framework/Algorithms/src/BinaryOperation.cpp
+++ b/Framework/Algorithms/src/BinaryOperation.cpp
@@ -835,7 +835,7 @@ void BinaryOperation::propagateBinMasks(
void BinaryOperation::applyMaskingToOutput(API::MatrixWorkspace_sptr out) {
int64_t nindices = static_cast<int64_t>(m_indicesToMask.size());
ParameterMap &pmap = out->instrumentParameters();
- PARALLEL_FOR1(out)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*out))
for (int64_t i = 0; i < nindices; ++i) {
if (!m_parallelException && !m_cancel) {
try {
diff --git a/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp b/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp
index b3245bdb626e5836d2beb1d748504348c3b0cf80..34064c126408e2105adbe61508039e32c61a972f 100644
--- a/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp
+++ b/Framework/Algorithms/src/ConvertAxesToRealSpace.cpp
@@ -228,7 +228,7 @@ void ConvertAxesToRealSpace::exec() {
// set all the X arrays - share the same vector
int nOutputHist = static_cast<int>(outputWs->getNumberHistograms());
- PARALLEL_FOR1(outputWs)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWs))
for (int i = 0; i < nOutputHist; ++i) {
outputWs->setPoints(i, x);
}
@@ -255,7 +255,7 @@ void ConvertAxesToRealSpace::exec() {
}
// loop over the data and sqrt the errors to complete the error calculation
- PARALLEL_FOR1(outputWs)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWs))
for (int i = 0; i < nOutputHist; ++i) {
auto &errorVec = outputWs->mutableE(i);
std::transform(errorVec.begin(), errorVec.end(), errorVec.begin(),
diff --git a/Framework/Algorithms/src/ConvertAxisByFormula.cpp b/Framework/Algorithms/src/ConvertAxisByFormula.cpp
index 050fb69fc574bca7cdf9dffe1b80f842e0cbe004..5941af7807e84f817f720ee98027f19a5d52d29c 100644
--- a/Framework/Algorithms/src/ConvertAxisByFormula.cpp
+++ b/Framework/Algorithms/src/ConvertAxisByFormula.cpp
@@ -214,7 +214,7 @@ void ConvertAxisByFormula::exec() {
outputWs->getNumberHistograms()); // cast to make openmp happy
auto xVals = outputWs->refX(0);
Progress prog(this, 0.6, 1.0, numberOfSpectra_i);
- PARALLEL_FOR1(outputWs)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWs))
for (int64_t j = 1; j < numberOfSpectra_i; ++j) {
PARALLEL_START_INTERUPT_REGION
outputWs->setX(j, xVals);
diff --git a/Framework/Algorithms/src/ConvertToEventWorkspace.cpp b/Framework/Algorithms/src/ConvertToEventWorkspace.cpp
index c98105f6c15e0df7d830c8ce3d4f2ea676aca32b..7aa9ba3508a64f4b71f453850f3697364995366d 100644
--- a/Framework/Algorithms/src/ConvertToEventWorkspace.cpp
+++ b/Framework/Algorithms/src/ConvertToEventWorkspace.cpp
@@ -62,7 +62,7 @@ void ConvertToEventWorkspace::exec() {
API::WorkspaceFactory::Instance().initializeFromParent(inWS, outWS, false);
Progress prog(this, 0.0, 1.0, inWS->getNumberHistograms());
- PARALLEL_FOR1(inWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*inWS))
for (int iwi = 0; iwi < int(inWS->getNumberHistograms()); iwi++) {
PARALLEL_START_INTERUPT_REGION
size_t wi = size_t(iwi);
diff --git a/Framework/Algorithms/src/ConvertUnits.cpp b/Framework/Algorithms/src/ConvertUnits.cpp
index 83d1698a0677d1b2f98945274b296b5fc5235ff8..331013b771e9bff9fa258e0bb01b8d61610a3636 100644
--- a/Framework/Algorithms/src/ConvertUnits.cpp
+++ b/Framework/Algorithms/src/ConvertUnits.cpp
@@ -289,7 +289,7 @@ API::MatrixWorkspace_sptr ConvertUnits::setupOutputWorkspace(
if (!m_inputEvents && m_distribution) {
// Loop over the histograms (detector spectra)
Progress prog(this, 0.0, 0.2, m_numberOfSpectra);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t i = 0; i < static_cast<int64_t>(m_numberOfSpectra); ++i) {
PARALLEL_START_INTERUPT_REGION
// Take the bin width dependency out of the Y & E data
@@ -355,7 +355,7 @@ ConvertUnits::convertQuickly(API::MatrixWorkspace_const_sptr inputWS,
auto xVals = outputWS->sharedX(0);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t j = 1; j < numberOfSpectra_i; ++j) {
PARALLEL_START_INTERUPT_REGION
outputWS->setX(j, xVals);
@@ -375,7 +375,7 @@ ConvertUnits::convertQuickly(API::MatrixWorkspace_const_sptr inputWS,
// If we get to here then the bins weren't aligned and each spectrum is
// unique
// Loop over the histograms (detector spectra)
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t k = 0; k < numberOfSpectra_i; ++k) {
PARALLEL_START_INTERUPT_REGION
if (!commonBoundaries) {
@@ -710,7 +710,7 @@ void ConvertUnits::reverse(API::MatrixWorkspace_sptr WS) {
} else {
// either events or ragged boundaries
int numberOfSpectra_i = static_cast<int>(numberOfSpectra);
- PARALLEL_FOR1(WS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*WS))
for (int j = 0; j < numberOfSpectra_i; ++j) {
PARALLEL_START_INTERUPT_REGION
if (isInputEvents) {
diff --git a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
index 8b57d341e7e833955bb9cb70312da437f6b05ab3..9906fb3a512a4d65e02ca9485a32508cb45d996c 100644
--- a/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
+++ b/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
@@ -176,7 +176,7 @@ MatrixWorkspace_sptr ConvertUnitsUsingDetectorTable::convertViaTOF(
// TODO: Check why this parallel stuff breaks
// Loop over the histograms (detector spectra)
- // PARALLEL_FOR1(outputWS)
+ // PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t i = 0; i < numberOfSpectra_i; ++i) {
// Lets find what row this spectrum Number appears in our detector table.
diff --git a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
index f66241d770cb7cc0effb9ead55caf9dd78c11050..ff4a27633e09540e514db233157aa51ed61540c5 100644
--- a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
+++ b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
@@ -185,7 +185,7 @@ void CorelliCrossCorrelate::exec() {
int64_t numHistograms = static_cast<int64_t>(inputWS->getNumberHistograms());
API::Progress prog = API::Progress(this, 0.0, 1.0, numHistograms);
const auto &spectrumInfo = inputWS->spectrumInfo();
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t i = 0; i < numHistograms; ++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/CorrectKiKf.cpp b/Framework/Algorithms/src/CorrectKiKf.cpp
index ff2631863c6c486d26ac980df871912395ac77f5..49611e20d851c8d88125234d0f79abaad8a2db74 100644
--- a/Framework/Algorithms/src/CorrectKiKf.cpp
+++ b/Framework/Algorithms/src/CorrectKiKf.cpp
@@ -222,7 +222,7 @@ void CorrectKiKf::execEvent() {
int64_t numHistograms = static_cast<int64_t>(inputWS->getNumberHistograms());
API::Progress prog = API::Progress(this, 0.0, 1.0, numHistograms);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t i = 0; i < numHistograms; ++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/CreateWorkspace.cpp b/Framework/Algorithms/src/CreateWorkspace.cpp
index 7758b7d839840cce8d2e4d6b84f0c4868f2ee6ae..37d473426418ea0314c4d5535d3a39bd856c8400 100644
--- a/Framework/Algorithms/src/CreateWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateWorkspace.cpp
@@ -158,7 +158,7 @@ void CreateWorkspace::exec() {
Progress progress(this, 0, 1, nSpec);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int i = 0; i < nSpec; i++) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/DiffractionFocussing2.cpp b/Framework/Algorithms/src/DiffractionFocussing2.cpp
index f35dfe6ff89762178a5025d925f5ada41afde0ae..38cef9356043c7e7e103fcbbd513ca01d881c63e 100644
--- a/Framework/Algorithms/src/DiffractionFocussing2.cpp
+++ b/Framework/Algorithms/src/DiffractionFocussing2.cpp
@@ -431,7 +431,7 @@ void DiffractionFocussing2::execEvent() {
// ------ PARALLELIZE BY GROUPS -------------------------
int nValidGroups = static_cast<int>(this->m_validGroups.size());
- PARALLEL_FOR1(m_eventW)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*m_eventW))
for (int iGroup = 0; iGroup < nValidGroups; iGroup++) {
PARALLEL_START_INTERUPT_REGION
const int group = this->m_validGroups[iGroup];
diff --git a/Framework/Algorithms/src/EQSANSTofStructure.cpp b/Framework/Algorithms/src/EQSANSTofStructure.cpp
index 08904c774abca9f66f2920acd09139d6ebb38931..9ead21fc227ed6270966e6fc3485160c189c7ce9 100644
--- a/Framework/Algorithms/src/EQSANSTofStructure.cpp
+++ b/Framework/Algorithms/src/EQSANSTofStructure.cpp
@@ -131,7 +131,7 @@ void EQSANSTofStructure::execEvent(
const auto l1 = spectrumInfo.l1();
// Loop through the spectra and apply correction
- PARALLEL_FOR1(inputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*inputWS))
for (int64_t ispec = 0; ispec < int64_t(numHists); ++ispec) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/ExtractFFTSpectrum.cpp b/Framework/Algorithms/src/ExtractFFTSpectrum.cpp
index c7c9c5c441845e751745154be265ed91a11dc470..41350451a879537b5bf84a9eae5b85e11d0b156e 100644
--- a/Framework/Algorithms/src/ExtractFFTSpectrum.cpp
+++ b/Framework/Algorithms/src/ExtractFFTSpectrum.cpp
@@ -45,7 +45,7 @@ void ExtractFFTSpectrum::exec() {
Progress prog(this, 0.0, 1.0, numHists);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int i = 0; i < numHists; i++) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/FilterByXValue.cpp b/Framework/Algorithms/src/FilterByXValue.cpp
index 9ae5ee3133842468f3159582dde608701e8354e0..8a11b9add4f7157a1056f1ec2839ce6da0a44ce9 100644
--- a/Framework/Algorithms/src/FilterByXValue.cpp
+++ b/Framework/Algorithms/src/FilterByXValue.cpp
@@ -85,7 +85,7 @@ void FilterByXValue::exec() {
Progress prog(this, 0.0, 1.0, numSpec);
// Loop over the workspace, removing the events that don't pass the filter
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int spec = 0; spec < numSpec; ++spec) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/GetDetectorOffsets.cpp b/Framework/Algorithms/src/GetDetectorOffsets.cpp
index 3f20683ea86634d330b737b1e1dd530d05581fe9..5ce99a549b31ded3c5c9594601522212aa645330 100644
--- a/Framework/Algorithms/src/GetDetectorOffsets.cpp
+++ b/Framework/Algorithms/src/GetDetectorOffsets.cpp
@@ -108,7 +108,7 @@ void GetDetectorOffsets::exec() {
// Fit all the spectra with a gaussian
Progress prog(this, 0, 1.0, nspec);
- PARALLEL_FOR1(inputW)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*inputW))
for (int wi = 0; wi < nspec; ++wi) {
PARALLEL_START_INTERUPT_REGION
// Fit the peak
diff --git a/Framework/Algorithms/src/He3TubeEfficiency.cpp b/Framework/Algorithms/src/He3TubeEfficiency.cpp
index 72052a9840aa6095a6aecb00e3dbcf4f004b74b1..f660924b2d31cee0496c92b43f3123705d5eb1ae 100644
--- a/Framework/Algorithms/src/He3TubeEfficiency.cpp
+++ b/Framework/Algorithms/src/He3TubeEfficiency.cpp
@@ -422,7 +422,7 @@ void He3TubeEfficiency::execEvent() {
std::size_t numHistograms = outputWS->getNumberHistograms();
this->progress = new API::Progress(this, 0.0, 1.0, numHistograms);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int i = 0; i < static_cast<int>(numHistograms); ++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/IntegrateByComponent.cpp b/Framework/Algorithms/src/IntegrateByComponent.cpp
index 06b10990bcad9b228fba447e32c2dfed29bf0620..2b0999898b2bf2d7b042f5a45af684d958e4220c 100644
--- a/Framework/Algorithms/src/IntegrateByComponent.cpp
+++ b/Framework/Algorithms/src/IntegrateByComponent.cpp
@@ -78,7 +78,7 @@ void IntegrateByComponent::exec() {
prog.report();
std::vector<double> averageYInput, averageEInput;
- PARALLEL_FOR1(integratedWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*integratedWS))
for (int i = 0; i < static_cast<int>(hists.size()); ++i) { // NOLINT
PARALLEL_START_INTERUPT_REGION
@@ -115,7 +115,7 @@ void IntegrateByComponent::exec() {
gsl_stats_mean(&averageEInput[0], 1, averageYInput.size()));
}
- PARALLEL_FOR1(integratedWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*integratedWS))
for (int i = 0; i < static_cast<int>(hists.size()); ++i) { // NOLINT
PARALLEL_START_INTERUPT_REGION
if (spectrumInfo.isMonitor(hists[i]))
diff --git a/Framework/Algorithms/src/LorentzCorrection.cpp b/Framework/Algorithms/src/LorentzCorrection.cpp
index 7a07c9aab748653b28bd5642a0b58ef0a4eb254a..0f6a39be93ff287918771db0485cae2392ca3753 100644
--- a/Framework/Algorithms/src/LorentzCorrection.cpp
+++ b/Framework/Algorithms/src/LorentzCorrection.cpp
@@ -67,7 +67,7 @@ void LorentzCorrection::exec() {
const auto &spectrumInfo = inWS->spectrumInfo();
Progress prog(this, 0, 1, numHistos);
- PARALLEL_FOR1(inWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*inWS))
for (int64_t i = 0; i < int64_t(numHistos); ++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/MaskBins.cpp b/Framework/Algorithms/src/MaskBins.cpp
index be0774bc56df61ce24849b13359b293312357b1f..454de81284b4f6471b86a1fc58f24190b39b3300 100644
--- a/Framework/Algorithms/src/MaskBins.cpp
+++ b/Framework/Algorithms/src/MaskBins.cpp
@@ -172,7 +172,7 @@ void MaskBins::execEvent() {
// Go through all histograms
if (!this->spectra_list.empty()) {
// Specific spectra were specified
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int i = 0; i < static_cast<int>(this->spectra_list.size()); // NOLINT
++i) {
PARALLEL_START_INTERUPT_REGION
@@ -183,7 +183,7 @@ void MaskBins::execEvent() {
PARALLEL_CHECK_INTERUPT_REGION
} else {
// Do all spectra!
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t i = 0; i < int64_t(numHists); ++i) {
PARALLEL_START_INTERUPT_REGION
outputWS->getSpectrum(i).maskTof(m_startX, m_endX);
diff --git a/Framework/Algorithms/src/MedianDetectorTest.cpp b/Framework/Algorithms/src/MedianDetectorTest.cpp
index ec1dd565999a8f67ebdf5a09de8287e53b247560..8844f32e172146c517f6e2be5ffcba795eda476d 100644
--- a/Framework/Algorithms/src/MedianDetectorTest.cpp
+++ b/Framework/Algorithms/src/MedianDetectorTest.cpp
@@ -251,7 +251,7 @@ int MedianDetectorTest::maskOutliers(
std::vector<size_t> &hists = indexmap[i];
double median = medianvec[i];
- PARALLEL_FOR1(countsWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*countsWS))
for (int j = 0; j < static_cast<int>(hists.size()); ++j) { // NOLINT
const double value = countsWS->y(hists[j])[0];
if ((value == 0.) && checkForMask) {
diff --git a/Framework/Algorithms/src/ModeratorTzero.cpp b/Framework/Algorithms/src/ModeratorTzero.cpp
index ec95fa9103727b9560d2189bd261952f599f2157..488e1099cf704aa023bf61b33ce14a385bcd5b73 100644
--- a/Framework/Algorithms/src/ModeratorTzero.cpp
+++ b/Framework/Algorithms/src/ModeratorTzero.cpp
@@ -260,7 +260,7 @@ void ModeratorTzero::execEvent(const std::string &emode) {
// Loop over the spectra
const size_t numHists = static_cast<size_t>(outputWS->getNumberHistograms());
Progress prog(this, 0.0, 1.0, numHists); // report progress of algorithm
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int i = 0; i < static_cast<int>(numHists); ++i) {
PARALLEL_START_INTERUPT_REGION
size_t wsIndex = static_cast<size_t>(i);
diff --git a/Framework/Algorithms/src/ModeratorTzeroLinear.cpp b/Framework/Algorithms/src/ModeratorTzeroLinear.cpp
index 4790a0452537d2db4837142aaf43d5040c6fc944..d13fb6f89e68e43efca0fd6ae96c3f2ccdf0cf21 100644
--- a/Framework/Algorithms/src/ModeratorTzeroLinear.cpp
+++ b/Framework/Algorithms/src/ModeratorTzeroLinear.cpp
@@ -186,7 +186,7 @@ void ModeratorTzeroLinear::execEvent() {
// Loop over the spectra
const size_t numHists = outputWS->getNumberHistograms();
Progress prog(this, 0.0, 1.0, numHists); // report progress of algorithm
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int i = 0; i < static_cast<int>(numHists); ++i) {
size_t wsIndex = static_cast<size_t>(i);
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/MonteCarloAbsorption.cpp b/Framework/Algorithms/src/MonteCarloAbsorption.cpp
index f63783f3c4efd98a94ce22c5998bacbacd24d5c3..8162a10ff461403d4d707d177b1483450aa92c34 100644
--- a/Framework/Algorithms/src/MonteCarloAbsorption.cpp
+++ b/Framework/Algorithms/src/MonteCarloAbsorption.cpp
@@ -156,7 +156,7 @@ MonteCarloAbsorption::doSimulation(const MatrixWorkspace &inputWS,
// Configure strategy
MCAbsorptionStrategy strategy(*beamProfile, inputWS.sample(), nevents);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t i = 0; i < nhists; ++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp b/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
index 94eee967db754fd23db014f7a54598e3abe7d4a4..b5b36909d76cdb054925789939bfc6a2e967f700 100644
--- a/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
+++ b/Framework/Algorithms/src/MultipleScatteringCylinderAbsorption.cpp
@@ -170,7 +170,7 @@ void MultipleScatteringCylinderAbsorption::exec() {
// now do the correction
const auto &spectrumInfo = out_WSevent->spectrumInfo();
- PARALLEL_FOR1(out_WSevent)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*out_WSevent))
for (int64_t index = 0; index < NUM_HIST; ++index) {
PARALLEL_START_INTERUPT_REGION
if (!spectrumInfo.hasDetectors(index))
diff --git a/Framework/Algorithms/src/ScaleX.cpp b/Framework/Algorithms/src/ScaleX.cpp
index 3f6b646782ef2a14f2365a259fae3db045aca787..a0a1345b621eed69868a93e5650e5a6aabf2e839 100644
--- a/Framework/Algorithms/src/ScaleX.cpp
+++ b/Framework/Algorithms/src/ScaleX.cpp
@@ -182,7 +182,7 @@ void ScaleX::execEvent() {
const std::string op = getPropertyValue("Operation");
int numHistograms = static_cast<int>(outputWS->getNumberHistograms());
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int i = 0; i < numHistograms; ++i) {
PARALLEL_START_INTERUPT_REGION
// Do the offsetting
diff --git a/Framework/Algorithms/src/Stitch1D.cpp b/Framework/Algorithms/src/Stitch1D.cpp
index eafb16cae72ad334a0feb981e0543e3dc4de337d..05d0eef3bc2cfa36da72ef8eca1b937247762a4f 100644
--- a/Framework/Algorithms/src/Stitch1D.cpp
+++ b/Framework/Algorithms/src/Stitch1D.cpp
@@ -97,7 +97,7 @@ MatrixWorkspace_sptr Stitch1D::maskAllBut(int a1, int a2,
*/
void Stitch1D::maskInPlace(int a1, int a2, MatrixWorkspace_sptr source) {
const int histogramCount = static_cast<int>(source->getNumberHistograms());
- PARALLEL_FOR1(source)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*source))
for (int i = 0; i < histogramCount; ++i) {
PARALLEL_START_INTERUPT_REGION
// Copy over the data
@@ -300,7 +300,7 @@ MatrixWorkspace_sptr Stitch1D::rebin(MatrixWorkspace_sptr &input,
// Record special values and then mask them out as zeros. Special values are
// remembered and then replaced post processing.
- PARALLEL_FOR1(outWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outWS))
for (int i = 0; i < histogramCount; ++i) {
PARALLEL_START_INTERUPT_REGION
std::vector<size_t> &nanYIndexes = m_nanYIndexes[i];
@@ -461,7 +461,7 @@ Stitch1D::findStartEndIndexes(double startOverlap, double endOverlap,
bool Stitch1D::hasNonzeroErrors(MatrixWorkspace_sptr ws) {
int64_t ws_size = static_cast<int64_t>(ws->getNumberHistograms());
bool hasNonZeroErrors = false;
- PARALLEL_FOR1(ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*ws))
for (int i = 0; i < ws_size; ++i) {
PARALLEL_START_INTERUPT_REGION
if (!hasNonZeroErrors) // Keep checking
@@ -625,7 +625,7 @@ void Stitch1D::exec() {
*/
void Stitch1D::reinsertSpecialValues(MatrixWorkspace_sptr ws) {
int histogramCount = static_cast<int>(ws->getNumberHistograms());
- PARALLEL_FOR1(ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*ws))
for (int i = 0; i < histogramCount; ++i) {
PARALLEL_START_INTERUPT_REGION
// Copy over the data
diff --git a/Framework/Algorithms/src/SumEventsByLogValue.cpp b/Framework/Algorithms/src/SumEventsByLogValue.cpp
index c28194955e67852cf43ff27b09940d0a94822ceb..737cf3f16da6e45087eccc759efcd7ccb36dd02c 100644
--- a/Framework/Algorithms/src/SumEventsByLogValue.cpp
+++ b/Framework/Algorithms/src/SumEventsByLogValue.cpp
@@ -148,7 +148,7 @@ void SumEventsByLogValue::createTableOutput(
std::vector<int> Y(xLength);
const int numSpec = static_cast<int>(m_inputWorkspace->getNumberHistograms());
Progress prog(this, 0.0, 1.0, numSpec + xLength);
- PARALLEL_FOR1(m_inputWorkspace)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*m_inputWorkspace))
for (int spec = 0; spec < numSpec; ++spec) {
PARALLEL_START_INTERUPT_REGION
const IEventList &eventList = m_inputWorkspace->getSpectrum(spec);
@@ -417,7 +417,7 @@ void SumEventsByLogValue::createBinnedOutput(
MantidVec &Y = outputWorkspace->dataY(0);
const int numSpec = static_cast<int>(m_inputWorkspace->getNumberHistograms());
Progress prog(this, 0.0, 1.0, numSpec);
- PARALLEL_FOR1(m_inputWorkspace)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*m_inputWorkspace))
for (int spec = 0; spec < numSpec; ++spec) {
PARALLEL_START_INTERUPT_REGION
const IEventList &eventList = m_inputWorkspace->getSpectrum(spec);
diff --git a/Framework/Algorithms/src/UnaryOperation.cpp b/Framework/Algorithms/src/UnaryOperation.cpp
index 9f62f1e0901bdf3efa007402b261490467a71a71..31870d9c162f6b358de608f935823223c4d3319d 100644
--- a/Framework/Algorithms/src/UnaryOperation.cpp
+++ b/Framework/Algorithms/src/UnaryOperation.cpp
@@ -120,7 +120,7 @@ void UnaryOperation::execEvent() {
int64_t numHistograms = static_cast<int64_t>(outputWS->getNumberHistograms());
API::Progress prog = API::Progress(this, 0.0, 1.0, numHistograms);
- PARALLEL_FOR1(outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputWS))
for (int64_t i = 0; i < numHistograms; ++i) {
PARALLEL_START_INTERUPT_REGION
// switch to weighted events if needed, and use the appropriate helper
diff --git a/Framework/Crystal/src/FindSXPeaks.cpp b/Framework/Crystal/src/FindSXPeaks.cpp
index 92eea9600fc9843f5a1418393cb52aff3bcd0d63..111caab7bdb10f365b6365e9402edde5a2afefd6 100644
--- a/Framework/Crystal/src/FindSXPeaks.cpp
+++ b/Framework/Crystal/src/FindSXPeaks.cpp
@@ -110,7 +110,7 @@ void FindSXPeaks::exec() {
// unlikely to have more than this.
entries.reserve(1000);
// Count the peaks so that we can resize the peakvector at the end.
- PARALLEL_FOR1(localworkspace)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*localworkspace))
for (int i = static_cast<int>(m_MinSpec); i <= static_cast<int>(m_MaxSpec);
++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Crystal/src/IntegratePeaksHybrid.cpp b/Framework/Crystal/src/IntegratePeaksHybrid.cpp
index 7ded565d9a703f00a78bcecc81a4efab9a34c9b3..7ccdfd32d0ee4f652fafde3f7edd23b78420b503 100644
--- a/Framework/Crystal/src/IntegratePeaksHybrid.cpp
+++ b/Framework/Crystal/src/IntegratePeaksHybrid.cpp
@@ -173,7 +173,7 @@ void IntegratePeaksHybrid::exec() {
Progress progress(this, 0, 1, peakWS->getNumberPeaks());
- PARALLEL_FOR1(peakWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*peakWS))
for (int i = 0; i < peakWS->getNumberPeaks(); ++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp b/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp
index 52f214f8939aa11e7707f553ba50f67c2967b927..7836bb9e2d7ac456a48f5812904c22b39a9d3d5e 100644
--- a/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp
+++ b/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp
@@ -150,7 +150,7 @@ void IntegratePeaksUsingClusters::exec() {
progress.doReport("Performing Peak Integration");
g_log.information("Starting Integration");
progress.resetNumSteps(peakWS->getNumberPeaks(), 0.9, 1);
- PARALLEL_FOR1(peakWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*peakWS))
for (int i = 0; i < peakWS->getNumberPeaks(); ++i) {
PARALLEL_START_INTERUPT_REGION
Geometry::IPeak &peak = peakWS->getPeak(i);
diff --git a/Framework/Crystal/src/SCDCalibratePanels.cpp b/Framework/Crystal/src/SCDCalibratePanels.cpp
index dd4f20a3a277ee2c58a1d9a2178d013ca2bd80ad..fdab7d7c0c83754edb0596d21fb2df1e09346f79 100644
--- a/Framework/Crystal/src/SCDCalibratePanels.cpp
+++ b/Framework/Crystal/src/SCDCalibratePanels.cpp
@@ -173,7 +173,7 @@ void SCDCalibratePanels::exec() {
std::vector<std::string> fit_workspaces(MyBankNames.size(), "fit_");
std::vector<std::string> parameter_workspaces(MyBankNames.size(), "params_");
- PARALLEL_FOR1(peaksWs)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*peaksWs))
for (int i = 0; i < static_cast<int>(MyBankNames.size()); ++i) {
PARALLEL_START_INTERUPT_REGION
const std::string &iBank = *std::next(MyBankNames.begin(), i);
@@ -331,7 +331,7 @@ void SCDCalibratePanels::exec() {
boost::const_pointer_cast<Geometry::Instrument>(peaksWs->getInstrument());
Geometry::OrientedLattice lattice0 =
peaksWs->mutableSample().getOrientedLattice();
- PARALLEL_FOR1(peaksWs)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*peaksWs))
for (int i = 0; i < nPeaks; i++) {
PARALLEL_START_INTERUPT_REGION
DataObjects::Peak &peak = peaksWs->getPeak(i);
diff --git a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
index 9a724205cf3cc622c2d93864d61be98548eb2369..34b5c1f92848cdc7f770087f09a16ee3e5f47a2a 100644
--- a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
+++ b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
@@ -184,7 +184,7 @@ void CreateSimulationWorkspace::createOutputWorkspace() {
m_progress = boost::make_shared<Progress>(this, 0.5, 0.75, nhistograms);
- PARALLEL_FOR1(m_outputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*m_outputWS))
for (int64_t i = 0; i < static_cast<int64_t>(nhistograms); ++i) {
m_outputWS->setBinEdges(i, binBoundaries);
m_outputWS->mutableY(i) = 1.0;
diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp
index 153b07e355ec093850659a9ee827e1e936c894e0..e980531165d180bf35c59df9bbba1b236493fd3c 100644
--- a/Framework/DataHandling/src/LoadEventNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -1614,7 +1614,7 @@ void LoadEventNexus::loadEvents(API::Progress *const prog,
if (mT0 != 0.0) {
int64_t numHistograms =
static_cast<int64_t>(m_ws->getNumberHistograms());
- PARALLEL_FOR1(m_ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*m_ws))
for (int64_t i = 0; i < numHistograms; ++i) {
PARALLEL_START_INTERUPT_REGION
// Do the offsetting
diff --git a/Framework/DataHandling/src/LoadTOFRawNexus.cpp b/Framework/DataHandling/src/LoadTOFRawNexus.cpp
index 52fa1ad85ecd08081e66cf81c7e5099e7c2c95eb..064855fe9d38f8c30bc7c2ee75a5918ac977e1fd 100644
--- a/Framework/DataHandling/src/LoadTOFRawNexus.cpp
+++ b/Framework/DataHandling/src/LoadTOFRawNexus.cpp
@@ -542,15 +542,11 @@ void LoadTOFRawNexus::exec() {
const auto id_to_wi = WS->getDetectorIDToWorkspaceIndexMap();
// Load each bank sequentially
- // PARALLEL_FOR1(WS)
for (const auto &bankName : bankNames) {
- // PARALLEL_START_INTERUPT_REGION
prog->report("Loading bank " + bankName);
g_log.debug() << "Loading bank " << bankName << '\n';
loadBank(filename, entry_name, bankName, WS, id_to_wi);
- // PARALLEL_END_INTERUPT_REGION
}
- // PARALLEL_CHECK_INTERUPT_REGION
// Set some units
if (m_xUnits == "Ang")
diff --git a/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp b/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
index 7536831d0449bc94b8dc7b38ef74fdf3f6a25044..67c9dc75f64d03b59e4ebf2609ffffa4499230d1 100644
--- a/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
+++ b/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
@@ -287,7 +287,7 @@ int SaveToSNSHistogramNexus::WriteOutDataOrErrors(
Timer tim1;
int ypixels = static_cast<int>(det->ypixels());
- PARALLEL_FOR1(inputWorkspace)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*inputWorkspace))
for (int y = 0; y < ypixels; y++) {
PARALLEL_START_INTERUPT_REGION
// Get the workspace index for the detector ID at this spot
diff --git a/Framework/DataObjects/src/Workspace2D.cpp b/Framework/DataObjects/src/Workspace2D.cpp
index 8047123d634af7d2701ee40553da588e5e9ab614..03e93c5c9e4781c84ac34d4b677b5d83d9be9162 100644
--- a/Framework/DataObjects/src/Workspace2D.cpp
+++ b/Framework/DataObjects/src/Workspace2D.cpp
@@ -43,7 +43,7 @@ Workspace2D::~Workspace2D() {
// http://social.msdn.microsoft.com/Forums/en-US/2fe4cfc7-ca5c-4665-8026-42e0ba634214/visual-studio-$
#ifdef _MSC_VER
- PARALLEL_FOR1(this)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*this))
for (int64_t i = 0; i < static_cast<int64_t>(m_noVectors); i++) {
#else
for (size_t i = 0; i < m_noVectors; ++i) {
diff --git a/Framework/Kernel/inc/MantidKernel/MultiThreaded.h b/Framework/Kernel/inc/MantidKernel/MultiThreaded.h
index f85c13d73deb5a5fe28f923e839d5d1843651bf2..0af5324ac0d919427e6b5991536ffff9c5de4356 100644
--- a/Framework/Kernel/inc/MantidKernel/MultiThreaded.h
+++ b/Framework/Kernel/inc/MantidKernel/MultiThreaded.h
@@ -145,14 +145,6 @@ threadSafe(const Arg &workspace, Args &&... others) {
#define PARALLEL_FOR_NO_WSP_CHECK_FIRSTPRIVATE2(variable1, variable2) \
PRAGMA(omp parallel for firstprivate(variable1, variable2) )
-/** Includes code to add OpenMP commands to run the next for loop in parallel.
-* The workspace is checked to ensure it is suitable for
-*multithreaded access
-* NULL workspaces are assumed suitable
-*/
-#define PARALLEL_FOR1(workspace1) \
- PRAGMA(omp parallel for if ( !workspace1 || workspace1->threadSafe() ) )
-
/** Ensures that the next execution line or block is only executed if
* there are multple threads execting in this region
*/
@@ -207,7 +199,6 @@ threadSafe(const Arg &workspace, Args &&... others) {
#define PARALLEL_FOR_NO_WSP_CHECK()
#define PARALLEL_FOR_NOWS_CHECK_FIRSTPRIVATE(variable)
#define PARALLEL_FOR_NO_WSP_CHECK_FIRSTPRIVATE2(variable1, variable2)
-#define PARALLEL_FOR1(workspace1)
#define IF_PARALLEL if (false)
#define IF_NOT_PARALLEL
#define PARALLEL_CRITICAL(name)
diff --git a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
index 1db1765f7956e41ea08f09473b0be3f9fb2de2a0..ddea559829c3fc7bd415d0711738899fbb198df4 100644
--- a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
+++ b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
@@ -366,18 +366,18 @@ void CalculateCoverageDGS::exec() {
Mantid::Geometry::GeneralFrame frame2("Q2", "");
Mantid::Geometry::GeneralFrame frame3("Q3", "");
Mantid::Geometry::GeneralFrame frame4("meV", "");
- MDHistoDimension_sptr out1(
- new MDHistoDimension("Q1", "Q1", frame1, static_cast<coord_t>(q1min),
- static_cast<coord_t>(q1max), q1NumBins));
- MDHistoDimension_sptr out2(
- new MDHistoDimension("Q2", "Q2", frame2, static_cast<coord_t>(q2min),
- static_cast<coord_t>(q2max), q2NumBins));
- MDHistoDimension_sptr out3(
- new MDHistoDimension("Q3", "Q3", frame3, static_cast<coord_t>(q3min),
- static_cast<coord_t>(q3max), q3NumBins));
- MDHistoDimension_sptr out4(new MDHistoDimension(
+ auto out1 = boost::make_shared<MDHistoDimension>(
+ "Q1", "Q1", frame1, static_cast<coord_t>(q1min),
+ static_cast<coord_t>(q1max), q1NumBins);
+ auto out2 = boost::make_shared<MDHistoDimension>(
+ "Q2", "Q2", frame2, static_cast<coord_t>(q2min),
+ static_cast<coord_t>(q2max), q2NumBins);
+ auto out3 = boost::make_shared<MDHistoDimension>(
+ "Q3", "Q3", frame3, static_cast<coord_t>(q3min),
+ static_cast<coord_t>(q3max), q3NumBins);
+ auto out4 = boost::make_shared<MDHistoDimension>(
"DeltaE", "DeltaE", frame4, static_cast<coord_t>(m_dEmin),
- static_cast<coord_t>(m_dEmax), dENumBins));
+ static_cast<coord_t>(m_dEmax), dENumBins);
for (size_t row = 0; row <= 3; row++) {
if (affineMat[row][0] == 1.) {
@@ -403,7 +403,7 @@ void CalculateCoverageDGS::exec() {
const int64_t ndets = static_cast<int64_t>(tt.size());
- PARALLEL_FOR1(inputWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(inputWS))
for (int64_t i = 0; i < ndets; i++) {
PARALLEL_START_INTERUPT_REGION
auto intersections = calculateIntersections(tt[i], phi[i]);
diff --git a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
index b28b4c769dec1b03b78a47bbcf633d3f052ba111..67072208957d5369f20b051c98230b8418fd9496 100644
--- a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
@@ -535,7 +535,7 @@ void ConvertToDiffractionMDWorkspace::exec() {
}
// 2. Process next chunk of spectra (threaded)
- PARALLEL_FOR1(m_inWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*m_inWS))
for (int i = start; i < static_cast<int>(wi); ++i) {
PARALLEL_START_INTERUPT_REGION
this->convertSpectrum(static_cast<int>(i));
diff --git a/Framework/MDAlgorithms/src/IntegrateEllipsoids.cpp b/Framework/MDAlgorithms/src/IntegrateEllipsoids.cpp
index d282d058f97c9b80fd30c6bfafa23eac566a1632..d66b667fd9674db809b6ba27aaf2614bd53db80b 100644
--- a/Framework/MDAlgorithms/src/IntegrateEllipsoids.cpp
+++ b/Framework/MDAlgorithms/src/IntegrateEllipsoids.cpp
@@ -55,7 +55,7 @@ void IntegrateEllipsoids::qListFromEventWS(Integrate3DEvents &integrator,
// loop through the eventlists
int numSpectra = static_cast<int>(wksp->getNumberHistograms());
- PARALLEL_FOR1(wksp)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*wksp))
for (int i = 0; i < numSpectra; ++i) {
PARALLEL_START_INTERUPT_REGION
@@ -129,7 +129,7 @@ void IntegrateEllipsoids::qListFromHistoWS(Integrate3DEvents &integrator,
int numSpectra = static_cast<int>(wksp->getNumberHistograms());
const bool histogramForm = wksp->isHistogramData();
- PARALLEL_FOR1(wksp)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*wksp))
for (int i = 0; i < numSpectra; ++i) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/MDAlgorithms/src/IntegratePeaksMDHKL.cpp b/Framework/MDAlgorithms/src/IntegratePeaksMDHKL.cpp
index 2a0f1fb1deb2d610abd4bb4a39bb58b3400cd5d3..0e34fc2c51c19ec8a2085c0ec9de16e8e63fb2b4 100644
--- a/Framework/MDAlgorithms/src/IntegratePeaksMDHKL.cpp
+++ b/Framework/MDAlgorithms/src/IntegratePeaksMDHKL.cpp
@@ -106,7 +106,7 @@ void IntegratePeaksMDHKL::exec() {
int npeaks = peakWS->getNumberPeaks();
auto prog = make_unique<Progress>(this, 0.3, 1.0, npeaks);
- PARALLEL_FOR1(peakWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*peakWS))
for (int i = 0; i < npeaks; i++) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp
index 1370ab0c8211e48e7c08412df0f24d1300aa8c21..99efceaf9c60422b9efa5850798b430cc6af508c 100644
--- a/Framework/MDAlgorithms/src/MDNormSCD.cpp
+++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp
@@ -401,7 +401,7 @@ void MDNormSCD::calculateNormalization(
solidAngleWS->getDetectorIDToWorkspaceIndexMap();
auto prog = make_unique<API::Progress>(this, 0.3, 1.0, ndets);
- PARALLEL_FOR1(integrFlux)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*integrFlux))
for (int64_t i = 0; i < ndets; i++) {
PARALLEL_START_INTERUPT_REGION
diff --git a/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp b/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp
index 4de89057f6fc5ffecda8e7fb113dce3bd2341492..5d1452e6baba2bb7c09a6e7d66da2c8bb9c10d37 100644
--- a/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp
@@ -188,7 +188,7 @@ void SANSSolidAngleCorrection::execEvent() {
Progress progress(this, 0.0, 1.0, numberOfSpectra);
progress.report("Solid Angle Correction");
- PARALLEL_FOR1(outputEventWS)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*outputEventWS))
for (int i = 0; i < numberOfSpectra; i++) {
PARALLEL_START_INTERUPT_REGION
IDetector_const_sptr det;
diff --git a/MantidPlot/src/Mantid/MantidMatrix.cpp b/MantidPlot/src/Mantid/MantidMatrix.cpp
index 0899f9cc2c45b8a10df82c2ce3baf6afdebef48f..54ed9704ccf130909b74806ce7f389e79fb02007 100644
--- a/MantidPlot/src/Mantid/MantidMatrix.cpp
+++ b/MantidPlot/src/Mantid/MantidMatrix.cpp
@@ -1136,7 +1136,7 @@ void findYRange(MatrixWorkspace_const_sptr ws, double &miny, double &maxy) {
if (ws) {
- PARALLEL_FOR1(ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*ws))
for (int wi = 0; wi < static_cast<int>(ws->getNumberHistograms()); wi++) {
double local_min, local_max;
const Mantid::MantidVec &Y = ws->readY(wi);
diff --git a/MantidPlot/src/Mantid/MantidUI.cpp b/MantidPlot/src/Mantid/MantidUI.cpp
index 700b7c31740ee6ae737c6464afeba8b47d30a80e..fd4405e767cdd4dd3648a9649ce85aa9c173c6b1 100644
--- a/MantidPlot/src/Mantid/MantidUI.cpp
+++ b/MantidPlot/src/Mantid/MantidUI.cpp
@@ -1267,7 +1267,7 @@ Table *MantidUI::createDetectorTable(
// value should be displayed
QVector<QList<QVariant>> tableColValues;
tableColValues.resize(nrows);
- PARALLEL_FOR1(ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*ws))
for (int row = 0; row < nrows; ++row) {
// Note PARALLEL_START_INTERUPT_REGION & friends apparently not needed (like
// in algorithms)
diff --git a/MantidQt/MantidWidgets/src/InstrumentView/InstrumentActor.cpp b/MantidQt/MantidWidgets/src/InstrumentView/InstrumentActor.cpp
index 5341ec549a17d401ffb4a23217cede43ac3b2608..7824ad8d701be064879232d01bc4478d04a020c1 100644
--- a/MantidQt/MantidWidgets/src/InstrumentView/InstrumentActor.cpp
+++ b/MantidQt/MantidWidgets/src/InstrumentView/InstrumentActor.cpp
@@ -638,7 +638,6 @@ void InstrumentActor::resetColors() {
Instrument_const_sptr inst = getInstrument();
IMaskWorkspace_sptr mask = getMaskWorkspaceIfExists();
- // PARALLEL_FOR1(m_workspace)
for (int iwi = 0; iwi < int(m_specIntegrs.size()); iwi++) {
size_t wi = size_t(iwi);
double integratedValue = m_specIntegrs[wi];
diff --git a/Vates/VatesAPI/src/LoadVTK.cpp b/Vates/VatesAPI/src/LoadVTK.cpp
index 36fcc0ca5ae8a7d3a9683adb993a8554ed18c2fd..25e2570d3a38b6a727bfece221fbe10a557bd181 100644
--- a/Vates/VatesAPI/src/LoadVTK.cpp
+++ b/Vates/VatesAPI/src/LoadVTK.cpp
@@ -258,7 +258,7 @@ void LoadVTK::execMDEvent(vtkDataSet *readDataset,
ws->initialize();
if (errorsSQ == NULL) {
- PARALLEL_FOR1(ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*ws))
for (int64_t i = 0; i < nPoints; ++i) {
PARALLEL_START_INTERUPT_REGION
double coordinates[3];
@@ -275,7 +275,7 @@ void LoadVTK::execMDEvent(vtkDataSet *readDataset,
}
PARALLEL_CHECK_INTERUPT_REGION
} else {
- PARALLEL_FOR1(ws)
+ PARALLEL_FOR_IF(Kernel::threadSafe(*ws))
for (int64_t i = 0; i < nPoints; ++i) {
PARALLEL_START_INTERUPT_REGION
double coordinates[3];