Re #4373 Save as ascii in addition to XML

mantidproject · Dec 29, 2011 · cc7323a · cc7323a
1 parent c342c5d
commit cc7323a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/sans/stitcher.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
@@ -437,10 +437,15 @@ def _save_result(self):
                                                            "Data Files (*.xml)")
             fname = str(QtCore.QFileInfo(fname_qstr).filePath())
             if len(fname)>0:
-                if not fname.endswith('.xml'):
-                    fname += ".xml"
-
-                self._stitcher.save_combined(fname)
+                if fname.endswith('.xml'):
+                    self._stitcher.save_combined(fname, as_canSAS=True)
+                elif fname.endswith('.txt'):
+                    self._stitcher.save_combined(fname, as_canSAS=False)
+                else:
+                    fname_tmp = fname + ".xml"
+                    self._stitcher.save_combined(fname_tmp, as_canSAS=True)
+                    fname_tmp = fname + ".txt"
+                    self._stitcher.save_combined(fname_tmp, as_canSAS=False)
 
     def set_state(self, state):
         """

diff --git a/Code/Mantid/scripts/LargeScaleStructures/data_stitching.py b/Code/Mantid/scripts/LargeScaleStructures/data_stitching.py
@@ -282,14 +282,18 @@ def set_reference(self, id):
             raise RuntimeError, "Stitcher: invalid reference ID"
         self._reference = id
 
-    def save_combined(self, file_path=None):
+    def save_combined(self, file_path=None, as_canSAS=True):
         """
             Save the resulting scaled I(Q) curves in one data file
             @param file_path: file to save data in
         """
         iq = self.get_scaled_data()        
         if file_path is not None:
-            SaveCanSAS1D(Filename=file_path, InputWorkspace=iq)
+            if as_canSAS:
+                SaveCanSAS1D(Filename=file_path, InputWorkspace=iq)
+            else:
+                SaveAscii(Filename=file_path, InputWorkspace=iq, 
+                          Separator="\t", CommentIndicator="# ", WriteXError=True)
 
     def trim_zeros(self, x, y, e, dx):
         zipped = zip(x,y,e,dx)