Re #24512 added texture mode to focus

scripts/Engineering/EnginX.py

@@ -18,8 +18,8 @@ class EnginX:
             self.van_run = kwargs.get("vanadium_run")
             if "output_directory" in kwargs:
                 location = "{0}/{1}/{2}"
-                self.calibration_directory = location.format(kwargs.get("output_directory"), self.user,"Calibration")
-                self.focus_directory = location.format(kwargs.get("output_directory"), self.user,Focus)
+                self.calibration_directory = location.format(kwargs.get("output_directory"), self.user, "Calibration")
+                self.focus_directory = location.format(kwargs.get("output_directory"), self.user, "Focus")
             else:
                 raise KeyError("You must set an output_directory")
 
@@ -51,14 +51,18 @@ class EnginX:
         if "run_number" in kwargs:
             run_no = kwargs.get("run_number")
         else:
-            return
+            raise KeyError("Cannot focus without run_number")
         van_curves_file, van_int_file = self._get_van_names()
-        if "cropped" in kwargs:
+        if "grouping_file" in kwargs:
+            grouping_file = os.path.join(self.calibration_directory, kwargs.get("grouping_file"))
+            Focus.focus_texture_mode(van_curves_file, van_int_file, run_no,
+                                     self.focus_directory, grouping_file)
+        elif "cropped" in kwargs:
             if kwargs.get("cropped") == "banks":
-                Focus.focus_cropped(False, kwargs.get("bank"), van_curves_file, van_int_file, run_no,
+                Focus.focus_cropped(False, False, kwargs.get("bank"), van_curves_file, van_int_file, run_no,
                                     self.focus_directory)
             elif kwargs.get("cropped") == "spectra":
-                Focus.focus_cropped(True, kwargs.get("spectra"), van_curves_file, van_int_file, run_no,
+                Focus.focus_cropped(True, False, kwargs.get("spectra"), van_curves_file, van_int_file, run_no,
                                     self.focus_directory)
         else:
             Focus.focus_whole(van_curves_file, van_int_file, run_no,

scripts/Engineering/EngineeringFocus.py

@@ -8,6 +8,7 @@ from __future__ import (absolute_import, division, print_function)
 
 import mantid.simpleapi as simple
 import os
+import csv
 
 
 def focus_whole(van_curves, van_int, run_number, focus_dir):
@@ -19,7 +20,7 @@ def focus_whole(van_curves, van_int, run_number, focus_dir):
         simple.EnggFocus(InputWorkspace=ws_to_focus, OutputWorkspace=output_ws,
                          VanIntegrationWorkspace=van_integrated_ws, VanCurvesWorkspace=van_curves_ws,
                          Bank=str(i))
-        _save_out(output_ws, run_number, str(i), focus_dir)
+        _save_out(output_ws, run_number, str(i), focus_dir, "ENGINX_{}_{}")
     print("done")
 
 
@@ -35,22 +36,54 @@ def focus_cropped(use_spectra, crop_on, van_curves, van_int, run_number, focus_d
         simple.EnggFocus(InputWorkspace=ws_to_focus, OutputWorkspace=output_ws,
                          VanIntegrationWorkspace=van_integrated_ws, VanCurvesWorkspace=van_curves_ws,
                          Bank=bank.get(crop_on))
-        _save_out(output_ws, run_number, crop_on, focus_dir)
+        _save_out(output_ws, run_number, crop_on, focus_dir, "ENGINX_{}_{}")
     else:
         output_ws = output_ws.format("", "")
         simple.EnggFocus(InputWorkspace=ws_to_focus, OutputWorkspace=output_ws,
                          VanIntegrationWorkspace=van_integrated_ws,
                          VanCurvesWorkspace=van_curves_ws, SpectrumNumbers=crop_on)
-        _save_out(output_ws, run_number, "cropped", focus_dir)
+        _save_out(output_ws, run_number, "cropped", focus_dir, "ENGINX_{}_bank_{}")
 
 
-def _save_out(output, run_number, bank_id, output_dir):
-    if type(bank_id)is str:
-        filename = os.path.join(output_dir, "ENGINX_{}_bank_{}".format(run_number, bank_id))
-    else:
-        filename = os.path.join(output_dir, "ENGINX_{}_{}".format(run_number, bank_id))
-    simple.SaveFocusedXYE(InputWorkspace=output, Filename=filename, SplitFiles=False, StartAtBankNumber=bank_id)
-    simple.SaveGSS(InputWorkspace=output, Filename=filename, SplitFiles=False, Bank=bank_id)
-    simple.SaveOpenGenieAscii(InputWorkspace=output, Filename=filename, OpenGenieFormat="ENGIN-X Format")
-    simple.SaveNexus(InputWorkspace=output, Filename=filename)
-    simple.ExportSampleLogsToHDF5(InputWorkspace=output, Filename=filename, Blacklist="bankid")
+def focus_texture_mode(van_curves, van_int, run_number, focus_dir, dg_file):
+    van_curves_ws, van_integrated_ws, ws_to_focus = _prepare_focus(run_number, van_curves, van_int)
+    banks = {}
+    with open(dg_file) as grouping_file:
+        group_reader = csv.reader(_decomment_csv(grouping_file), delimiter=',')
+
+        for row in group_reader:
+            banks.update({row[0]: ','.join(row[1:])})
+
+    for bank in banks:
+        output_ws = "engg_focusing_output_ws_texture_bank_{}"
+        output_ws = output_ws.format(bank)
+        print(banks.get(bank))
+        simple.EnggFocus(InputWorkspace=ws_to_focus, OutputWorkspace=output_ws,
+                         VanIntegrationWorkspace=van_integrated_ws, VanCurvesWorkspace=van_curves_ws,
+                         SpectrumNumbers=banks.get(bank))
+        _save_out(output_ws, run_number, bank, focus_dir, "ENGINX_{}_texture_{}")
+
+
+def _prepare_focus(run_number, van_curves, van_int):
+    ws_to_focus = simple.Load(Filename="ENGINX" + run_number, OutputWorkspace="engg_focus_input")
+    van_integrated_ws = simple.Load(Filename=van_int)
+    van_curves_ws = simple.Load(Filename=van_curves)
+    return van_curves_ws, van_integrated_ws, ws_to_focus
+
+
+def _save_out(output, run_number, bank_id, output_dir, join_string):
+    filename = os.path.join(output_dir, join_string.format(run_number, bank_id))
+    hdf5_name = os.path.join(output_dir, run_number + ".hdf5")
+    simple.SaveFocusedXYE(InputWorkspace=output, Filename=filename + ".dat", SplitFiles=False,
+                          StartAtBankNumber=bank_id)
+    simple.SaveGSS(InputWorkspace=output, Filename=filename + ".gss", SplitFiles=False, Bank=bank_id)
+    simple.SaveOpenGenieAscii(InputWorkspace=output, Filename=filename + ".his", OpenGenieFormat="ENGIN-X Format")
+    simple.SaveNexus(InputWorkspace=output, Filename=filename + ".nxs")
+    simple.ExportSampleLogsToHDF5(InputWorkspace=output, Filename=hdf5_name, Blacklist="bankid")
+
+
+def _decomment_csv(csvfile):
+    for row in csvfile:
+        raw = row.split('#')[0].strip()
+        if raw:
+            yield raw