Re #24073 added system test for vanadium generation

Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py

@@ -27,6 +27,14 @@ input_dir = os.path.join(working_dir, input_folder_name)
 output_dir = os.path.join(working_dir, output_folder_name)
 
 calibration_dir = os.path.join(input_dir, calibration_folder_name)
+panels = [5, 6]
+linked_panels = {
+    1: 10,
+    2: 9,
+    3: 8,
+    4: 7,
+    5: 6
+}
 
 
 class WISHPowderReductionTest(MantidSystemTest):
@@ -44,29 +52,63 @@ class WISHPowderReductionTest(MantidSystemTest):
         return input_files
 
     def cleanup(self):
-        shutil.rmtree(output_dir)
+        if os.path.isdir(output_dir):
+            shutil.rmtree(output_dir)
 
     def runTest(self):
         os.makedirs(output_dir)
-        wish_test = Wish("__main__", calibration_dir+"/", output_dir + "/", True, input_dir)
+        wish_test = Wish(calibration_dir + "/", output_dir + "/", True, input_dir)
         runs = [40503]
-        panels = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+
         wish_test.reduce(runs, panels)
         self.clearWorkspaces()
 
     def validate(self):
-        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"
+        validation_files = []
+        for panel in [x for x in panels if x < 6]:
+            validation_files = validation_files + ["w40503-{0}_{1}foc".format(panel, linked_panels.get(panel)),
+                                                   "WISH40503-{0}_{1}raw.nxs".format(panel, linked_panels.get(panel))]
+        return validation_files
 
     def clearWorkspaces(self):
-        deletews = ["w40503-" + str(i) + "foc" for i in range(5, 7)]
+        deletews = ["w40503-{}foc".format(panel) for panel in panels]
         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 True
+
+
+class WISHPowderReductionCreateVanadiumTest(MantidSystemTest):
+    # still missing required files check with ./systemtest -R PowderReduction --showskipped
+    def requiredFiles(self):
+        input_files = ["emptyinst19618-2foc-SF-S.nxs",
+                       "emptyinst19618-3foc-SF-S.nxs", "emptyinst19618-4foc-SF-S.nxs", "emptyinst19618-5foc-SF-S.nxs",
+                       "emptyinst19618-6foc-SF-S.nxs", "emptyinst19618-7foc-SF-S.nxs", "emptyinst19618-8foc-SF-S.nxs",
+                       "emptyinst19618-9foc-SF-S.nxs", "emptyinst19618-10foc-SF-S.nxs"]
+
+        input_files = [os.path.join(calibration_dir, files) for files in input_files]
+        return input_files
+
+    def cleanup(self):
+        if os.path.isdir(output_dir):
+            shutil.rmtree(output_dir)
+
+    def runTest(self):
+        os.makedirs(output_dir)
+        wish_test = Wish(calibration_dir + "/", output_dir + "/", True, input_dir)
+        wish_test.create_vanadium_run(19612, 19618, panels)
+
+    def validate(self):
+        validation_files = []
+        for panel in [x for x in panels if x < 6]:
+            validation_files = validation_files + ["w19612-{}foc".format(panel),
+                                                   "vana19612-{}foc-SF-SS.nxs".format(panel)]
+        print(validation_files)
+        return validation_files
+
     # Skip test when on builds as extremely slow, run only as reversion test for wish script
     def skipTests(self):
         return False

scripts/wish/reduce.py

@@ -9,9 +9,8 @@ class Wish:
     NUM_MONITORS = 6
     LAMBDA_RANGE = (0.7, 10.35)
 
-    def __init__(self, input_mode, cal_directory, output_folder, delete_workspace,
+    def __init__(self, cal_directory, output_folder, delete_workspace,
                  user_directory="/archive/ndxwish/Instrument/data/cycle_"):
-        self.name = input_mode
         self.cal_dir = cal_directory
         self.use_folder = user_directory
         self.out_folder = output_folder
@@ -257,10 +256,12 @@ class Wish:
     # save a a nexus processed file.
     # It looks like smoothing of 100 works quite well
     def process_vanadium(self, van, empty, panel, vh, vr, cycle_van="09_3", cycle_empty="09_3"):
-        self.data_directory = "/archive/ndxwish/Instrument/data/cycle_" + cycle_van + "/"
+        user_data_directory = self.use_folder + cycle_van + '/'
+        self.set_data_directory(user_data_directory)
         self.datafile = self.get_file_name(van, "raw")
         wvan = self.read(van, panel, "raw")
-        self.data_directory = "/archive/ndxwish/Instrument/data/cycle_" + cycle_empty + "/"
+        user_data_directory = self.use_folder + cycle_empty + '/'
+        self.set_data_directory(user_data_directory)
         self.datafile = self.get_file_name(empty, "raw")
         wempty = self.read(empty, panel, "raw")
         mantid.Minus(LHSWorkspace=wvan, RHSWorkspace=wempty, OutputWorkspace=wvan)
@@ -368,9 +369,7 @@ class Wish:
                                     EMode="Elastic")
             if 0 in panels:
                 panels = [1, 2, 3, 4, 5]
-            else:
-                panels = [x for x in panels if x < 6]
-            for panel in panels:
+            for panel in [x for x in panels if x < 6]:
                 self.save_combined_panel(run, panel)
 
     def save_combined_panel(self, run, panel):