Merge branch 'master' into develop

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectBayes.py
Re #8391

Code/Mantid/scripts/Inelastic/IndirectBayes.py

@@ -19,6 +19,19 @@
 import sys, platform, math, os.path, numpy as np
 mp = import_mantidplot()
 
+def readASCIIFile(file_name):
+	workdir = config['defaultsave.directory']
+
+	file_path = os.path.join(workdir, file_name)
+	asc = []
+
+	with open(file_path, 'r') as handle:
+		for line in handle:
+			line = line.rstrip()
+			asc.append(line)
+
+	return asc
+
 def CalcErange(inWS,ns,erange,binWidth):
 	#length of array in Fortran
 	array_len = 4096
@@ -54,19 +67,6 @@ def CalcErange(inWS,ns,erange,binWidth):
 
 	return nout,bnorm,Xout,X,Y,E
 
-def readASCIIFile(file_name):
-	workdir = config['defaultsave.directory']
-
-	file_path = os.path.join(workdir, file_name)
-	asc = []
-
-	with open(file_path, 'r') as handle:
-		for line in handle:
-			line = line.rstrip()
-			asc.append(line)
-
-	return asc
-
 def GetXYE(inWS,n,array_len):
 	Xin = mtd[inWS].readX(n)
 	N = len(Xin)-1							# get no. points from length of x array