Skip to content
Snippets Groups Projects
Commit a12dfa62 authored by Simon Heybrock's avatar Simon Heybrock
Browse files

Re #16298. Removed remaining bin edge uncertainty stuff after rebase.

parent 5f059022
No related merge requests found
...@@ -110,9 +110,6 @@ public: ...@@ -110,9 +110,6 @@ public:
} }
HistogramData::BinEdges binEdges() const { return histogramRef().binEdges(); } HistogramData::BinEdges binEdges() const { return histogramRef().binEdges(); }
HistogramData::BinEdgeStandardDeviations binEdgeStandardDeviations() const {
return histogramRef().binEdgeStandardDeviations();
}
HistogramData::Points points() const { return histogramRef().points(); } HistogramData::Points points() const { return histogramRef().points(); }
HistogramData::PointStandardDeviations pointStandardDeviations() const { HistogramData::PointStandardDeviations pointStandardDeviations() const {
return histogramRef().pointStandardDeviations(); return histogramRef().pointStandardDeviations();
...@@ -120,13 +117,6 @@ public: ...@@ -120,13 +117,6 @@ public:
template <typename... T> void setBinEdges(T &&... data) & { template <typename... T> void setBinEdges(T &&... data) & {
mutableHistogramRef().setBinEdges(std::forward<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) & { template <typename... T> void setPoints(T &&... data) & {
// Check for the special case EventList, it only works with BinEdges. // Check for the special case EventList, it only works with BinEdges.
checkWorksWithPoints(); checkWorksWithPoints();
......
...@@ -190,10 +190,6 @@ public: ...@@ -190,10 +190,6 @@ public:
HistogramData::BinEdges binEdges(const size_t index) const { HistogramData::BinEdges binEdges(const size_t index) const {
return getSpectrum(index).binEdges(); return getSpectrum(index).binEdges();
} }
HistogramData::BinEdgeStandardDeviations
binEdgeStandardDeviations(const size_t index) const {
return getSpectrum(index).binEdgeStandardDeviations();
}
HistogramData::Points points(const size_t index) const { HistogramData::Points points(const size_t index) const {
return getSpectrum(index).points(); return getSpectrum(index).points();
} }
...@@ -205,14 +201,6 @@ public: ...@@ -205,14 +201,6 @@ public:
void setBinEdges(const size_t index, T &&... data) & { void setBinEdges(const size_t index, T &&... data) & {
getSpectrum(index).setBinEdges(std::forward<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) & { template <typename... T> void setPoints(const size_t index, T &&... data) & {
getSpectrum(index).setPoints(std::forward<T>(data)...); getSpectrum(index).setPoints(std::forward<T>(data)...);
} }
......
...@@ -339,8 +339,8 @@ void ExtractSpectra::execEvent() { ...@@ -339,8 +339,8 @@ void ExtractSpectra::execEvent() {
outEL.setX(XValues_new.cowData()); outEL.setX(XValues_new.cowData());
if (hasDx) { if (hasDx) {
auto &oldDx = m_inputWorkspace->dx(i); auto &oldDx = m_inputWorkspace->dx(i);
outEL.setBinEdgeStandardDeviations( outEL.setCountStandardDeviations(oldDx.begin() + m_minX,
oldDx.begin() + m_minX, oldDx.begin() + m_maxX - m_histogram); oldDx.begin() + m_maxX - m_histogram);
} }
} }
......
...@@ -7,14 +7,10 @@ ...@@ -7,14 +7,10 @@
namespace Mantid { namespace Mantid {
namespace HistogramData { namespace HistogramData {
class Histogram; class Histogram;
class BinEdgeVariances;
class BinEdgeStandardDeviations;
class PointVariances; class PointVariances;
class PointStandardDeviations; class PointStandardDeviations;
class HistogramDx; class HistogramDx;
namespace detail { 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 PointVariances, class HistogramDx> class VectorOf;
template <class PointStandardDeviations, class HistogramDx> class VectorOf; template <class PointStandardDeviations, class HistogramDx> class VectorOf;
} }
...@@ -57,8 +53,6 @@ public: ...@@ -57,8 +53,6 @@ public:
// These classes are friends, such that they can modify the length. // These classes are friends, such that they can modify the length.
friend class Histogram; 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<PointVariances, HistogramDx>;
friend class detail::VectorOf<PointStandardDeviations, HistogramDx>; friend class detail::VectorOf<PointStandardDeviations, HistogramDx>;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment