diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h index 50083a03be78ff23fa84450a22a7de1f10f4085f..d547503f6d6ed69a9c133d9deef6c96e7d934b42 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h @@ -59,7 +59,7 @@ private: getNewXSize(const API::MatrixWorkspace_sptr inputWS) const override; /// Calculate the X point values. Implement in an inheriting class. Kernel::cow_ptr<HistogramData::HistogramX> calculateXPoints( - Kernel::cow_ptr<HistogramData::HistogramX> inputX) const override; + Kernel::cow_ptr<HistogramData::HistogramX> inputX) const override; }; } // namespace Algorithm diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h index d66a25546d7330044c02536e88061aa09afe2916..26ddc5473adce2c96a7939d6e1dbc599e5a8af70 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h @@ -59,7 +59,7 @@ private: getNewXSize(const API::MatrixWorkspace_sptr inputWS) const override; /// Calculate the X point values. Implement in an inheriting class. Kernel::cow_ptr<HistogramData::HistogramX> calculateXPoints( - Kernel::cow_ptr<HistogramData::HistogramX> inputX) const override; + Kernel::cow_ptr<HistogramData::HistogramX> inputX) const override; }; } // namespace Algorithm diff --git a/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h b/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h index 246dc141e82f70b72aab2e48127a93dc904b7b8b..119c43e995d34a679f351ad2d7ddaca254b01f13 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h @@ -61,7 +61,7 @@ protected: getNewXSize(const API::MatrixWorkspace_sptr inputWS) const = 0; /// Calculate the X point values. Implement in an inheriting class. virtual Kernel::cow_ptr<HistogramData::HistogramX> calculateXPoints( - const Kernel::cow_ptr<HistogramData::HistogramX> inputX) const = 0; + const Kernel::cow_ptr<HistogramData::HistogramX> inputX) const = 0; private: /// Override init diff --git a/Framework/Algorithms/src/ConvertToHistogram.cpp b/Framework/Algorithms/src/ConvertToHistogram.cpp index c0fbc4e795eafd980aa03ef98f50d7796481505f..e7570daa0479f06abe8e7156cc298f4fd24c4ede 100644 --- a/Framework/Algorithms/src/ConvertToHistogram.cpp +++ b/Framework/Algorithms/src/ConvertToHistogram.cpp @@ -51,11 +51,10 @@ ConvertToHistogram::getNewXSize(const MatrixWorkspace_sptr inputWS) const { * are guessed such that the boundary goes mid-way between each point * @param inputX :: A const reference to the input data */ -Kernel::cow_ptr<HistogramData::HistogramX> -ConvertToHistogram::calculateXPoints( +Kernel::cow_ptr<HistogramData::HistogramX> ConvertToHistogram::calculateXPoints( Kernel::cow_ptr<HistogramData::HistogramX> inputX) const { - return HistogramData::BinEdges(HistogramData::Points( - std::move(inputX))).cowData(); + return HistogramData::BinEdges(HistogramData::Points(std::move(inputX))) + .cowData(); } } } diff --git a/Framework/Algorithms/src/ConvertToPointData.cpp b/Framework/Algorithms/src/ConvertToPointData.cpp index fe3dc6e06728b8db9c858c220a4941ab82d337ae..2451f06ea1102a8ee46d68e6337306344879f770 100644 --- a/Framework/Algorithms/src/ConvertToPointData.cpp +++ b/Framework/Algorithms/src/ConvertToPointData.cpp @@ -47,11 +47,10 @@ ConvertToPointData::getNewXSize(const MatrixWorkspace_sptr inputWS) const { * Calculate the X point values * @param inputX :: A const reference to the input data */ -Kernel::cow_ptr<HistogramData::HistogramX> -ConvertToPointData::calculateXPoints( +Kernel::cow_ptr<HistogramData::HistogramX> ConvertToPointData::calculateXPoints( Kernel::cow_ptr<HistogramData::HistogramX> inputX) const { - return HistogramData::Points(HistogramData::BinEdges( - std::move(inputX))).cowData(); + return HistogramData::Points(HistogramData::BinEdges(std::move(inputX))) + .cowData(); } } } diff --git a/Framework/Algorithms/src/XDataConverter.cpp b/Framework/Algorithms/src/XDataConverter.cpp index 74154d010adab3fea09198c71583c52f7c01fdb8..0e893f24b4234b71befd3205ee5c90fc9778284f 100644 --- a/Framework/Algorithms/src/XDataConverter.cpp +++ b/Framework/Algorithms/src/XDataConverter.cpp @@ -69,7 +69,6 @@ void XDataConverter::exec() { outputWS->setSharedY(i, inputWS->sharedY(i)); outputWS->setSharedE(i, inputWS->sharedE(i)); setXData(outputWS, inputWS, i); - //outputWS->setSharedX(i, calculateXPoints(inputWS->sharedX(i))); prog.report(); PARALLEL_END_INTERUPT_REGION