From 5cbf74a1cda61f5a55d199bf817c6199490a373a Mon Sep 17 00:00:00 2001
From: Antti Soininen <soininen@ill.fr>
Date: Tue, 15 Jan 2019 15:08:01 +0100
Subject: [PATCH] Simplify some histogram data handling. Re #24462
---
Framework/Algorithms/src/FitPeaks.cpp | 11 +----------
.../CurveFitting/test/Algorithms/PawleyFitTest.h | 2 +-
.../src/JoinISISPolarizationEfficiencies.cpp | 4 +---
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/Framework/Algorithms/src/FitPeaks.cpp b/Framework/Algorithms/src/FitPeaks.cpp
index 3a59ab32ce2..5c824d63192 100644
--- a/Framework/Algorithms/src/FitPeaks.cpp
+++ b/Framework/Algorithms/src/FitPeaks.cpp
@@ -2011,17 +2011,8 @@ void FitPeaks::generateCalculatedPeaksWS() {
return;
}
- // create a wokspace with same number of input matrix workspace
+ // create a wokspace with same size as in the input matrix workspace
m_fittedPeakWS = create<Workspace2D>(*m_inputMatrixWS);
- for (size_t iws = 0; iws < m_fittedPeakWS->getNumberHistograms(); ++iws) {
- auto &out_vecx = m_fittedPeakWS->mutableX(iws);
- const auto &in_vecx = m_inputMatrixWS->x(iws);
- for (size_t j = 0; j < out_vecx.size(); ++j) {
- out_vecx[j] = in_vecx[j];
- }
- }
-
- return;
}
//----------------------------------------------------------------------------------------------
diff --git a/Framework/CurveFitting/test/Algorithms/PawleyFitTest.h b/Framework/CurveFitting/test/Algorithms/PawleyFitTest.h
index 787b72ee74a..96824bb4ba2 100644
--- a/Framework/CurveFitting/test/Algorithms/PawleyFitTest.h
+++ b/Framework/CurveFitting/test/Algorithms/PawleyFitTest.h
@@ -254,7 +254,7 @@ private:
ws->mutableX(0) = xValues.toVector();
ws->mutableY(0) = yValues.toVector();
ws->mutableY(0) += bg;
- ws->mutableE(0) = std::vector<double>(n, 1.0);
+ ws->mutableE(0) = 1.0;
WorkspaceCreationHelper::addNoise(ws, 0, -0.5, 0.5);
ws->getAxis(0)->setUnit(unit);
diff --git a/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp b/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp
index 835b471bcc2..6230bc9173c 100644
--- a/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp
+++ b/Framework/DataHandling/src/JoinISISPolarizationEfficiencies.cpp
@@ -134,9 +134,7 @@ MatrixWorkspace_sptr JoinISISPolarizationEfficiencies::createEfficiencies(
for (size_t i = 0; i < interpolatedWorkspaces.size(); ++i) {
auto &ws = interpolatedWorkspaces[i];
- outWS->setSharedX(i, ws->sharedX(0));
- outWS->setSharedY(i, ws->sharedY(0));
- outWS->setSharedE(i, ws->sharedE(0));
+ outWS->setHistogram(i, ws->histogram(0));
axis1->setLabel(i, labels[i]);
}
--
GitLab