Merge remote-tracking branch 'origin/bugfix/10111_savelauenorm_usage_windows'

Code/Mantid/docs/source/algorithms/SaveLauenorm-v1.rst

@@ -12,12 +12,12 @@ Provide input files for the program LAUENORM which is used to perform a waveleng
 Laue data using symmetry equivalent reflections measured at different wavelengths.
 
 Input_Files
- 
+
 Unit 21     LAUE001      Input Laue data file.  This is normally a card image file with one  record  per  reflection (unmerged, unsorted data) containing the items: h k l lambda theta intensity and sig(intensity) in format (3I5,2F10.5,2I10).
 
-Unit 22     LAUE002      
+Unit 22     LAUE002
 
-Unit 23     LAUE003      
+Unit 23     LAUE003
 
 Continuing
 
@@ -31,20 +31,19 @@ Usage
 
     import os
 
-    prefix = "~/MyPeaks"
-    file = os.path.join(os.path.expanduser("~"), "MyPeaks001")
-
+    prefix = os.path.expanduser("~/MyPeaks")
     #load a peaks workspace from file
     peaks = LoadIsawPeaks(Filename=r'Peaks5637.integrate')
     SaveLauenorm(InputWorkspace=peaks, Filename=prefix)
 
-    print os.path.isfile(file)
+    firstfile = prefix + "001"
+    print "File was saved:", os.path.isfile(firstfile)
 
 Output:
 
 .. testoutput:: ExSaveLauenormSimple
 
-    True
+    File was saved: True
 
 .. testcleanup:: ExSaveLauenormSimple
 
@@ -52,11 +51,12 @@ Output:
     def removeFiles(files):
       for ws in files:
         try:
-          os.remove(file)
-        except:
+          os.remove(os.path.join(os.path.expanduser("~"), ws))
+        except IOError:
           pass
 
-    removeFiles(["MyPeaks001","MyPeaks002","MyPeaks003","MyPeaks004","MyPeaks005","MyPeaks006","MyPeaks007","MyPeaks008","MyPeaks009"])
+    removeFiles(["MyPeaks001","MyPeaks002","MyPeaks003","MyPeaks004",
+                 "MyPeaks005","MyPeaks006","MyPeaks007","MyPeaks008","MyPeaks009"])
 
 **Example - an example of running SaveLauenorm with sorting and filtering options.**
 
@@ -67,12 +67,12 @@ Output:
     #load a peaks workspace from file
     peaks = LoadIsawPeaks(Filename=r'Peaks5637.integrate')
     print "Number of peaks in table %d" % peaks.rowCount()
-    
-    prefix = "~/MyPeaks"
-    file = os.path.join(os.path.expanduser("~"), "MyPeaks009")
+
+    prefix = os.path.expanduser("~/MyPeaks")
     SaveLauenorm(InputWorkspace=peaks, Filename=prefix, MinWavelength=0.5, MaxWavelength=2,MinDSpacing=0.2, SortFilesBy='Bank')
 
-    ifile = open(file, 'r')
+    finalfile = prefix + "009"
+    ifile = open(finalfile, 'r')
     lines = ifile.readlines()
     ifile.close()
     print "Number of peaks in table %d" % len(lines)
@@ -90,8 +90,8 @@ Output:
     def removeFiles(files):
       for ws in files:
         try:
-          os.remove(file)
-        except:
+          os.remove(os.path.join(os.path.expanduser("~"), ws))
+        except IOError:
           pass
 
     removeFiles(["MyPeaks001","MyPeaks002","MyPeaks003","MyPeaks004","MyPeaks005","MyPeaks006","MyPeaks007","MyPeaks008","MyPeaks009"])