Re #17949 Fixed XYE files not respecting uname in out dir

scripts/Diffraction/isis_powder/abstract_inst.py

@@ -106,7 +106,8 @@ class AbstractInst(object):
                           "gss_filename": gss_file,
                           "tof_xye_filename": tof_xye_file,
                           "dspacing_xye_filename": d_xye_file,
-                          "output_name": out_name}
+                          "output_name": out_name,
+                          "output_folder": output_directory}
 
         return out_file_names
 

scripts/Diffraction/isis_powder/polaris.py

@@ -216,8 +216,11 @@ class Polaris(AbstractInst):
 
         mantid.SaveGSS(InputWorkspace=tof_group, Filename=output_paths["gss_filename"], SplitFiles=False, Append=False)
         mantid.SaveNexusProcessed(InputWorkspace=tof_group, Filename=output_paths["nxs_filename"], Append=False)
-        self._save_xye(ws_group=d_spacing_group, ws_units="d_spacing", run_number=run_details.run_number)
-        self._save_xye(ws_group=tof_group, ws_units="TOF", run_number=run_details.run_number)
+
+        _save_xye(ws_group=d_spacing_group, ws_units="d_spacing", run_number=run_details.run_number,
+                  output_folder=output_paths["output_folder"])
+        _save_xye(ws_group=tof_group, ws_units="TOF", run_number=run_details.run_number,
+                  output_folder=output_paths["output_folder"])
 
         return d_spacing_group, tof_group
 
@@ -254,15 +257,6 @@ class Polaris(AbstractInst):
 
         return output_list
 
-    def _save_xye(self, ws_group, ws_units, run_number):
-        bank_index = 1
-        for ws in ws_group:
-            outfile_name = str(run_number) + "-b_" + str(bank_index) + "-" + ws_units + ".dat"
-            bank_index += 1
-            full_file_path = os.path.join(self._output_dir, outfile_name)
-
-            mantid.SaveFocusedXYE(InputWorkspace=ws, Filename=full_file_path, SplitFiles=False, IncludeHeader=False)
-
     def _generate_solid_angle_file_name(self, vanadium_run_string):
         if self._chopper_on:
             return "SAC_chopperOn_" + vanadium_run_string + ".nxs"
@@ -283,8 +277,6 @@ class Polaris(AbstractInst):
 
         return output_string
 
-# Class private implementation
-
 
 def _extract_bank_spectra(ws_to_split, num_banks):
     spectra_bank_list = []
@@ -368,3 +360,13 @@ def _calculate_solid_angle_efficiency_corrections(vanadium_ws):
     common.remove_intermediate_workspace(efficiency_ws)
 
     return corrections_ws
+
+
+def _save_xye(ws_group, ws_units, run_number, output_folder):
+    bank_index = 1
+    for ws in ws_group:
+        outfile_name = str(run_number) + "-b_" + str(bank_index) + "-" + ws_units + ".dat"
+        bank_index += 1
+        full_file_path = os.path.join(output_folder, outfile_name)
+
+        mantid.SaveFocusedXYE(InputWorkspace=ws, Filename=full_file_path, SplitFiles=False, IncludeHeader=False)

scripts/Diffraction/isis_powder/polaris_routines/polaris_calibration.yaml

@@ -12,7 +12,7 @@
     vanadium_run_numbers : "78338"
     empty_run_numbers : "78339"
 
-93104-93106:
+93104-93107:
   offset_file_name : "offsets_2011_cycle111b.cal"
   label : "15_2"
   chopper_on:

scripts/Diffraction/isis_powder/routines/focus.py

@@ -21,7 +21,8 @@ def _run_focus(instrument, run_number, perform_attenuation, perform_vanadium_nor
     # Check the necessary splined vanadium file has been created
     if not os.path.isfile(run_details.splined_vanadium):
         raise ValueError("Processed vanadium runs not found at this path: "
-                         + str(run_details.splined_vanadium) + " \n\nHave you created a vanadium calibration yet?")
+                         + str(run_details.splined_vanadium) +
+                         " \n\nHave you created a vanadium calibration with these settings yet?")
 
     # Compensate for empty sample if specified
     input_workspace = common.subtract_sample_empty(ws_to_correct=input_workspace, instrument=instrument,