Re #24512 began working on Focus

scripts/Engineering/EngineeringFocus.py

@@ -9,22 +9,26 @@ from __future__ import (absolute_import, division, print_function)
 import mantid.simpleapi as simple
 import os
 
-banks = 2
-run_number = "301567"
-calibration_directory = "/home/sjenkins/user/{0}/EnginX_Mantid/Calibration"
-focus_directory = "/home/sjenkins/user/{0}/EnginX_Mantid/Focus"
-user = "301566"
-van_run = "236516"
-van_name = "ENGINX" + ("0" * (8 - len(van_run))) + van_run
-calibration_directory = calibration_directory.format(user)
-focus_drectory = focus_directory.format(user)
-ws_to_focus = simple.Load(Filename="ENGINX" + run_number, OutputWorkspace="engg_focus_input")
-van_integrated_ws = simple.Load(Filename=os.join(calibration_directory,
-                                                 (van_name + "_precalculated_vanadium_run_integration.nxs")))
-van_curves_ws = simple.Load(Filename=os.join(calibration_directory,
-                                             (van_name + "_precalculated_vanadium_run_bank_curves.nxs")))
-for i in range(1, banks + 1):
-    simple.EnggFocus(InputWorkspace=ws_to_focus, OutputWorkspace="engg_focus_output_bank_1",
-                     VanIntegrationWorkspace=van_integrated_ws, VanCurvesWorkspace=van_curves_ws,
-                     Bank=str(i), NormaliseByCurrent=1)
-print("done")
+
+def focus_whole(van_int, van_curves, run_number):
+    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)
+    for i in range(1, 3):
+       simple.EnggFocus(InputWorkspace=ws_to_focus, OutputWorkspace="engg_focus_output_bank_"+str(i),
+                        VanIntegrationWorkspace=van_integrated_ws, VanCurvesWorkspace=van_curves_ws,
+                        Bank=str(i), NormaliseByCurrent=1)
+    print("done")
+
+
+def focus_cropped(use_spectra, crop_on, van_int, van_curves, run_number):
+    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)
+    if not use_spectra:
+        bank = {"North":"1",
+                "South":"2"}
+        simple.EnggFocus(InputWorkspace=ws_to_focus, OutputWorkspace="engg_focus_output_bank_" + bank.get(crop_on),
+                         VanIntegrationWorkspace=van_integrated_ws, VanCurvesWorkspace=van_curves_ws,
+                         Bank=bank.get(crop_on), NormaliseByCurrent=1)
+    else: