From 912698d0b375837c92e1e3b1540210df03daa0cf Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Thu, 6 Dec 2018 09:19:42 +0000
Subject: [PATCH] Re #24073 Updated test data files
---
Testing/Data/SystemTest/WISH/input/11_4/WISH00019612.raw.md5 | 1 +
Testing/Data/SystemTest/WISH/input/11_4/WISH00019618.raw.md5 | 1 +
Testing/Data/SystemTest/WISH/input/18_1/WISH00040503.raw.md5 | 1 +
.../WISH/input/Cal/WISH_cycle_10_3_noends_10to10.cal.md5 | 1 -
...H_cycle_15_4_noends_10to10_dodgytube_removed_feb2016.cal.md5 | 1 +
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-10foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-1foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-2foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-3foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-4foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-5foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-6foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-7foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-8foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/WISHvana41865-9foc.nxs.md5 | 1 -
.../SystemTest/WISH/input/Cal/emptyinst19618-5foc-SF-S.nxs.md5 | 1 +
.../SystemTest/WISH/input/Cal/emptyinst19618-6foc-SF-S.nxs.md5 | 1 +
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-10foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-1foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-2foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-3foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-4foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-5foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-6foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-7foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-8foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/emptyinst38581-9foc.nxs.md5 | 1 -
.../Data/SystemTest/WISH/input/Cal/vana19612-5foc-SF-SS.nxs.md5 | 1 +
.../Data/SystemTest/WISH/input/Cal/vana19612-6foc-SF-SS.nxs.md5 | 1 +
Testing/Data/SystemTest/WISH/input/WISH00041870.nxs.md5 | 1 -
scripts/wish/reduce.py | 2 +-
31 files changed, 9 insertions(+), 23 deletions(-)
create mode 100644 Testing/Data/SystemTest/WISH/input/11_4/WISH00019612.raw.md5
create mode 100644 Testing/Data/SystemTest/WISH/input/11_4/WISH00019618.raw.md5
create mode 100644 Testing/Data/SystemTest/WISH/input/18_1/WISH00040503.raw.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_10_3_noends_10to10.cal.md5
create mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_15_4_noends_10to10_dodgytube_removed_feb2016.cal.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-10foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-1foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-2foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-3foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-4foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-5foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-6foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-7foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-8foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-9foc.nxs.md5
create mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-5foc-SF-S.nxs.md5
create mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-6foc-SF-S.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-10foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-1foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-2foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-3foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-4foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-5foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-6foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-7foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-8foc.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-9foc.nxs.md5
create mode 100644 Testing/Data/SystemTest/WISH/input/Cal/vana19612-5foc-SF-SS.nxs.md5
create mode 100644 Testing/Data/SystemTest/WISH/input/Cal/vana19612-6foc-SF-SS.nxs.md5
delete mode 100644 Testing/Data/SystemTest/WISH/input/WISH00041870.nxs.md5
diff --git a/Testing/Data/SystemTest/WISH/input/11_4/WISH00019612.raw.md5 b/Testing/Data/SystemTest/WISH/input/11_4/WISH00019612.raw.md5
new file mode 100644
index 00000000000..8a7b42a5047
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/11_4/WISH00019612.raw.md5
@@ -0,0 +1 @@
+81e9d09c17c274f9c79252cdd73c0491
diff --git a/Testing/Data/SystemTest/WISH/input/11_4/WISH00019618.raw.md5 b/Testing/Data/SystemTest/WISH/input/11_4/WISH00019618.raw.md5
new file mode 100644
index 00000000000..1ca46791701
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/11_4/WISH00019618.raw.md5
@@ -0,0 +1 @@
+9b8888478637a478d9563fe7060a8881
diff --git a/Testing/Data/SystemTest/WISH/input/18_1/WISH00040503.raw.md5 b/Testing/Data/SystemTest/WISH/input/18_1/WISH00040503.raw.md5
new file mode 100644
index 00000000000..0d713758f24
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/18_1/WISH00040503.raw.md5
@@ -0,0 +1 @@
+4fdb9e8db88934f2acb4d4dd900da0b1
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_10_3_noends_10to10.cal.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_10_3_noends_10to10.cal.md5
deleted file mode 100644
index 5c1b0c2e9db..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_10_3_noends_10to10.cal.md5
+++ /dev/null
@@ -1 +0,0 @@
-055d17177f5593f65066a35d61a7db2c
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_15_4_noends_10to10_dodgytube_removed_feb2016.cal.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_15_4_noends_10to10_dodgytube_removed_feb2016.cal.md5
new file mode 100644
index 00000000000..57f6caec5e3
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/Cal/WISH_cycle_15_4_noends_10to10_dodgytube_removed_feb2016.cal.md5
@@ -0,0 +1 @@
+98d61de6108b0298c12f7339e5729a4c
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-10foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-10foc.nxs.md5
deleted file mode 100644
index 2db9ed15d7d..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-10foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-a6bb6c3c8413e25f2e55189476b0205f
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-1foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-1foc.nxs.md5
deleted file mode 100644
index 4292e9aa75e..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-1foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-a3a3932fb3429932d5c4eb5ad6dd50db
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-2foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-2foc.nxs.md5
deleted file mode 100644
index 30de2839018..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-2foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-265af81599660d239a7643a999222d95
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-3foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-3foc.nxs.md5
deleted file mode 100644
index 9952fc37b62..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-3foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-dfa2b3fee890f6530ea1071c3910f293
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-4foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-4foc.nxs.md5
deleted file mode 100644
index e71c1d7d481..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-4foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-3bc719616f727879c2be9e57433a3fe6
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-5foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-5foc.nxs.md5
deleted file mode 100644
index 9ce1643b3ba..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-5foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-37c393acc606b627ff7f8712f4b0c27b
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-6foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-6foc.nxs.md5
deleted file mode 100644
index 308fa0541c3..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-6foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-81a2766ecb6e31db395ba84e495adc52
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-7foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-7foc.nxs.md5
deleted file mode 100644
index 950aa568e3c..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-7foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-158392b86a834dd39c27fba9dcc7a006
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-8foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-8foc.nxs.md5
deleted file mode 100644
index f82dc507147..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-8foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-ffbb89ea154b576d3e96f899c297ad88
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-9foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-9foc.nxs.md5
deleted file mode 100644
index d3baa82f99f..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/WISHvana41865-9foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-decc7353a7dc895fdfe7f298a046c6ea
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-5foc-SF-S.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-5foc-SF-S.nxs.md5
new file mode 100644
index 00000000000..a08dc426500
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-5foc-SF-S.nxs.md5
@@ -0,0 +1 @@
+71831f8efeb8be3e0f5d3caa2e9eca89
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-6foc-SF-S.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-6foc-SF-S.nxs.md5
new file mode 100644
index 00000000000..a08dc426500
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst19618-6foc-SF-S.nxs.md5
@@ -0,0 +1 @@
+71831f8efeb8be3e0f5d3caa2e9eca89
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-10foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-10foc.nxs.md5
deleted file mode 100644
index e5364e50ed2..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-10foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-9b3f366c3f0597cdaf74c77fa3fd1c27
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-1foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-1foc.nxs.md5
deleted file mode 100644
index 8e9185681b2..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-1foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-f529a4e600134d3d116e65c33a078817
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-2foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-2foc.nxs.md5
deleted file mode 100644
index 696f25ffc7f..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-2foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-74ff004da8309bc26c251c69e24106a5
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-3foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-3foc.nxs.md5
deleted file mode 100644
index ab8659ea511..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-3foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-e3ff38a26c672fde75b1ed7de99d19a6
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-4foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-4foc.nxs.md5
deleted file mode 100644
index cd6d92a8f20..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-4foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-678059385510dc8d1e45b9565f2b7208
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-5foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-5foc.nxs.md5
deleted file mode 100644
index 53913d47efa..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-5foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-a8f292edf6640bbb7c2eac34ff44f9bd
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-6foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-6foc.nxs.md5
deleted file mode 100644
index ae70766609d..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-6foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-61fad722828e1620be2be59b6eddc66b
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-7foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-7foc.nxs.md5
deleted file mode 100644
index 7d6e36d5a90..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-7foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-f45ee059905b380093748835d9cd90d0
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-8foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-8foc.nxs.md5
deleted file mode 100644
index cfbc1794ee4..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-8foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-f7f9eb1001e7e7260b067f9ba901d949
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-9foc.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-9foc.nxs.md5
deleted file mode 100644
index 4eae207a8b2..00000000000
--- a/Testing/Data/SystemTest/WISH/input/Cal/emptyinst38581-9foc.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-3d8675ca48aa242e3c5a02b1f85624ae
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/vana19612-5foc-SF-SS.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/vana19612-5foc-SF-SS.nxs.md5
new file mode 100644
index 00000000000..cf5800e7b75
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/Cal/vana19612-5foc-SF-SS.nxs.md5
@@ -0,0 +1 @@
+e8fea832144b67b4911cd00e5abb27e8
diff --git a/Testing/Data/SystemTest/WISH/input/Cal/vana19612-6foc-SF-SS.nxs.md5 b/Testing/Data/SystemTest/WISH/input/Cal/vana19612-6foc-SF-SS.nxs.md5
new file mode 100644
index 00000000000..d81d1572114
--- /dev/null
+++ b/Testing/Data/SystemTest/WISH/input/Cal/vana19612-6foc-SF-SS.nxs.md5
@@ -0,0 +1 @@
+dafd63eef31cf573fcf643614ce5808d
diff --git a/Testing/Data/SystemTest/WISH/input/WISH00041870.nxs.md5 b/Testing/Data/SystemTest/WISH/input/WISH00041870.nxs.md5
deleted file mode 100644
index cf41a2b0530..00000000000
--- a/Testing/Data/SystemTest/WISH/input/WISH00041870.nxs.md5
+++ /dev/null
@@ -1 +0,0 @@
-b8ce8bb291d797f10fcc53b1faebd284
diff --git a/scripts/wish/reduce.py b/scripts/wish/reduce.py
index 64c7b6e7214..8efb68ab2e0 100644
--- a/scripts/wish/reduce.py
+++ b/scripts/wish/reduce.py
@@ -181,7 +181,7 @@ class Wish:
# Focus dataset for a given panel and return the workspace
def focus_onepanel(self, work, focus, panel):
- cal = "WISH_diff{}";
+ cal = "WISH_diff{}"
if cal.format("_cal") not in mantid.mtd:
mantid.LoadDiffCal(filename=self.get_cal(), InstrumentName="WISH", WorkspaceName=cal.format(""))
mantid.AlignDetectors(InputWorkspace=work, OutputWorkspace=work, CalibrationWorkspace=cal.format("_cal"))
--
GitLab