Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
cde606e1
Commit
cde606e1
authored
6 years ago
by
Samuel Jones
Browse files
Options
Downloads
Patches
Plain Diff
Re #22515 Working Ver.
parent
8cdb155a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
+4
-4
4 additions, 4 deletions
Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
Framework/Algorithms/src/SortXAxis2.cpp
+2
-2
2 additions, 2 deletions
Framework/Algorithms/src/SortXAxis2.cpp
with
6 additions
and
6 deletions
Framework/Algorithms/inc/MantidAlgorithms/SortXAxis2.h
+
4
−
4
View file @
cde606e1
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Framework/Algorithms/src/SortXAxis2.cpp
+
2
−
2
View file @
cde606e1
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment