From 4e378c019dd5ae5111015875db42c3d92db21e5a Mon Sep 17 00:00:00 2001
From: Andrei Savici <saviciat@ornl.gov>
Date: Fri, 15 Sep 2017 17:55:52 -0400
Subject: [PATCH] Re #20495. Fix caching of boundaries
---
Framework/MDAlgorithms/src/MDNormDirectSC.cpp | 8 ++++----
Framework/MDAlgorithms/src/MDNormSCD.cpp | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
index 7c8537730dd..f27b40a8ee4 100644
--- a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
+++ b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
@@ -405,21 +405,21 @@ void MDNormDirectSC::cacheDimensionXValues() {
(PhysicalConstants::h * PhysicalConstants::h);
if (!m_hIntegrated) {
auto &hDim = *m_normWS->getDimension(m_hIdx);
- m_hX.resize(hDim.getNBins());
+ m_hX.resize(hDim.getNBins()+1);
for (size_t i = 0; i < m_hX.size(); ++i) {
m_hX[i] = hDim.getX(i);
}
}
if (!m_kIntegrated) {
auto &kDim = *m_normWS->getDimension(m_kIdx);
- m_kX.resize(kDim.getNBins());
+ m_kX.resize(kDim.getNBins()+1);
for (size_t i = 0; i < m_kX.size(); ++i) {
m_kX[i] = kDim.getX(i);
}
}
if (!m_lIntegrated) {
auto &lDim = *m_normWS->getDimension(m_lIdx);
- m_lX.resize(lDim.getNBins());
+ m_lX.resize(lDim.getNBins()+1);
for (size_t i = 0; i < m_lX.size(); ++i) {
m_lX[i] = lDim.getX(i);
}
@@ -427,7 +427,7 @@ void MDNormDirectSC::cacheDimensionXValues() {
if (!m_dEIntegrated) {
// NOTE: store k final instead
auto &eDim = *m_normWS->getDimension(m_eIdx);
- m_eX.resize(eDim.getNBins());
+ m_eX.resize(eDim.getNBins()+1);
for (size_t i = 0; i < m_eX.size(); ++i) {
double temp = m_Ei - eDim.getX(i);
temp = std::max(temp, 0.);
diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp
index d47a1d23c06..427a804e610 100644
--- a/Framework/MDAlgorithms/src/MDNormSCD.cpp
+++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp
@@ -367,21 +367,21 @@ MDNormSCD::findIntergratedDimensions(const std::vector<coord_t> &otherDimValues,
void MDNormSCD::cacheDimensionXValues() {
if (!m_hIntegrated) {
auto &hDim = *m_normWS->getDimension(m_hIdx);
- m_hX.resize(hDim.getNBins());
+ m_hX.resize(hDim.getNBins()+1);
for (size_t i = 0; i < m_hX.size(); ++i) {
m_hX[i] = hDim.getX(i);
}
}
if (!m_kIntegrated) {
auto &kDim = *m_normWS->getDimension(m_kIdx);
- m_kX.resize(kDim.getNBins());
+ m_kX.resize(kDim.getNBins()+1);
for (size_t i = 0; i < m_kX.size(); ++i) {
m_kX[i] = kDim.getX(i);
}
}
if (!m_lIntegrated) {
auto &lDim = *m_normWS->getDimension(m_lIdx);
- m_lX.resize(lDim.getNBins());
+ m_lX.resize(lDim.getNBins()+1);
for (size_t i = 0; i < m_lX.size(); ++i) {
m_lX[i] = lDim.getX(i);
}
--
GitLab