diff --git a/Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py b/Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py index 5a4013f52160d35ecd41333b4ad81cb64d352f72..7ae9255c1ee5eb1297d8ea9d07746c3ed49d9c1c 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py +++ b/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), diff --git a/scripts/Diffraction/wish/reduce.py b/scripts/Diffraction/wish/reduce.py index a02669e30c80dce28e8826c1f51cfb03c4684fae..696cc8de7ebdd26f5b65b879fd9a2382db9d466b 100644 --- a/scripts/Diffraction/wish/reduce.py +++ b/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: