DiffractionFocussing. Refs #3801.

Sidestepping the differences between event and histogram branches.
mantidproject · Nov 14, 2011 · f09644e · f09644e
1 parent 532c74f
commit f09644e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
@@ -355,8 +355,11 @@ def _focus(self, wksp, calib, info, filterLogs=None, preserveEvents=True,
             Rebin(InputWorkspace=wksp, OutputWorkspace=wksp, Params=binning)
         if not "histo" in self.getProperty("Extension"):
             SortEvents(InputWorkspace=wksp)
-        DiffractionFocussing(InputWorkspace=wksp, OutputWorkspace=wksp, GroupingWorkspace=self._instrument + "_group",
-                             PreserveEvents=preserveEvents)
+        DiffractionFocussing(InputWorkspace=wksp, OutputWorkspace=wksp, GroupingWorkspace=self._instrument + "_group")
+        if not "histo" in self.getProperty("Extension"):
+            SortEvents(InputWorkspace=wksp)
+        if not preserveEvents:
+            ConvertToMatrixWorkspace(InputWorkspace=wksp, OutputWorkspace=wksp)
         ConvertUnits(InputWorkspace=wksp, OutputWorkspace=wksp, Target="TOF")
         if preserveEvents and not "histo" in self.getProperty("Extension"):
             CompressEvents(InputWorkspace=wksp, OutputWorkspace=wksp, Tolerance=COMPRESS_TOL_TOF) # 100ns