diff --git a/Framework/API/inc/MantidAPI/ISpectrum.h b/Framework/API/inc/MantidAPI/ISpectrum.h index c4f5ca096c6c95484c6820d0daa5cff8a018bf49..025545e5478bb8dc2615f884159c2fc72e81edf6 100644 --- a/Framework/API/inc/MantidAPI/ISpectrum.h +++ b/Framework/API/inc/MantidAPI/ISpectrum.h @@ -110,9 +110,6 @@ public: } HistogramData::BinEdges binEdges() const { return histogramRef().binEdges(); } - HistogramData::BinEdgeStandardDeviations binEdgeStandardDeviations() const { - return histogramRef().binEdgeStandardDeviations(); - } HistogramData::Points points() const { return histogramRef().points(); } HistogramData::PointStandardDeviations pointStandardDeviations() const { return histogramRef().pointStandardDeviations(); @@ -120,13 +117,6 @@ public: template <typename... T> void setBinEdges(T &&... data) & { mutableHistogramRef().setBinEdges(std::forward<T>(data)...); } - template <typename... T> void setBinEdgeVariances(T &&... data) & { - mutableHistogramRef().setBinEdgeVariances(std::forward<T>(data)...); - } - template <typename... T> void setBinEdgeStandardDeviations(T &&... data) & { - mutableHistogramRef().setBinEdgeStandardDeviations( - std::forward<T>(data)...); - } template <typename... T> void setPoints(T &&... data) & { // Check for the special case EventList, it only works with BinEdges. checkWorksWithPoints(); diff --git a/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Framework/API/inc/MantidAPI/MatrixWorkspace.h index 56d55688b33d916dc36e1f0c0a08302f6dc3fe21..60e95850c31f42fc4262cfdb890edfae8227e7f6 100644 --- a/Framework/API/inc/MantidAPI/MatrixWorkspace.h +++ b/Framework/API/inc/MantidAPI/MatrixWorkspace.h @@ -190,10 +190,6 @@ public: HistogramData::BinEdges binEdges(const size_t index) const { return getSpectrum(index).binEdges(); } - HistogramData::BinEdgeStandardDeviations - binEdgeStandardDeviations(const size_t index) const { - return getSpectrum(index).binEdgeStandardDeviations(); - } HistogramData::Points points(const size_t index) const { return getSpectrum(index).points(); } @@ -205,14 +201,6 @@ public: void setBinEdges(const size_t index, T &&... data) & { getSpectrum(index).setBinEdges(std::forward<T>(data)...); } - template <typename... T> - void setBinEdgeVariances(const size_t index, T &&... data) & { - getSpectrum(index).setBinEdgeVariances(std::forward<T>(data)...); - } - template <typename... T> - void setBinEdgeStandardDeviations(const size_t index, T &&... data) & { - getSpectrum(index).setBinEdgeStandardDeviations(std::forward<T>(data)...); - } template <typename... T> void setPoints(const size_t index, T &&... data) & { getSpectrum(index).setPoints(std::forward<T>(data)...); } diff --git a/Framework/Algorithms/src/ExtractSpectra.cpp b/Framework/Algorithms/src/ExtractSpectra.cpp index b153c3b245e62e02f7c20f8af483f3c21eb5d60b..be0c56fb5315831f95cd89fd234491521017a44f 100644 --- a/Framework/Algorithms/src/ExtractSpectra.cpp +++ b/Framework/Algorithms/src/ExtractSpectra.cpp @@ -339,8 +339,8 @@ void ExtractSpectra::execEvent() { outEL.setX(XValues_new.cowData()); if (hasDx) { auto &oldDx = m_inputWorkspace->dx(i); - outEL.setBinEdgeStandardDeviations( - oldDx.begin() + m_minX, oldDx.begin() + m_maxX - m_histogram); + outEL.setCountStandardDeviations(oldDx.begin() + m_minX, + oldDx.begin() + m_maxX - m_histogram); } } diff --git a/Framework/HistogramData/inc/MantidHistogramData/HistogramDx.h b/Framework/HistogramData/inc/MantidHistogramData/HistogramDx.h index 64b90341f03b25db568f2624bcfa8c6622b49ddd..34029c00323232156f7257b5e474b12bf11f8f66 100644 --- a/Framework/HistogramData/inc/MantidHistogramData/HistogramDx.h +++ b/Framework/HistogramData/inc/MantidHistogramData/HistogramDx.h @@ -7,14 +7,10 @@ namespace Mantid { namespace HistogramData { class Histogram; -class BinEdgeVariances; -class BinEdgeStandardDeviations; class PointVariances; class PointStandardDeviations; class HistogramDx; namespace detail { -template <class BinEdgeVariances, class HistogramDx> class VectorOf; -template <class BinEdgeStandardDeviations, class HistogramDx> class VectorOf; template <class PointVariances, class HistogramDx> class VectorOf; template <class PointStandardDeviations, class HistogramDx> class VectorOf; } @@ -57,8 +53,6 @@ public: // These classes are friends, such that they can modify the length. friend class Histogram; - friend class detail::VectorOf<BinEdgeVariances, HistogramDx>; - friend class detail::VectorOf<BinEdgeStandardDeviations, HistogramDx>; friend class detail::VectorOf<PointVariances, HistogramDx>; friend class detail::VectorOf<PointStandardDeviations, HistogramDx>; };