From cde606e19bf223efcedb206a7bf9aabbebbfbe7e Mon Sep 17 00:00:00 2001
From: Samuel Jones <samjones714@gmail.com>
Date: Thu, 19 Jul 2018 11:32:38 +0100
Subject: [PATCH] Re #22515 Working Ver.
---
Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h | 8 ++++----
Framework/Algorithms/src/SortXAxis2.cpp | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h b/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
index 620f0b6726b..4afb2c5b8b8 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
@@ -58,7 +58,7 @@ private:
std::vector<std::size_t> &workspaceIndecies,
Mantid::API::MatrixWorkspace_const_sptr inputWorkspace,
Mantid::API::MatrixWorkspace_sptr outputWorkspace, const size_t sizeOfY,
- unsigned int SpecNum, bool isAProperHistogram);
+ unsigned int SpecNum/*, bool isAProperHistogram*/);
void copyXandDxToOutputWorkspace(
std::vector<std::size_t> &workspaceIndecies,
@@ -71,10 +71,10 @@ private:
Mantid::API::MatrixWorkspace_const_sptr inputWorkspace,
Mantid::API::MatrixWorkspace_sptr outputWorkspace,
const size_t sizeOfX, const size_t sizeOfY,
- unsigned int specNum, bool isAProperHistogram);
+ unsigned int specNum/*, bool isAProperHistogram*/);
- bool determineIfHistogramIsValid(
- Mantid::API::MatrixWorkspace_const_sptr inputWorkspace);
+ /*bool determineIfHistogramIsValid(
+ Mantid::API::MatrixWorkspace_const_sptr inputWorkspace);*/
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/src/SortXAxis2.cpp b/Framework/Algorithms/src/SortXAxis2.cpp
index 02105b5c4ee..18fe0b3c0d5 100644
--- a/Framework/Algorithms/src/SortXAxis2.cpp
+++ b/Framework/Algorithms/src/SortXAxis2.cpp
@@ -43,7 +43,7 @@ void SortXAxis::exec() {
MatrixWorkspace_sptr outputWorkspace = inputWorkspace->clone();
// Check if it is a valid histogram here
- bool isAProperHistogram = determineIfHistogramIsValid(inputWorkspace);
+ /*bool isAProperHistogram = determineIfHistogramIsValid(inputWorkspace);*/
// Define everything you can outside of the for loop
// Assume that all spec are the same size
@@ -61,7 +61,7 @@ void SortXAxis::exec() {
sortIndicesByX(workspaceIndicies, theOrder, inputWorkspace, specNum);
copyToOutputWorkspace(workspaceIndicies, inputWorkspace, outputWorkspace,
- sizeOfX, sizeOfY, specNum, isAProperHistogram);
+ sizeOfX, sizeOfY, specNum/*, isAProperHistogram*/);
PARALLEL_END_INTERUPT_REGION
}
PARALLEL_CHECK_INTERUPT_REGION
--
GitLab