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
e70aa536
Commit
e70aa536
authored
6 years ago
by
Sam Jenkins
Browse files
Options
Downloads
Patches
Plain Diff
Re #24073 began using new wish script
parent
de61f626
Loading
Loading
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py
+14
-13
14 additions, 13 deletions
...ystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py
scripts/wish/reduce.py
+142
-346
142 additions, 346 deletions
scripts/wish/reduce.py
with
156 additions
and
359 deletions
Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py
+
14
−
13
View file @
e70aa536
...
...
@@ -32,13 +32,13 @@ calibration_dir = os.path.join(input_dir, calibration_folder_name)
class
WISHPowderReductionTest
(
MantidSystemTest
):
# still missing required files check with ./systemtest -R PowderReduction --showskipped
def
requiredFiles
(
self
):
input_files
=
[
"
WISHvana41865-1foc.nxs
"
,
"
WISHvana41865-2foc.nxs
"
,
"
WISHvana41865-3foc
.nxs
"
,
"
WISHvana41865-4foc.nxs
"
,
"
WISHvana41865-5foc.nxs
"
,
"
WISHvana41865-6foc
.nxs
"
,
"
WISHvana41865-7foc.nxs
"
,
"
WISHvana41865-8foc.nxs
"
,
"
WISHvana41865-9foc
.nxs
"
,
"
WISHvana41865-10foc
.nxs
"
,
"
emptyinst
38581-1foc
.nxs
"
,
"
emptyinst
38581-2foc
.nxs
"
,
"
emptyinst
38581-3foc
.nxs
"
,
"
emptyinst
38581-4foc
.nxs
"
,
"
emptyinst
38581-5foc
.nxs
"
,
"
emptyinst
38581-6foc
.nxs
"
,
"
emptyinst
38581-7foc
.nxs
"
,
"
emptyinst
38581-8foc
.nxs
"
,
"
emptyinst
38581-9foc
.nxs
"
,
"
emptyinst
38581
-10foc.nxs
"
]
input_files
=
[
"
vana19612-1foc-SF-SS.nxs
"
,
"
vana19612-2foc-SF-SS.nxs
"
,
"
vana19612-3foc-SF-SS
.nxs
"
,
"
vana19612-4foc-SF-SS.nxs
"
,
"
vana19612-5foc-SF-SS.nxs
"
,
"
vana19612-6foc-SF-SS
.nxs
"
,
"
vana19612-7foc-SF-SS.nxs
"
,
"
vana19612-8foc-SF-SS.nxs
"
,
"
vana19612-9foc-SF-SS
.nxs
"
,
"
vana19612-10foc-SF-SS
.nxs
"
,
"
emptyinst
19618-1foc-SF-S
.nxs
"
,
"
emptyinst
19618-2foc-SF-S
.nxs
"
,
"
emptyinst
19618-3foc-SF-S
.nxs
"
,
"
emptyinst
19618-4foc-SF-S
.nxs
"
,
"
emptyinst
19618-5foc-SF-S
.nxs
"
,
"
emptyinst
19618-6foc-SF-S
.nxs
"
,
"
emptyinst
19618-7foc-SF-S
.nxs
"
,
"
emptyinst
19618-8foc-SF-S
.nxs
"
,
"
emptyinst
19618-9foc-SF-S
.nxs
"
,
"
emptyinst
19618
-10foc
-SF-S
.nxs
"
]
input_files
=
[
os
.
path
.
join
(
calibration_dir
,
files
)
for
files
in
input_files
]
return
input_files
...
...
@@ -52,17 +52,18 @@ class WISHPowderReductionTest(MantidSystemTest):
self
.
clearWorkspaces
()
def
validate
(
self
):
return
"
w41870-2_9foc
"
,
"
WISH41870-2_9raw.nxs
"
,
\
"
w41870-3_8foc
"
,
"
WISH41870-3_8raw.nxs
"
,
\
"
w41870-4_7foc
"
,
"
WISH41870-4_7raw.nxs
"
,
\
"
w41870-5_6foc
"
,
"
WISH41870-5_6raw.nxs
"
return
"
w40503-1_10foc
"
,
"
WISH40503-1_10raw.nxs
"
,
\
"
w40503-2_9foc
"
,
"
WISH40503-2_9raw.nxs
"
,
\
"
w40503-3_8foc
"
,
"
WISH40503-3_8raw.nxs
"
,
\
"
w40503-4_7foc
"
,
"
WISH40503-4_7raw.nxs
"
,
\
"
w40503-5_6foc
"
,
"
WISH40503-5_6raw.nxs
"
def
clearWorkspaces
(
self
):
deletews
=
[
"
w4
1870
-
"
+
str
(
i
)
+
"
foc
"
for
i
in
range
(
1
,
11
)]
deletews
=
[
"
w4
0503
-
"
+
str
(
i
)
+
"
foc
"
for
i
in
range
(
1
,
11
)]
for
ws
in
deletews
:
mantid
.
DeleteWorkspace
(
ws
)
mantid
.
DeleteWorkspace
(
ws
+
"
-d
"
)
# Skip test when on builds as extremely slow, run only as reversion test for wish script
def
skipTests
(
self
):
return
Tru
e
return
Fals
e
This diff is collapsed.
Click to expand it.
scripts/wish/reduce.py
+
142
−
346
View file @
e70aa536
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