Merge pull request #23951 from mantidproject/23869_Refatcor_Wish_to_use_AlignAndFocusPowder

Refactor wish to use align and focus powder

Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py

@@ -58,6 +58,7 @@ class WISHPowderReductionTest(MantidSystemTest):
         self.clearWorkspaces()
 
     def validate(self):
+        self.tolerence = 1.e-8
         validation_files = []
         for panel in [x for x in panels if x < 6]:
             validation_files = validation_files + \
@@ -93,6 +94,7 @@ class WISHPowderReductionNoAbsorptionTest(MantidSystemTest):
         self.clearWorkspaces()
 
     def validate(self):
+        self.tolerence = 1.e-8
         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)),
@@ -124,6 +126,7 @@ class WISHPowderReductionCreateVanadiumTest(MantidSystemTest):
         wish_test.create_vanadium_run(19612, 19618, panels)
 
     def validate(self):
+        self.tolerence = 1.e-8
         validation_files = []
         for panel in [x for x in panels if x < 6]:
             validation_files = validation_files + ["w19612-{}foc".format(panel),

scripts/Diffraction/wish/reduce.py

@@ -197,8 +197,9 @@ class Wish:
         cal = "WISH_diff{}"
         if cal.format("_cal") not in simple.mtd:
             simple.LoadDiffCal(filename=self.get_cal(), InstrumentName="WISH", WorkspaceName=cal.format(""))
-        simple.AlignDetectors(InputWorkspace=work, OutputWorkspace=work, CalibrationWorkspace=cal.format("_cal"))
-        simple.DiffractionFocussing(InputWorkspace=work, OutputWorkspace=focus, GroupingWorkspace=cal.format("_group"))
+        simple.AlignAndFocusPowder(InputWorkspace=work, OutputWorkspace=focus, GroupingWorkspace=cal.format("_group"),
+                                   CalibrationWorkspace=cal.format("_cal"), Dspacing=True, params="-0.00063")
+        simple.ConvertUnits(InputWorkspace=focus, OutputWorkspace=focus, Target="dSpacing")
         if self.deleteWorkspace:
             simple.DeleteWorkspace(work)
         if panel == 5 or panel == 6: