Count lines instead of bytes re #9832

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
mantidproject · Jul 8, 2014 · 08ec358 · 08ec358
1 parent 43413b8
commit 08ec358
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 35 deletions.
diff --git a/Code/Mantid/docs/source/algorithms/ExportExperimentLog-v1.rst b/Code/Mantid/docs/source/algorithms/ExportExperimentLog-v1.rst
@@ -107,7 +107,14 @@ Usage
       FileFormat = "tab",
       TimeZone = "America/New_York")
 
-  print "File is created = ", os.path.exists(savefile), "; file size = ", os.path.getsize(savefile)
+  print "File is created = ", os.path.exists(savefile)
+
+  # Get lines of file
+  sfile = open(savefile, 'r')
+  slines = sfile.readlines()
+  sfile.close()
+
+  print "Number of lines in File =", len(slines)
 
 .. testcleanup:: ExExportExpLogs
 
@@ -119,8 +126,8 @@ Output:
 
 .. testoutput:: ExExportExpLogs
 
-  File is created =  True ; file size =  49
-
+   File is created =  True
+   Number of lines in File = 2
 
 .. categories::
 

diff --git a/Code/Mantid/docs/source/algorithms/ExportSampleLogsToCSVFile-v1.rst b/Code/Mantid/docs/source/algorithms/ExportSampleLogsToCSVFile-v1.rst
@@ -28,39 +28,50 @@ CSV File format
 Usage
 -----
 
-**Example - Export a time series sample log to a tsv file:**
+**Example - Export a time series sample log to a csv file:**
 
 .. testcode:: ExExportSampleToTSV
 
-  import os
-
-  nxsfilename = "HYS_11092_event.nxs"
-  wsname = "HYS_11092_event"
-
-  defaultdir = config["default.savedirectory"]
-  if defaultdir == "":
-    defaultdir = config["defaultsave.directory"]
-  savefile = os.path.join(defaultdir, "testphase4.txt")
-
-  Load(Filename = nxsfilename, 
-      OutputWorkspace = wsname,
-      MetaDataOnly = True,
-      LoadLogs = True)
-
-  ExportSampleLogsToCSVFile(
-      InputWorkspace = wsname,
-      OutputFilename = savefile, 
-      SampleLogNames = "Phase1, Phase2, Phase3, Phase4",
-      WriteHeaderFile = True,
-      Header = "Test sample log: Phase1-Phase4",
-      TimeZone = "America/New_York",
-      TimeTolerance = 0.01)
-
-  headerfilename = os.path.join(defaultdir, "testphase4_header.txt")
-
-  print "File is created = ", os.path.exists(savefile), "; file size = ", os.path.getsize(savefile)
-  print "Header file is created = ", os.path.exists(headerfilename), "; file size = ", os.path.getsize(headerfilename)
-
+   import os
+
+   nxsfilename = "HYS_11092_event.nxs"
+   wsname = "HYS_11092_event"
+
+   defaultdir = config["default.savedirectory"]
+   if defaultdir == "":
+     defaultdir = config["defaultsave.directory"]
+   savefile = os.path.join(defaultdir, "testphase4.txt")
+
+   Load(Filename = nxsfilename,
+       OutputWorkspace = wsname,
+       MetaDataOnly = True,
+       LoadLogs = True)
+
+   ExportSampleLogsToCSVFile(
+       InputWorkspace = wsname,
+       OutputFilename = savefile,
+       SampleLogNames = "Phase1, Phase2, Phase3, Phase4",
+       WriteHeaderFile = True,
+       Header = "Test sample log: Phase1-Phase4",
+       TimeZone = "America/New_York",
+       TimeTolerance = 0.01)
+
+   headerfilename = os.path.join(defaultdir, "testphase4_header.txt")
+
+   print "File is created = ", os.path.exists(savefile)
+   print "Header file is created = ", os.path.exists(headerfilename)
+
+   # Get the lines of both files
+   sfile = open(savefile, 'r')
+   slines = sfile.readlines()
+   sfile.close()
+   hfile = open(headerfilename, 'r')
+   hlines = hfile.readlines()
+   hfile.close()
+
+   print "Number of lines in File =", len(slines)
+   print "Number of lines in Header file =", len(hlines)
+
 .. testcleanup:: ExExportSampleToTSV
 
   os.remove(savefile)
@@ -71,7 +82,9 @@ Output:
 
 .. testoutput:: ExExportSampleToTSV
 
-  File is created =  True ; file size =  2583
-  Header file is created =  True ; file size =  107
+   File is created =  True
+   Header file is created =  True
+   Number of lines in File = 36
+   Number of lines in Header file = 3
 
 .. categories::