Index: test/fileconverter/test/utest_nxcansas_writer.py
===================================================================
--- test/fileconverter/test/utest_nxcansas_writer.py	(revision 248ff7332a99edb391f42db2a242a497473df452)
+++ test/fileconverter/test/utest_nxcansas_writer.py	(revision 248ff7332a99edb391f42db2a242a497473df452)
@@ -62,2 +62,4 @@
         if os.path.isfile(self.write_file_1d):
             os.remove(self.write_file_1d)
+        if os.path.isfile(self.write_file_2d):
+            os.remove(self.write_file_2d)
Index: test/pr_inversion/test/utest_invertor.py
===================================================================
--- test/pr_inversion/test/utest_invertor.py	(revision ac07a3acc20dbf79c564bf642aece71a02c2c862)
+++ test/pr_inversion/test/utest_invertor.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -6,9 +6,14 @@
 # Disable "too many methods" complaint 
 # pylint: disable-msg=R0904 
-
-
-import unittest, math, numpy
+from __future__ import print_function
+
+
+import os
+import unittest
+import math
+import numpy
 from sas.sascalc.pr.invertor import Invertor
-        
+
+
 class TestFiguresOfMerit(unittest.TestCase):
             
@@ -235,5 +240,5 @@
             self.assertTrue(chi2/51.0<10.0)
         except:
-            print "chi2 =", chi2/51.0
+            print("chi2 =", chi2/51.0)
             raise
         
@@ -263,5 +268,5 @@
             self.assertTrue(self.invertor.chi2/len(x)<200.00)
         except:
-            print "Chi2(I(q)) =", self.invertor.chi2/len(x)
+            print("Chi2(I(q)) =", self.invertor.chi2/len(x))
             raise
         
@@ -297,5 +302,5 @@
             self.assertTrue(chi2/51.0<50.0)
         except:
-            print "chi2(P(r)) =", chi2/51.0
+            print("chi2(P(r)) =", chi2/51.0)
             raise
         
@@ -341,5 +346,5 @@
             self.assertTrue(self.invertor.chi2>0)
         except:
-            print "Chi2 =", self.invertor.chi2
+            print("Chi2 =", self.invertor.chi2)
             raise
                             
@@ -365,5 +370,5 @@
             self.assertTrue(self.invertor.chi2>0)
         except:
-            print "Chi2 =", self.invertor.chi2
+            print("Chi2 =", self.invertor.chi2)
             raise
         
@@ -416,12 +421,15 @@
         
         # Save
-        self.invertor.to_file("test_output.txt")
+        f_name = "test_output.txt"
+        self.invertor.to_file(f_name)
     
         # Load
-        self.invertor.from_file("test_output.txt")
+        self.invertor.from_file(f_name)
         self.assertEqual(self.invertor.d_max, 160.0)
         self.assertEqual(self.invertor.alpha, 0.0007)
         self.assertEqual(self.invertor.chi2, 836.797)
         self.assertAlmostEqual(self.invertor.pr(self.invertor.out, 10.0), 903.31577041, 4)
+        if os.path.isfile(f_name):
+            os.remove(f_name)
         
     def test_qmin(self):
Index: test/run_one.py
===================================================================
--- test/run_one.py	(revision aaad4c950340dd661ea6ea88902bb2c1a895de57)
+++ test/run_one.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -1,3 +1,4 @@
 #!/usr/bin/env python
+from __future__ import print_function
 
 import os
@@ -24,5 +25,5 @@
 #print "\n".join(sys.path)
 test_path,test_file = splitpath(abspath(sys.argv[1]))
-print "=== testing:",sys.argv[1]
+print("=== testing:",sys.argv[1])
 #print test_path, test_file
 sys.argv = [sys.argv[0]]
Index: test/sasdataloader/plugins/test_reader.py
===================================================================
--- test/sasdataloader/plugins/test_reader.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ test/sasdataloader/plugins/test_reader.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -8,4 +8,6 @@
 copyright 2008, University of Tennessee
 """
+from __future__ import print_function
+
 import os
 import numpy as np
@@ -59,5 +61,5 @@
     reader = Reader()
     output = reader.read("../test/test_data.test")
-    print output.x
+    print(output.x)
     
     
Index: test/sasdataloader/test/isis_1_0_write_test.xml
===================================================================
--- test/sasdataloader/test/isis_1_0_write_test.xml	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
+++ 	(revision )
@@ -1,865 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?>
-<SASroot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="cansas1d/1.0" version="1.0" xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd">
-  <SASentry>
-    <Title>TK49 c10_SANS</Title>
-    <Run>79680</Run>
-    <SASdata>
-      <Idata>
-        <Q unit="Q | 1/A">0.009</Q>
-        <I unit="Intensity | 1/cm">85.3333</I>
-        <Idev unit="Intensity | 1/cm">0.852491</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.011</Q>
-        <I unit="Intensity | 1/cm">72.5398</I>
-        <Idev unit="Intensity | 1/cm">0.639548</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.013</Q>
-        <I unit="Intensity | 1/cm">63.3582</I>
-        <Idev unit="Intensity | 1/cm">0.494127</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.015</Q>
-        <I unit="Intensity | 1/cm">57.0952</I>
-        <Idev unit="Intensity | 1/cm">0.414116</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.017</Q>
-        <I unit="Intensity | 1/cm">51.0139</I>
-        <Idev unit="Intensity | 1/cm">0.35145</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.019</Q>
-        <I unit="Intensity | 1/cm">46.4746</I>
-        <Idev unit="Intensity | 1/cm">0.308755</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.021</Q>
-        <I unit="Intensity | 1/cm">41.7191</I>
-        <Idev unit="Intensity | 1/cm">0.271641</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.023</Q>
-        <I unit="Intensity | 1/cm">37.4208</I>
-        <Idev unit="Intensity | 1/cm">0.244658</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.025</Q>
-        <I unit="Intensity | 1/cm">33.7352</I>
-        <Idev unit="Intensity | 1/cm">0.219594</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.027</Q>
-        <I unit="Intensity | 1/cm">30.6073</I>
-        <Idev unit="Intensity | 1/cm">0.203138</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.029</Q>
-        <I unit="Intensity | 1/cm">27.7309</I>
-        <Idev unit="Intensity | 1/cm">0.185859</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.031</Q>
-        <I unit="Intensity | 1/cm">25.2579</I>
-        <Idev unit="Intensity | 1/cm">0.171356</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.033</Q>
-        <I unit="Intensity | 1/cm">22.7712</I>
-        <Idev unit="Intensity | 1/cm">0.159062</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.035</Q>
-        <I unit="Intensity | 1/cm">20.5323</I>
-        <Idev unit="Intensity | 1/cm">0.146135</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.037</Q>
-        <I unit="Intensity | 1/cm">19.0744</I>
-        <Idev unit="Intensity | 1/cm">0.136393</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.039</Q>
-        <I unit="Intensity | 1/cm">17.2832</I>
-        <Idev unit="Intensity | 1/cm">0.127623</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.041</Q>
-        <I unit="Intensity | 1/cm">15.7399</I>
-        <Idev unit="Intensity | 1/cm">0.118288</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.043</Q>
-        <I unit="Intensity | 1/cm">14.5598</I>
-        <Idev unit="Intensity | 1/cm">0.111759</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.045</Q>
-        <I unit="Intensity | 1/cm">13.5906</I>
-        <Idev unit="Intensity | 1/cm">0.105148</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.047</Q>
-        <I unit="Intensity | 1/cm">12.6707</I>
-        <Idev unit="Intensity | 1/cm">0.0996579</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.049</Q>
-        <I unit="Intensity | 1/cm">11.5247</I>
-        <Idev unit="Intensity | 1/cm">0.0929646</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.051</Q>
-        <I unit="Intensity | 1/cm">10.7089</I>
-        <Idev unit="Intensity | 1/cm">0.0888575</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.053</Q>
-        <I unit="Intensity | 1/cm">10.1436</I>
-        <Idev unit="Intensity | 1/cm">0.0849394</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.055</Q>
-        <I unit="Intensity | 1/cm">9.49446</I>
-        <Idev unit="Intensity | 1/cm">0.0811205</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.057</Q>
-        <I unit="Intensity | 1/cm">8.80775</I>
-        <Idev unit="Intensity | 1/cm">0.0773967</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.059</Q>
-        <I unit="Intensity | 1/cm">8.33366</I>
-        <Idev unit="Intensity | 1/cm">0.0748147</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.061</Q>
-        <I unit="Intensity | 1/cm">7.79157</I>
-        <Idev unit="Intensity | 1/cm">0.0720107</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.063</Q>
-        <I unit="Intensity | 1/cm">7.25902</I>
-        <Idev unit="Intensity | 1/cm">0.0693582</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.065</Q>
-        <I unit="Intensity | 1/cm">7.04789</I>
-        <Idev unit="Intensity | 1/cm">0.0677591</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.067</Q>
-        <I unit="Intensity | 1/cm">6.53311</I>
-        <Idev unit="Intensity | 1/cm">0.0652207</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.069</Q>
-        <I unit="Intensity | 1/cm">6.2453</I>
-        <Idev unit="Intensity | 1/cm">0.0642016</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.071</Q>
-        <I unit="Intensity | 1/cm">5.94152</I>
-        <Idev unit="Intensity | 1/cm">0.0625768</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.073</Q>
-        <I unit="Intensity | 1/cm">5.70816</I>
-        <Idev unit="Intensity | 1/cm">0.0612955</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.075</Q>
-        <I unit="Intensity | 1/cm">5.24449</I>
-        <Idev unit="Intensity | 1/cm">0.060141</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.077</Q>
-        <I unit="Intensity | 1/cm">5.08291</I>
-        <Idev unit="Intensity | 1/cm">0.0582239</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.079</Q>
-        <I unit="Intensity | 1/cm">4.88135</I>
-        <Idev unit="Intensity | 1/cm">0.057969</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.081</Q>
-        <I unit="Intensity | 1/cm">4.60942</I>
-        <Idev unit="Intensity | 1/cm">0.056813</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.083</Q>
-        <I unit="Intensity | 1/cm">4.46606</I>
-        <Idev unit="Intensity | 1/cm">0.0569381</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.085</Q>
-        <I unit="Intensity | 1/cm">4.32473</I>
-        <Idev unit="Intensity | 1/cm">0.0558766</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.087</Q>
-        <I unit="Intensity | 1/cm">4.14144</I>
-        <Idev unit="Intensity | 1/cm">0.0552525</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.089</Q>
-        <I unit="Intensity | 1/cm">3.86504</I>
-        <Idev unit="Intensity | 1/cm">0.0544569</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.091</Q>
-        <I unit="Intensity | 1/cm">3.74272</I>
-        <Idev unit="Intensity | 1/cm">0.0529596</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.093</Q>
-        <I unit="Intensity | 1/cm">3.68281</I>
-        <Idev unit="Intensity | 1/cm">0.052891</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.095</Q>
-        <I unit="Intensity | 1/cm">3.46991</I>
-        <Idev unit="Intensity | 1/cm">0.0517565</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.097</Q>
-        <I unit="Intensity | 1/cm">3.37244</I>
-        <Idev unit="Intensity | 1/cm">0.0509328</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.099</Q>
-        <I unit="Intensity | 1/cm">3.27074</I>
-        <Idev unit="Intensity | 1/cm">0.0505183</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.101</Q>
-        <I unit="Intensity | 1/cm">3.13326</I>
-        <Idev unit="Intensity | 1/cm">0.0490847</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.103</Q>
-        <I unit="Intensity | 1/cm">3.01387</I>
-        <Idev unit="Intensity | 1/cm">0.0487012</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.105</Q>
-        <I unit="Intensity | 1/cm">2.87628</I>
-        <Idev unit="Intensity | 1/cm">0.0484307</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.107</Q>
-        <I unit="Intensity | 1/cm">2.85043</I>
-        <Idev unit="Intensity | 1/cm">0.0476786</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.109</Q>
-        <I unit="Intensity | 1/cm">2.72799</I>
-        <Idev unit="Intensity | 1/cm">0.0475526</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.111</Q>
-        <I unit="Intensity | 1/cm">2.61206</I>
-        <Idev unit="Intensity | 1/cm">0.0467475</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.113</Q>
-        <I unit="Intensity | 1/cm">2.58895</I>
-        <Idev unit="Intensity | 1/cm">0.0469767</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.115</Q>
-        <I unit="Intensity | 1/cm">2.45987</I>
-        <Idev unit="Intensity | 1/cm">0.0460139</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.117</Q>
-        <I unit="Intensity | 1/cm">2.37723</I>
-        <Idev unit="Intensity | 1/cm">0.045272</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.119</Q>
-        <I unit="Intensity | 1/cm">2.34122</I>
-        <Idev unit="Intensity | 1/cm">0.0453741</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.121</Q>
-        <I unit="Intensity | 1/cm">2.21745</I>
-        <Idev unit="Intensity | 1/cm">0.0444485</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.123</Q>
-        <I unit="Intensity | 1/cm">2.12646</I>
-        <Idev unit="Intensity | 1/cm">0.0438385</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.125</Q>
-        <I unit="Intensity | 1/cm">2.11264</I>
-        <Idev unit="Intensity | 1/cm">0.0441662</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.127</Q>
-        <I unit="Intensity | 1/cm">2.07523</I>
-        <Idev unit="Intensity | 1/cm">0.0438979</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.129</Q>
-        <I unit="Intensity | 1/cm">2.03548</I>
-        <Idev unit="Intensity | 1/cm">0.0442422</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.131</Q>
-        <I unit="Intensity | 1/cm">1.92452</I>
-        <Idev unit="Intensity | 1/cm">0.0435959</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.133</Q>
-        <I unit="Intensity | 1/cm">1.90866</I>
-        <Idev unit="Intensity | 1/cm">0.0437401</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.135</Q>
-        <I unit="Intensity | 1/cm">1.91252</I>
-        <Idev unit="Intensity | 1/cm">0.0443163</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.137</Q>
-        <I unit="Intensity | 1/cm">1.80405</I>
-        <Idev unit="Intensity | 1/cm">0.043466</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.139</Q>
-        <I unit="Intensity | 1/cm">1.72166</I>
-        <Idev unit="Intensity | 1/cm">0.0429246</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.141</Q>
-        <I unit="Intensity | 1/cm">1.67199</I>
-        <Idev unit="Intensity | 1/cm">0.042469</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.143</Q>
-        <I unit="Intensity | 1/cm">1.63282</I>
-        <Idev unit="Intensity | 1/cm">0.0430074</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.145</Q>
-        <I unit="Intensity | 1/cm">1.63712</I>
-        <Idev unit="Intensity | 1/cm">0.0438557</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.147</Q>
-        <I unit="Intensity | 1/cm">1.5862</I>
-        <Idev unit="Intensity | 1/cm">0.0434135</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.149</Q>
-        <I unit="Intensity | 1/cm">1.56121</I>
-        <Idev unit="Intensity | 1/cm">0.0432591</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.151</Q>
-        <I unit="Intensity | 1/cm">1.49764</I>
-        <Idev unit="Intensity | 1/cm">0.0426577</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.153</Q>
-        <I unit="Intensity | 1/cm">1.53828</I>
-        <Idev unit="Intensity | 1/cm">0.0446481</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.155</Q>
-        <I unit="Intensity | 1/cm">1.47366</I>
-        <Idev unit="Intensity | 1/cm">0.0441973</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.157</Q>
-        <I unit="Intensity | 1/cm">1.40582</I>
-        <Idev unit="Intensity | 1/cm">0.0430461</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.159</Q>
-        <I unit="Intensity | 1/cm">1.40491</I>
-        <Idev unit="Intensity | 1/cm">0.0439883</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.161</Q>
-        <I unit="Intensity | 1/cm">1.34639</I>
-        <Idev unit="Intensity | 1/cm">0.044193</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.163</Q>
-        <I unit="Intensity | 1/cm">1.32238</I>
-        <Idev unit="Intensity | 1/cm">0.0438008</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.165</Q>
-        <I unit="Intensity | 1/cm">1.33885</I>
-        <Idev unit="Intensity | 1/cm">0.0445383</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.167</Q>
-        <I unit="Intensity | 1/cm">1.29608</I>
-        <Idev unit="Intensity | 1/cm">0.0451575</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.169</Q>
-        <I unit="Intensity | 1/cm">1.30562</I>
-        <Idev unit="Intensity | 1/cm">0.0460656</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.171</Q>
-        <I unit="Intensity | 1/cm">1.17147</I>
-        <Idev unit="Intensity | 1/cm">0.0435717</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.173</Q>
-        <I unit="Intensity | 1/cm">1.18565</I>
-        <Idev unit="Intensity | 1/cm">0.0449072</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.175</Q>
-        <I unit="Intensity | 1/cm">1.18944</I>
-        <Idev unit="Intensity | 1/cm">0.0465319</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.177</Q>
-        <I unit="Intensity | 1/cm">1.17055</I>
-        <Idev unit="Intensity | 1/cm">0.0456562</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.179</Q>
-        <I unit="Intensity | 1/cm">1.08571</I>
-        <Idev unit="Intensity | 1/cm">0.0453852</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.181</Q>
-        <I unit="Intensity | 1/cm">1.06208</I>
-        <Idev unit="Intensity | 1/cm">0.0463335</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.183</Q>
-        <I unit="Intensity | 1/cm">1.06187</I>
-        <Idev unit="Intensity | 1/cm">0.0458284</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.185</Q>
-        <I unit="Intensity | 1/cm">1.02727</I>
-        <Idev unit="Intensity | 1/cm">0.0472613</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.187</Q>
-        <I unit="Intensity | 1/cm">0.995169</I>
-        <Idev unit="Intensity | 1/cm">0.0465526</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.189</Q>
-        <I unit="Intensity | 1/cm">1.02569</I>
-        <Idev unit="Intensity | 1/cm">0.0483728</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.191</Q>
-        <I unit="Intensity | 1/cm">0.981154</I>
-        <Idev unit="Intensity | 1/cm">0.0490559</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.193</Q>
-        <I unit="Intensity | 1/cm">1.01831</I>
-        <Idev unit="Intensity | 1/cm">0.0502348</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.195</Q>
-        <I unit="Intensity | 1/cm">0.968102</I>
-        <Idev unit="Intensity | 1/cm">0.0504426</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.197</Q>
-        <I unit="Intensity | 1/cm">0.940656</I>
-        <Idev unit="Intensity | 1/cm">0.0512734</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.199</Q>
-        <I unit="Intensity | 1/cm">1.05762</I>
-        <Idev unit="Intensity | 1/cm">0.0547469</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.201</Q>
-        <I unit="Intensity | 1/cm">0.949872</I>
-        <Idev unit="Intensity | 1/cm">0.055229</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.203</Q>
-        <I unit="Intensity | 1/cm">0.891716</I>
-        <Idev unit="Intensity | 1/cm">0.0531346</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.205</Q>
-        <I unit="Intensity | 1/cm">0.876084</I>
-        <Idev unit="Intensity | 1/cm">0.0548681</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.207</Q>
-        <I unit="Intensity | 1/cm">0.932101</I>
-        <Idev unit="Intensity | 1/cm">0.0576812</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.209</Q>
-        <I unit="Intensity | 1/cm">0.927755</I>
-        <Idev unit="Intensity | 1/cm">0.0593404</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.211</Q>
-        <I unit="Intensity | 1/cm">0.87669</I>
-        <Idev unit="Intensity | 1/cm">0.0600369</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.213</Q>
-        <I unit="Intensity | 1/cm">0.809125</I>
-        <Idev unit="Intensity | 1/cm">0.0588107</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.215</Q>
-        <I unit="Intensity | 1/cm">0.941202</I>
-        <Idev unit="Intensity | 1/cm">0.0659121</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.217</Q>
-        <I unit="Intensity | 1/cm">0.946175</I>
-        <Idev unit="Intensity | 1/cm">0.0690784</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.219</Q>
-        <I unit="Intensity | 1/cm">0.859875</I>
-        <Idev unit="Intensity | 1/cm">0.0674435</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.221</Q>
-        <I unit="Intensity | 1/cm">0.959508</I>
-        <Idev unit="Intensity | 1/cm">0.0718856</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.223</Q>
-        <I unit="Intensity | 1/cm">0.763222</I>
-        <Idev unit="Intensity | 1/cm">0.0702866</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.225</Q>
-        <I unit="Intensity | 1/cm">0.785467</I>
-        <Idev unit="Intensity | 1/cm">0.0742144</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.227</Q>
-        <I unit="Intensity | 1/cm">0.81876</I>
-        <Idev unit="Intensity | 1/cm">0.074266</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.229</Q>
-        <I unit="Intensity | 1/cm">0.678311</I>
-        <Idev unit="Intensity | 1/cm">0.0722578</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.231</Q>
-        <I unit="Intensity | 1/cm">0.761442</I>
-        <Idev unit="Intensity | 1/cm">0.0814516</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.233</Q>
-        <I unit="Intensity | 1/cm">0.757076</I>
-        <Idev unit="Intensity | 1/cm">0.0825262</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.235</Q>
-        <I unit="Intensity | 1/cm">0.600636</I>
-        <Idev unit="Intensity | 1/cm">0.075041</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.237</Q>
-        <I unit="Intensity | 1/cm">0.685635</I>
-        <Idev unit="Intensity | 1/cm">0.0842392</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.239</Q>
-        <I unit="Intensity | 1/cm">0.799186</I>
-        <Idev unit="Intensity | 1/cm">0.0974365</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.241</Q>
-        <I unit="Intensity | 1/cm">0.737526</I>
-        <Idev unit="Intensity | 1/cm">0.0957286</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.243</Q>
-        <I unit="Intensity | 1/cm">0.716415</I>
-        <Idev unit="Intensity | 1/cm">0.0970448</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.245</Q>
-        <I unit="Intensity | 1/cm">0.720413</I>
-        <Idev unit="Intensity | 1/cm">0.0981996</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.247</Q>
-        <I unit="Intensity | 1/cm">0.604059</I>
-        <Idev unit="Intensity | 1/cm">0.100869</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.249</Q>
-        <I unit="Intensity | 1/cm">0.649073</I>
-        <Idev unit="Intensity | 1/cm">0.109281</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.251</Q>
-        <I unit="Intensity | 1/cm">0.700691</I>
-        <Idev unit="Intensity | 1/cm">0.114325</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.253</Q>
-        <I unit="Intensity | 1/cm">0.586789</I>
-        <Idev unit="Intensity | 1/cm">0.108324</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.255</Q>
-        <I unit="Intensity | 1/cm">0.765838</I>
-        <Idev unit="Intensity | 1/cm">0.139579</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.257</Q>
-        <I unit="Intensity | 1/cm">0.828968</I>
-        <Idev unit="Intensity | 1/cm">0.156723</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.259</Q>
-        <I unit="Intensity | 1/cm">0.616499</I>
-        <Idev unit="Intensity | 1/cm">0.137866</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.261</Q>
-        <I unit="Intensity | 1/cm">0.526011</I>
-        <Idev unit="Intensity | 1/cm">0.126209</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.263</Q>
-        <I unit="Intensity | 1/cm">0.51277</I>
-        <Idev unit="Intensity | 1/cm">0.126339</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.265</Q>
-        <I unit="Intensity | 1/cm">0.604189</I>
-        <Idev unit="Intensity | 1/cm">0.166393</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.267</Q>
-        <I unit="Intensity | 1/cm">0.738765</I>
-        <Idev unit="Intensity | 1/cm">0.194006</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.269</Q>
-        <I unit="Intensity | 1/cm">0.462803</I>
-        <Idev unit="Intensity | 1/cm">0.155354</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.271</Q>
-        <I unit="Intensity | 1/cm">0.478694</I>
-        <Idev unit="Intensity | 1/cm">0.171676</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.273</Q>
-        <I unit="Intensity | 1/cm">0.711983</I>
-        <Idev unit="Intensity | 1/cm">0.255539</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.275</Q>
-        <I unit="Intensity | 1/cm">0.473304</I>
-        <Idev unit="Intensity | 1/cm">0.230752</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.277</Q>
-        <I unit="Intensity | 1/cm">0.536817</I>
-        <Idev unit="Intensity | 1/cm">0.262627</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.279</Q>
-        <I unit="Intensity | 1/cm">0.660654</I>
-        <Idev unit="Intensity | 1/cm">0.297519</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.281</Q>
-        <I unit="Intensity | 1/cm">0.408902</I>
-        <Idev unit="Intensity | 1/cm">0.24585</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.283</Q>
-        <I unit="Intensity | 1/cm">0.0</I>
-        <Idev unit="Intensity | 1/cm">0.0</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-    </SASdata>
-    <SASsample name="">
-      <ID>TK49 c10_SANS</ID>
-    </SASsample>
-    <SASinstrument>
-      <name>LOQ</name>
-      <SASsource>
-        <radiation>neutron</radiation>
-      </SASsource>
-      <SAScollimation/>
-      <SASdetector>
-        <name>HAB</name>
-        <SDD unit="mm">575.0</SDD>
-      </SASdetector>
-      <SASdetector>
-        <name>main-detector-bank</name>
-        <SDD unit="mm">4145.02</SDD>
-      </SASdetector>
-    </SASinstrument>
-    <SASprocess>
-      <name>Mantid generated CanSAS1D XML</name>
-      <date>02-Aug-2013 16:54:14</date>
-      <description></description>
-      <term unit="" name="svn">2.5.3</term>
-      <term unit="" name="user_file">K:/masks/MASKLOQ_MAN_132E_Lu_Banjo_12mm.txt</term>
-      <SASprocessnote></SASprocessnote>
-    </SASprocess>
-    <SASnote></SASnote>
-  </SASentry>
-</SASroot>
Index: test/sasdataloader/test/isis_1_1_write_test.xml
===================================================================
--- test/sasdataloader/test/isis_1_1_write_test.xml	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
+++ 	(revision )
@@ -1,865 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?>
-<SASroot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:cansas1d:1.1" version="1.1" xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/formats/1.1/cansas1d.xsd">
-  <SASentry>
-    <Title>TK49 c10_SANS</Title>
-    <Run>79680</Run>
-    <SASdata>
-      <Idata>
-        <Q unit="Q | 1/A">0.009</Q>
-        <I unit="Intensity | 1/cm">85.3333</I>
-        <Idev unit="Intensity | 1/cm">0.852491</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.011</Q>
-        <I unit="Intensity | 1/cm">72.5398</I>
-        <Idev unit="Intensity | 1/cm">0.639548</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.013</Q>
-        <I unit="Intensity | 1/cm">63.3582</I>
-        <Idev unit="Intensity | 1/cm">0.494127</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.015</Q>
-        <I unit="Intensity | 1/cm">57.0952</I>
-        <Idev unit="Intensity | 1/cm">0.414116</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.017</Q>
-        <I unit="Intensity | 1/cm">51.0139</I>
-        <Idev unit="Intensity | 1/cm">0.35145</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.019</Q>
-        <I unit="Intensity | 1/cm">46.4746</I>
-        <Idev unit="Intensity | 1/cm">0.308755</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.021</Q>
-        <I unit="Intensity | 1/cm">41.7191</I>
-        <Idev unit="Intensity | 1/cm">0.271641</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.023</Q>
-        <I unit="Intensity | 1/cm">37.4208</I>
-        <Idev unit="Intensity | 1/cm">0.244658</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.025</Q>
-        <I unit="Intensity | 1/cm">33.7352</I>
-        <Idev unit="Intensity | 1/cm">0.219594</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.027</Q>
-        <I unit="Intensity | 1/cm">30.6073</I>
-        <Idev unit="Intensity | 1/cm">0.203138</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.029</Q>
-        <I unit="Intensity | 1/cm">27.7309</I>
-        <Idev unit="Intensity | 1/cm">0.185859</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.031</Q>
-        <I unit="Intensity | 1/cm">25.2579</I>
-        <Idev unit="Intensity | 1/cm">0.171356</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.033</Q>
-        <I unit="Intensity | 1/cm">22.7712</I>
-        <Idev unit="Intensity | 1/cm">0.159062</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.035</Q>
-        <I unit="Intensity | 1/cm">20.5323</I>
-        <Idev unit="Intensity | 1/cm">0.146135</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.037</Q>
-        <I unit="Intensity | 1/cm">19.0744</I>
-        <Idev unit="Intensity | 1/cm">0.136393</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.039</Q>
-        <I unit="Intensity | 1/cm">17.2832</I>
-        <Idev unit="Intensity | 1/cm">0.127623</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.041</Q>
-        <I unit="Intensity | 1/cm">15.7399</I>
-        <Idev unit="Intensity | 1/cm">0.118288</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.043</Q>
-        <I unit="Intensity | 1/cm">14.5598</I>
-        <Idev unit="Intensity | 1/cm">0.111759</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.045</Q>
-        <I unit="Intensity | 1/cm">13.5906</I>
-        <Idev unit="Intensity | 1/cm">0.105148</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.047</Q>
-        <I unit="Intensity | 1/cm">12.6707</I>
-        <Idev unit="Intensity | 1/cm">0.0996579</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.049</Q>
-        <I unit="Intensity | 1/cm">11.5247</I>
-        <Idev unit="Intensity | 1/cm">0.0929646</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.051</Q>
-        <I unit="Intensity | 1/cm">10.7089</I>
-        <Idev unit="Intensity | 1/cm">0.0888575</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.053</Q>
-        <I unit="Intensity | 1/cm">10.1436</I>
-        <Idev unit="Intensity | 1/cm">0.0849394</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.055</Q>
-        <I unit="Intensity | 1/cm">9.49446</I>
-        <Idev unit="Intensity | 1/cm">0.0811205</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.057</Q>
-        <I unit="Intensity | 1/cm">8.80775</I>
-        <Idev unit="Intensity | 1/cm">0.0773967</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.059</Q>
-        <I unit="Intensity | 1/cm">8.33366</I>
-        <Idev unit="Intensity | 1/cm">0.0748147</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.061</Q>
-        <I unit="Intensity | 1/cm">7.79157</I>
-        <Idev unit="Intensity | 1/cm">0.0720107</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.063</Q>
-        <I unit="Intensity | 1/cm">7.25902</I>
-        <Idev unit="Intensity | 1/cm">0.0693582</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.065</Q>
-        <I unit="Intensity | 1/cm">7.04789</I>
-        <Idev unit="Intensity | 1/cm">0.0677591</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.067</Q>
-        <I unit="Intensity | 1/cm">6.53311</I>
-        <Idev unit="Intensity | 1/cm">0.0652207</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.069</Q>
-        <I unit="Intensity | 1/cm">6.2453</I>
-        <Idev unit="Intensity | 1/cm">0.0642016</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.071</Q>
-        <I unit="Intensity | 1/cm">5.94152</I>
-        <Idev unit="Intensity | 1/cm">0.0625768</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.073</Q>
-        <I unit="Intensity | 1/cm">5.70816</I>
-        <Idev unit="Intensity | 1/cm">0.0612955</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.075</Q>
-        <I unit="Intensity | 1/cm">5.24449</I>
-        <Idev unit="Intensity | 1/cm">0.060141</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.077</Q>
-        <I unit="Intensity | 1/cm">5.08291</I>
-        <Idev unit="Intensity | 1/cm">0.0582239</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.079</Q>
-        <I unit="Intensity | 1/cm">4.88135</I>
-        <Idev unit="Intensity | 1/cm">0.057969</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.081</Q>
-        <I unit="Intensity | 1/cm">4.60942</I>
-        <Idev unit="Intensity | 1/cm">0.056813</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.083</Q>
-        <I unit="Intensity | 1/cm">4.46606</I>
-        <Idev unit="Intensity | 1/cm">0.0569381</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.085</Q>
-        <I unit="Intensity | 1/cm">4.32473</I>
-        <Idev unit="Intensity | 1/cm">0.0558766</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.087</Q>
-        <I unit="Intensity | 1/cm">4.14144</I>
-        <Idev unit="Intensity | 1/cm">0.0552525</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.089</Q>
-        <I unit="Intensity | 1/cm">3.86504</I>
-        <Idev unit="Intensity | 1/cm">0.0544569</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.091</Q>
-        <I unit="Intensity | 1/cm">3.74272</I>
-        <Idev unit="Intensity | 1/cm">0.0529596</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.093</Q>
-        <I unit="Intensity | 1/cm">3.68281</I>
-        <Idev unit="Intensity | 1/cm">0.052891</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.095</Q>
-        <I unit="Intensity | 1/cm">3.46991</I>
-        <Idev unit="Intensity | 1/cm">0.0517565</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.097</Q>
-        <I unit="Intensity | 1/cm">3.37244</I>
-        <Idev unit="Intensity | 1/cm">0.0509328</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.099</Q>
-        <I unit="Intensity | 1/cm">3.27074</I>
-        <Idev unit="Intensity | 1/cm">0.0505183</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.101</Q>
-        <I unit="Intensity | 1/cm">3.13326</I>
-        <Idev unit="Intensity | 1/cm">0.0490847</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.103</Q>
-        <I unit="Intensity | 1/cm">3.01387</I>
-        <Idev unit="Intensity | 1/cm">0.0487012</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.105</Q>
-        <I unit="Intensity | 1/cm">2.87628</I>
-        <Idev unit="Intensity | 1/cm">0.0484307</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.107</Q>
-        <I unit="Intensity | 1/cm">2.85043</I>
-        <Idev unit="Intensity | 1/cm">0.0476786</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.109</Q>
-        <I unit="Intensity | 1/cm">2.72799</I>
-        <Idev unit="Intensity | 1/cm">0.0475526</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.111</Q>
-        <I unit="Intensity | 1/cm">2.61206</I>
-        <Idev unit="Intensity | 1/cm">0.0467475</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.113</Q>
-        <I unit="Intensity | 1/cm">2.58895</I>
-        <Idev unit="Intensity | 1/cm">0.0469767</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.115</Q>
-        <I unit="Intensity | 1/cm">2.45987</I>
-        <Idev unit="Intensity | 1/cm">0.0460139</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.117</Q>
-        <I unit="Intensity | 1/cm">2.37723</I>
-        <Idev unit="Intensity | 1/cm">0.045272</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.119</Q>
-        <I unit="Intensity | 1/cm">2.34122</I>
-        <Idev unit="Intensity | 1/cm">0.0453741</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.121</Q>
-        <I unit="Intensity | 1/cm">2.21745</I>
-        <Idev unit="Intensity | 1/cm">0.0444485</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.123</Q>
-        <I unit="Intensity | 1/cm">2.12646</I>
-        <Idev unit="Intensity | 1/cm">0.0438385</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.125</Q>
-        <I unit="Intensity | 1/cm">2.11264</I>
-        <Idev unit="Intensity | 1/cm">0.0441662</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.127</Q>
-        <I unit="Intensity | 1/cm">2.07523</I>
-        <Idev unit="Intensity | 1/cm">0.0438979</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.129</Q>
-        <I unit="Intensity | 1/cm">2.03548</I>
-        <Idev unit="Intensity | 1/cm">0.0442422</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.131</Q>
-        <I unit="Intensity | 1/cm">1.92452</I>
-        <Idev unit="Intensity | 1/cm">0.0435959</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.133</Q>
-        <I unit="Intensity | 1/cm">1.90866</I>
-        <Idev unit="Intensity | 1/cm">0.0437401</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.135</Q>
-        <I unit="Intensity | 1/cm">1.91252</I>
-        <Idev unit="Intensity | 1/cm">0.0443163</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.137</Q>
-        <I unit="Intensity | 1/cm">1.80405</I>
-        <Idev unit="Intensity | 1/cm">0.043466</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.139</Q>
-        <I unit="Intensity | 1/cm">1.72166</I>
-        <Idev unit="Intensity | 1/cm">0.0429246</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.141</Q>
-        <I unit="Intensity | 1/cm">1.67199</I>
-        <Idev unit="Intensity | 1/cm">0.042469</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.143</Q>
-        <I unit="Intensity | 1/cm">1.63282</I>
-        <Idev unit="Intensity | 1/cm">0.0430074</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.145</Q>
-        <I unit="Intensity | 1/cm">1.63712</I>
-        <Idev unit="Intensity | 1/cm">0.0438557</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.147</Q>
-        <I unit="Intensity | 1/cm">1.5862</I>
-        <Idev unit="Intensity | 1/cm">0.0434135</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.149</Q>
-        <I unit="Intensity | 1/cm">1.56121</I>
-        <Idev unit="Intensity | 1/cm">0.0432591</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.151</Q>
-        <I unit="Intensity | 1/cm">1.49764</I>
-        <Idev unit="Intensity | 1/cm">0.0426577</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.153</Q>
-        <I unit="Intensity | 1/cm">1.53828</I>
-        <Idev unit="Intensity | 1/cm">0.0446481</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.155</Q>
-        <I unit="Intensity | 1/cm">1.47366</I>
-        <Idev unit="Intensity | 1/cm">0.0441973</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.157</Q>
-        <I unit="Intensity | 1/cm">1.40582</I>
-        <Idev unit="Intensity | 1/cm">0.0430461</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.159</Q>
-        <I unit="Intensity | 1/cm">1.40491</I>
-        <Idev unit="Intensity | 1/cm">0.0439883</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.161</Q>
-        <I unit="Intensity | 1/cm">1.34639</I>
-        <Idev unit="Intensity | 1/cm">0.044193</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.163</Q>
-        <I unit="Intensity | 1/cm">1.32238</I>
-        <Idev unit="Intensity | 1/cm">0.0438008</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.165</Q>
-        <I unit="Intensity | 1/cm">1.33885</I>
-        <Idev unit="Intensity | 1/cm">0.0445383</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.167</Q>
-        <I unit="Intensity | 1/cm">1.29608</I>
-        <Idev unit="Intensity | 1/cm">0.0451575</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.169</Q>
-        <I unit="Intensity | 1/cm">1.30562</I>
-        <Idev unit="Intensity | 1/cm">0.0460656</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.171</Q>
-        <I unit="Intensity | 1/cm">1.17147</I>
-        <Idev unit="Intensity | 1/cm">0.0435717</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.173</Q>
-        <I unit="Intensity | 1/cm">1.18565</I>
-        <Idev unit="Intensity | 1/cm">0.0449072</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.175</Q>
-        <I unit="Intensity | 1/cm">1.18944</I>
-        <Idev unit="Intensity | 1/cm">0.0465319</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.177</Q>
-        <I unit="Intensity | 1/cm">1.17055</I>
-        <Idev unit="Intensity | 1/cm">0.0456562</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.179</Q>
-        <I unit="Intensity | 1/cm">1.08571</I>
-        <Idev unit="Intensity | 1/cm">0.0453852</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.181</Q>
-        <I unit="Intensity | 1/cm">1.06208</I>
-        <Idev unit="Intensity | 1/cm">0.0463335</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.183</Q>
-        <I unit="Intensity | 1/cm">1.06187</I>
-        <Idev unit="Intensity | 1/cm">0.0458284</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.185</Q>
-        <I unit="Intensity | 1/cm">1.02727</I>
-        <Idev unit="Intensity | 1/cm">0.0472613</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.187</Q>
-        <I unit="Intensity | 1/cm">0.995169</I>
-        <Idev unit="Intensity | 1/cm">0.0465526</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.189</Q>
-        <I unit="Intensity | 1/cm">1.02569</I>
-        <Idev unit="Intensity | 1/cm">0.0483728</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.191</Q>
-        <I unit="Intensity | 1/cm">0.981154</I>
-        <Idev unit="Intensity | 1/cm">0.0490559</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.193</Q>
-        <I unit="Intensity | 1/cm">1.01831</I>
-        <Idev unit="Intensity | 1/cm">0.0502348</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.195</Q>
-        <I unit="Intensity | 1/cm">0.968102</I>
-        <Idev unit="Intensity | 1/cm">0.0504426</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.197</Q>
-        <I unit="Intensity | 1/cm">0.940656</I>
-        <Idev unit="Intensity | 1/cm">0.0512734</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.199</Q>
-        <I unit="Intensity | 1/cm">1.05762</I>
-        <Idev unit="Intensity | 1/cm">0.0547469</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.201</Q>
-        <I unit="Intensity | 1/cm">0.949872</I>
-        <Idev unit="Intensity | 1/cm">0.055229</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.203</Q>
-        <I unit="Intensity | 1/cm">0.891716</I>
-        <Idev unit="Intensity | 1/cm">0.0531346</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.205</Q>
-        <I unit="Intensity | 1/cm">0.876084</I>
-        <Idev unit="Intensity | 1/cm">0.0548681</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.207</Q>
-        <I unit="Intensity | 1/cm">0.932101</I>
-        <Idev unit="Intensity | 1/cm">0.0576812</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.209</Q>
-        <I unit="Intensity | 1/cm">0.927755</I>
-        <Idev unit="Intensity | 1/cm">0.0593404</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.211</Q>
-        <I unit="Intensity | 1/cm">0.87669</I>
-        <Idev unit="Intensity | 1/cm">0.0600369</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.213</Q>
-        <I unit="Intensity | 1/cm">0.809125</I>
-        <Idev unit="Intensity | 1/cm">0.0588107</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.215</Q>
-        <I unit="Intensity | 1/cm">0.941202</I>
-        <Idev unit="Intensity | 1/cm">0.0659121</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.217</Q>
-        <I unit="Intensity | 1/cm">0.946175</I>
-        <Idev unit="Intensity | 1/cm">0.0690784</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.219</Q>
-        <I unit="Intensity | 1/cm">0.859875</I>
-        <Idev unit="Intensity | 1/cm">0.0674435</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.221</Q>
-        <I unit="Intensity | 1/cm">0.959508</I>
-        <Idev unit="Intensity | 1/cm">0.0718856</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.223</Q>
-        <I unit="Intensity | 1/cm">0.763222</I>
-        <Idev unit="Intensity | 1/cm">0.0702866</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.225</Q>
-        <I unit="Intensity | 1/cm">0.785467</I>
-        <Idev unit="Intensity | 1/cm">0.0742144</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.227</Q>
-        <I unit="Intensity | 1/cm">0.81876</I>
-        <Idev unit="Intensity | 1/cm">0.074266</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.229</Q>
-        <I unit="Intensity | 1/cm">0.678311</I>
-        <Idev unit="Intensity | 1/cm">0.0722578</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.231</Q>
-        <I unit="Intensity | 1/cm">0.761442</I>
-        <Idev unit="Intensity | 1/cm">0.0814516</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.233</Q>
-        <I unit="Intensity | 1/cm">0.757076</I>
-        <Idev unit="Intensity | 1/cm">0.0825262</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.235</Q>
-        <I unit="Intensity | 1/cm">0.600636</I>
-        <Idev unit="Intensity | 1/cm">0.075041</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.237</Q>
-        <I unit="Intensity | 1/cm">0.685635</I>
-        <Idev unit="Intensity | 1/cm">0.0842392</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.239</Q>
-        <I unit="Intensity | 1/cm">0.799186</I>
-        <Idev unit="Intensity | 1/cm">0.0974365</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.241</Q>
-        <I unit="Intensity | 1/cm">0.737526</I>
-        <Idev unit="Intensity | 1/cm">0.0957286</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.243</Q>
-        <I unit="Intensity | 1/cm">0.716415</I>
-        <Idev unit="Intensity | 1/cm">0.0970448</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.245</Q>
-        <I unit="Intensity | 1/cm">0.720413</I>
-        <Idev unit="Intensity | 1/cm">0.0981996</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.247</Q>
-        <I unit="Intensity | 1/cm">0.604059</I>
-        <Idev unit="Intensity | 1/cm">0.100869</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.249</Q>
-        <I unit="Intensity | 1/cm">0.649073</I>
-        <Idev unit="Intensity | 1/cm">0.109281</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.251</Q>
-        <I unit="Intensity | 1/cm">0.700691</I>
-        <Idev unit="Intensity | 1/cm">0.114325</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.253</Q>
-        <I unit="Intensity | 1/cm">0.586789</I>
-        <Idev unit="Intensity | 1/cm">0.108324</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.255</Q>
-        <I unit="Intensity | 1/cm">0.765838</I>
-        <Idev unit="Intensity | 1/cm">0.139579</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.257</Q>
-        <I unit="Intensity | 1/cm">0.828968</I>
-        <Idev unit="Intensity | 1/cm">0.156723</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.259</Q>
-        <I unit="Intensity | 1/cm">0.616499</I>
-        <Idev unit="Intensity | 1/cm">0.137866</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.261</Q>
-        <I unit="Intensity | 1/cm">0.526011</I>
-        <Idev unit="Intensity | 1/cm">0.126209</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.263</Q>
-        <I unit="Intensity | 1/cm">0.51277</I>
-        <Idev unit="Intensity | 1/cm">0.126339</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.265</Q>
-        <I unit="Intensity | 1/cm">0.604189</I>
-        <Idev unit="Intensity | 1/cm">0.166393</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.267</Q>
-        <I unit="Intensity | 1/cm">0.738765</I>
-        <Idev unit="Intensity | 1/cm">0.194006</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.269</Q>
-        <I unit="Intensity | 1/cm">0.462803</I>
-        <Idev unit="Intensity | 1/cm">0.155354</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.271</Q>
-        <I unit="Intensity | 1/cm">0.478694</I>
-        <Idev unit="Intensity | 1/cm">0.171676</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.273</Q>
-        <I unit="Intensity | 1/cm">0.711983</I>
-        <Idev unit="Intensity | 1/cm">0.255539</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.275</Q>
-        <I unit="Intensity | 1/cm">0.473304</I>
-        <Idev unit="Intensity | 1/cm">0.230752</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.277</Q>
-        <I unit="Intensity | 1/cm">0.536817</I>
-        <Idev unit="Intensity | 1/cm">0.262627</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.279</Q>
-        <I unit="Intensity | 1/cm">0.660654</I>
-        <Idev unit="Intensity | 1/cm">0.297519</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.281</Q>
-        <I unit="Intensity | 1/cm">0.408902</I>
-        <Idev unit="Intensity | 1/cm">0.24585</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.283</Q>
-        <I unit="Intensity | 1/cm">0.0</I>
-        <Idev unit="Intensity | 1/cm">0.0</Idev>
-        <Qdev unit="Q | 1/A">0.0</Qdev>
-      </Idata>
-    </SASdata>
-    <SASsample name="">
-      <ID>TK49 c10_SANS</ID>
-    </SASsample>
-    <SASinstrument>
-      <name>LOQ</name>
-      <SASsource>
-        <radiation>neutron</radiation>
-      </SASsource>
-      <SAScollimation/>
-      <SASdetector>
-        <name>HAB</name>
-        <SDD unit="mm">575.0</SDD>
-      </SASdetector>
-      <SASdetector>
-        <name>main-detector-bank</name>
-        <SDD unit="mm">4145.02</SDD>
-      </SASdetector>
-    </SASinstrument>
-    <SASprocess>
-      <name>Mantid generated CanSAS1D XML</name>
-      <date>02-Aug-2013 16:53:56</date>
-      <description></description>
-      <term unit="" name="svn">2.5.3</term>
-      <term unit="" name="user_file">K:/masks/MASKLOQ_MAN_132E_Lu_Banjo_12mm.txt</term>
-      <SASprocessnote></SASprocessnote>
-    </SASprocess>
-    <SASnote></SASnote>
-  </SASentry>
-</SASroot>
Index: test/sasdataloader/test/sequence_tests.py
===================================================================
--- test/sasdataloader/test/sequence_tests.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ test/sasdataloader/test/sequence_tests.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -1,2 +1,4 @@
+from __future__ import print_function
+
 from DataLoader.loader import Loader
 from DataLoader.readers.IgorReader import Reader as igor_reader
@@ -8,5 +10,5 @@
     out2 = Loader().load("MAR07232_rest.ASC")
     if len(out2.detector)>1:
-        print "Consecutive reads using Loader failed"
+        print("Consecutive reads using Loader failed")
 
 def consecutive_reader():
@@ -14,7 +16,7 @@
     out2 = igor_reader().read("MAR07232_rest.ASC")
     if len(out2.detector)>1:
-        print "Consecutive reads using Readers failed"
-        print out1
-        print out2
+        print("Consecutive reads using Readers failed")
+        print(out1)
+        print(out2)
 
 def single_abs():
@@ -29,3 +31,3 @@
     single_igor()
     single_abs()
-    print "Test passed"
+    print("Test passed")
Index: test/sasdataloader/test/sesans_examples/next_gen.ses
===================================================================
--- test/sasdataloader/test/sesans_examples/next_gen.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
+++ test/sasdataloader/test/sesans_examples/next_gen.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
@@ -0,0 +1,73 @@
+FileFormatVersion       2.0
+DataFileTitle           PMMA in Mixed Deuterated decalin
+Sample                  Ostensibly 40$ 100nm radius PMMA hard spheres in mixed deuterarted decalin.
+Thickness               2
+Thickness_unit          mm
+Theta_zmax              0.09
+Theta_zmax_unit         radians
+Theta_ymax              0.09
+Theta_ymax_unit         radians
+Orientation             Z
+SpinEchoLength_unit     A
+Depolarisation_unit     A-2 cm-1
+Wavelength_unit         A
+
+BEGIN_DATA
+SpinEchoLength Depolarisation Depolarisation_error Wavelength
+260.0 -1.42E-3 2.04E-3 1.612452
+280.8 -1.45E-3 1.87E-3 1.675709
+303.264 -1.64E-3 1.23E-3 1.741448
+327.525 -1.69E-3 1.17E-3 1.809765
+353.727 -2.23E-3 9.09E-4 1.880763
+382.025 -2.26E-3 8.58E-4 1.954546
+412.587 -2.41E-3 7.29E-4 2.031224
+445.594 -2.58E-3 6.75E-4 2.11091
+481.242 -2.88E-3 6.04E-4 2.193723
+519.741 -3.35E-3 5.56E-4 2.279783
+561.32 -3.60E-3 5.22E-4 2.369219
+606.226 -3.92E-3 4.91E-4 2.462166
+654.724 -4.36E-3 4.73E-4 2.558758
+707.102 -4.67E-3 4.54E-4 2.659139
+763.67 -4.91E-3 4.22E-4 2.763458
+824.764 -5.32E-3 3.88E-4 2.87187
+890.745 -5.43E-3 3.53E-4 2.984535
+962.005 -5.61E-3 3.28E-4 3.101621
+1038.97 -5.83E-3 3.07E-4 3.223306
+1122.08 -5.88E-3 2.91E-4 3.349746
+1211.85 -5.91E-3 2.73E-4 3.481164
+1308.8 -5.71E-3 2.61E-4 3.617734
+1413.5 -5.40E-3 2.49E-4 3.759654
+1526.58 -5.10E-3 2.41E-4 3.907147
+1648.71 -4.77E-3 2.34E-4 4.060431
+1780.6 -4.34E-3 2.26E-4 4.219716
+1923.05 -4.18E-3 2.20E-4 4.385259
+2076.9 -4.08E-3 2.16E-4 4.557302
+2243.05 -4.37E-3 2.13E-4 4.736085
+2422.49 -4.66E-3 2.10E-4 4.92188
+2616.29 -4.96E-3 2.06E-4 5.114968
+2825.59 -5.04E-3 2.03E-4 5.315628
+3051.64 -4.96E-3 1.99E-4 5.524165
+3295.77 -4.72E-3 1.97E-4 5.74088
+3559.43 -4.52E-3 1.92E-4 5.966096
+3844.19 -4.65E-3 1.93E-4 6.200153
+4151.72 -4.74E-3 1.96E-4 6.443384
+4483.86 -4.87E-3 1.99E-4 6.696163
+4842.57 -4.81E-3 2.05E-4 6.958858
+5229.98 -4.57E-3 2.09E-4 7.23186
+5648.38 -4.72E-3 2.17E-4 7.515571
+6100.25 -4.79E-3 2.23E-4 7.81041
+6588.27 -4.68E-3 2.28E-4 8.116816
+7115.33 -4.61E-3 2.32E-4 8.435242
+7684.55 -4.78E-3 2.46E-4 8.766157
+8299.32 -4.74E-3 2.46E-4 9.11006
+8963.26 -4.56E-3 2.50E-4 9.467449
+9680.32 -4.70E-3 2.58E-4 9.838862
+10454.7 -4.81E-3 2.64E-4 10.224823
+11291.1 -4.65E-3 2.69E-4 10.625959
+12194.4 -4.43E-3 2.79E-4 11.042826
+13170.0 -4.55E-3 3.01E-4 11.476062
+14223.6 -4.35E-3 3.20E-4 11.926274
+15361.5 -4.24E-3 3.51E-4 12.394152
+16590.4 -4.68E-3 4.12E-4 12.880373
+17917.6 -4.96E-3 4.98E-4 13.385664
+19303.4 -4.56E-3 5.98E-4 13.893668
Index: test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses
===================================================================
--- test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses	(revision 4b5f2657b41cc1e27f305d7bfdbd0adea9eb8ef3)
+++ test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses	(revision 4b5f2657b41cc1e27f305d7bfdbd0adea9eb8ef3)
@@ -0,0 +1,72 @@
+FileFormatVersion       1.0
+DataFileTitle           PMMA in Mixed Deuterated decalin
+Sample                  Ostensibly 40$ 100nm radius PMMA hard spheres in mixed deuterarted decalin.
+Thickness               2
+Thickness_unit          mm
+Theta_zmax              0.09
+Theta_zmax_unit         radians
+Theta_ymax              0.09
+Theta_ymax_unit         radians
+Orientation             Z
+Depolarisation_unit     A-2 cm-1
+Wavelength_unit         A
+
+BEGIN_DATA
+SpinEchoLength Depolarisation Depolarisation_error Wavelength
+260.0 -1.42E-3 2.04E-3 1.612452
+280.8 -1.45E-3 1.87E-3 1.675709
+303.264 -1.64E-3 1.23E-3 1.741448
+327.525 -1.69E-3 1.17E-3 1.809765
+353.727 -2.23E-3 9.09E-4 1.880763
+382.025 -2.26E-3 8.58E-4 1.954546
+412.587 -2.41E-3 7.29E-4 2.031224
+445.594 -2.58E-3 6.75E-4 2.11091
+481.242 -2.88E-3 6.04E-4 2.193723
+519.741 -3.35E-3 5.56E-4 2.279783
+561.32 -3.60E-3 5.22E-4 2.369219
+606.226 -3.92E-3 4.91E-4 2.462166
+654.724 -4.36E-3 4.73E-4 2.558758
+707.102 -4.67E-3 4.54E-4 2.659139
+763.67 -4.91E-3 4.22E-4 2.763458
+824.764 -5.32E-3 3.88E-4 2.87187
+890.745 -5.43E-3 3.53E-4 2.984535
+962.005 -5.61E-3 3.28E-4 3.101621
+1038.97 -5.83E-3 3.07E-4 3.223306
+1122.08 -5.88E-3 2.91E-4 3.349746
+1211.85 -5.91E-3 2.73E-4 3.481164
+1308.8 -5.71E-3 2.61E-4 3.617734
+1413.5 -5.40E-3 2.49E-4 3.759654
+1526.58 -5.10E-3 2.41E-4 3.907147
+1648.71 -4.77E-3 2.34E-4 4.060431
+1780.6 -4.34E-3 2.26E-4 4.219716
+1923.05 -4.18E-3 2.20E-4 4.385259
+2076.9 -4.08E-3 2.16E-4 4.557302
+2243.05 -4.37E-3 2.13E-4 4.736085
+2422.49 -4.66E-3 2.10E-4 4.92188
+2616.29 -4.96E-3 2.06E-4 5.114968
+2825.59 -5.04E-3 2.03E-4 5.315628
+3051.64 -4.96E-3 1.99E-4 5.524165
+3295.77 -4.72E-3 1.97E-4 5.74088
+3559.43 -4.52E-3 1.92E-4 5.966096
+3844.19 -4.65E-3 1.93E-4 6.200153
+4151.72 -4.74E-3 1.96E-4 6.443384
+4483.86 -4.87E-3 1.99E-4 6.696163
+4842.57 -4.81E-3 2.05E-4 6.958858
+5229.98 -4.57E-3 2.09E-4 7.23186
+5648.38 -4.72E-3 2.17E-4 7.515571
+6100.25 -4.79E-3 2.23E-4 7.81041
+6588.27 -4.68E-3 2.28E-4 8.116816
+7115.33 -4.61E-3 2.32E-4 8.435242
+7684.55 -4.78E-3 2.46E-4 8.766157
+8299.32 -4.74E-3 2.46E-4 9.11006
+8963.26 -4.56E-3 2.50E-4 9.467449
+9680.32 -4.70E-3 2.58E-4 9.838862
+10454.7 -4.81E-3 2.64E-4 10.224823
+11291.1 -4.65E-3 2.69E-4 10.625959
+12194.4 -4.43E-3 2.79E-4 11.042826
+13170.0 -4.55E-3 3.01E-4 11.476062
+14223.6 -4.35E-3 3.20E-4 11.926274
+15361.5 -4.24E-3 3.51E-4 12.394152
+16590.4 -4.68E-3 4.12E-4 12.880373
+17917.6 -4.96E-3 4.98E-4 13.385664
+19303.4 -4.56E-3 5.98E-4 13.893668
Index: test/sasdataloader/test/sesans_examples/no_wavelength.ses
===================================================================
--- test/sasdataloader/test/sesans_examples/no_wavelength.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
+++ test/sasdataloader/test/sesans_examples/no_wavelength.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
@@ -0,0 +1,73 @@
+FileFormatVersion       1.0
+DataFileTitle           PMMA in Mixed Deuterated decalin
+Sample                  Ostensibly 40$ 100nm radius PMMA hard spheres in mixed deuterarted decalin.
+Thickness               2
+Thickness_unit          mm
+Theta_zmax              0.09
+Theta_zmax_unit         radians
+Theta_ymax              0.09
+Theta_ymax_unit         radians
+Orientation             Z
+SpinEchoLength_unit     A
+Depolarisation_unit     A-2 cm-1
+Wavelength_unit         A
+
+BEGIN_DATA
+SpinEchoLength Depolarisation Depolarisation_error 
+260.0 -1.42E-3 2.04E-3 1.612452
+280.8 -1.45E-3 1.87E-3 1.675709
+303.264 -1.64E-3 1.23E-3 1.741448
+327.525 -1.69E-3 1.17E-3 1.809765
+353.727 -2.23E-3 9.09E-4 1.880763
+382.025 -2.26E-3 8.58E-4 1.954546
+412.587 -2.41E-3 7.29E-4 2.031224
+445.594 -2.58E-3 6.75E-4 2.11091
+481.242 -2.88E-3 6.04E-4 2.193723
+519.741 -3.35E-3 5.56E-4 2.279783
+561.32 -3.60E-3 5.22E-4 2.369219
+606.226 -3.92E-3 4.91E-4 2.462166
+654.724 -4.36E-3 4.73E-4 2.558758
+707.102 -4.67E-3 4.54E-4 2.659139
+763.67 -4.91E-3 4.22E-4 2.763458
+824.764 -5.32E-3 3.88E-4 2.87187
+890.745 -5.43E-3 3.53E-4 2.984535
+962.005 -5.61E-3 3.28E-4 3.101621
+1038.97 -5.83E-3 3.07E-4 3.223306
+1122.08 -5.88E-3 2.91E-4 3.349746
+1211.85 -5.91E-3 2.73E-4 3.481164
+1308.8 -5.71E-3 2.61E-4 3.617734
+1413.5 -5.40E-3 2.49E-4 3.759654
+1526.58 -5.10E-3 2.41E-4 3.907147
+1648.71 -4.77E-3 2.34E-4 4.060431
+1780.6 -4.34E-3 2.26E-4 4.219716
+1923.05 -4.18E-3 2.20E-4 4.385259
+2076.9 -4.08E-3 2.16E-4 4.557302
+2243.05 -4.37E-3 2.13E-4 4.736085
+2422.49 -4.66E-3 2.10E-4 4.92188
+2616.29 -4.96E-3 2.06E-4 5.114968
+2825.59 -5.04E-3 2.03E-4 5.315628
+3051.64 -4.96E-3 1.99E-4 5.524165
+3295.77 -4.72E-3 1.97E-4 5.74088
+3559.43 -4.52E-3 1.92E-4 5.966096
+3844.19 -4.65E-3 1.93E-4 6.200153
+4151.72 -4.74E-3 1.96E-4 6.443384
+4483.86 -4.87E-3 1.99E-4 6.696163
+4842.57 -4.81E-3 2.05E-4 6.958858
+5229.98 -4.57E-3 2.09E-4 7.23186
+5648.38 -4.72E-3 2.17E-4 7.515571
+6100.25 -4.79E-3 2.23E-4 7.81041
+6588.27 -4.68E-3 2.28E-4 8.116816
+7115.33 -4.61E-3 2.32E-4 8.435242
+7684.55 -4.78E-3 2.46E-4 8.766157
+8299.32 -4.74E-3 2.46E-4 9.11006
+8963.26 -4.56E-3 2.50E-4 9.467449
+9680.32 -4.70E-3 2.58E-4 9.838862
+10454.7 -4.81E-3 2.64E-4 10.224823
+11291.1 -4.65E-3 2.69E-4 10.625959
+12194.4 -4.43E-3 2.79E-4 11.042826
+13170.0 -4.55E-3 3.01E-4 11.476062
+14223.6 -4.35E-3 3.20E-4 11.926274
+15361.5 -4.24E-3 3.51E-4 12.394152
+16590.4 -4.68E-3 4.12E-4 12.880373
+17917.6 -4.96E-3 4.98E-4 13.385664
+19303.4 -4.56E-3 5.98E-4 13.893668
Index: test/sasdataloader/test/sesans_examples/sesans_no_data.ses
===================================================================
--- test/sasdataloader/test/sesans_examples/sesans_no_data.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
+++ test/sasdataloader/test/sesans_examples/sesans_no_data.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
@@ -0,0 +1,15 @@
+FileFormatVersion       1.0
+DataFileTitle           PMMA in Mixed Deuterated decalin
+Sample                  Ostensibly 40$ 100nm radius PMMA hard spheres in mixed deuterarted decalin.
+Thickness               2
+Thickness_unit          mm
+Theta_zmax              0.09
+Theta_zmax_unit         radians
+Theta_ymax              0.09
+Theta_ymax_unit         radians
+Orientation             Z
+SpinEchoLength_unit     A
+Depolarisation_unit     A-2 cm-1
+Wavelength_unit         A
+
+BEGIN_DATA
Index: test/sasdataloader/test/sesans_examples/sphere2micron.ses
===================================================================
--- test/sasdataloader/test/sesans_examples/sphere2micron.ses	(revision aa45dcd4d087761023bf24929e86bcaca8507d23)
+++ test/sasdataloader/test/sesans_examples/sphere2micron.ses	(revision aa45dcd4d087761023bf24929e86bcaca8507d23)
@@ -0,0 +1,60 @@
+FileFormatVersion       1.0
+DataFileTitle           Polystyrene of Markus Strobl,  Full Sine, ++ only
+Sample                  Polystyrene 2 um in 53% H2O, 47% D2O
+Settings                D1=D2=20x8 mm,Ds = 16x10 mm (WxH), GF1 =scanning, GF2 = 2.5 A. 2 um polystyrene in 53% H2O, 47% D2O; 8.55% contrast
+Operator                CPD
+Date                    do 10 jul 2014 16:37:30
+ScanType                sine one element scan
+Thickness               2.00E-01
+Thickness_unit          cm
+Theta_zmax              0.0168
+Theta_zmax_unit         radians
+Theta_ymax              0.0168
+Theta_ymax_unit         radians
+Orientation             Z
+SpinEchoLength_unit     A
+Depolarisation_unit     A-2 cm-1
+Wavelength_unit         A
+
+BEGIN_DATA
+SpinEchoLength Depolarisation Depolarisation_error SpinEchoLength_error Wavelength Wavelength_error Polarisation  Polarisation_error
+391.56 0.0041929 0.0036894 19.578 2.11 0.1055 1.0037 0.0032974
+1564 -0.0046571 0.0038185 78.2 2.11 0.1055 0.99586 0.003386
+2735.6 -0.017007 0.0038132 136.78 2.11 0.1055 0.98497 0.0033444
+3907.9 -0.033462 0.0035068 195.39 2.11 0.1055 0.97064 0.0030309
+5080.2 -0.047483 0.0038208 254.01 2.11 0.1055 0.9586 0.0032613
+6251.8 -0.070375 0.00376 312.59 2.11 0.1055 0.93926 0.0031446
+7423.2 -0.092217 0.0037927 371.16 2.11 0.1055 0.92117 0.0031108
+8595.5 -0.10238 0.004006 429.77 2.11 0.1055 0.91287 0.0032562
+9767.7 -0.12672 0.0038534 488.39 2.11 0.1055 0.8933 0.0030651
+10940 -0.1374 0.004243 546.98 2.11 0.1055 0.88484 0.003343
+12112 -0.16072 0.0045837 605.58 2.11 0.1055 0.86666 0.0035372
+13284 -0.16623 0.0045613 664.2 2.11 0.1055 0.86242 0.0035027
+14456 -0.18468 0.0044918 722.79 2.11 0.1055 0.84837 0.0033931
+15628 -0.19143 0.0048967 781.38 2.11 0.1055 0.84328 0.0036768
+16800 -0.20029 0.0045421 840.02 2.11 0.1055 0.83666 0.0033837
+17971 -0.19798 0.0046642 898.56 2.11 0.1055 0.83838 0.0034819
+19143 -0.21442 0.0047052 957.17 2.11 0.1055 0.82619 0.0034614
+20316 -0.20885 0.0044931 1015.8 2.11 0.1055 0.8303 0.0033218
+21488 -0.21393 0.0049186 1074.4 2.11 0.1055 0.82655 0.00362
+22660 -0.20685 0.004423 1133 2.11 0.1055 0.83179 0.0032758
+23832 -0.20802 0.0046979 1191.6 2.11 0.1055 0.83092 0.0034758
+25003 -0.19848 0.0045953 1250.2 2.11 0.1055 0.838 0.0034289
+26175 -0.21117 0.0044567 1308.8 2.11 0.1055 0.82859 0.0032881
+27347 -0.21283 0.004137 1367.4 2.11 0.1055 0.82736 0.0030477
+28520 -0.2042 0.0044587 1426 2.11 0.1055 0.83375 0.0033101
+29692 -0.2112 0.0042852 1484.6 2.11 0.1055 0.82857 0.0031615
+30864 -0.20319 0.0043483 1543.2 2.11 0.1055 0.8345 0.003231
+32036 -0.20752 0.0044297 1601.8 2.11 0.1055 0.83129 0.0032788
+33207 -0.20654 0.0043188 1660.4 2.11 0.1055 0.83201 0.0031995
+34380 -0.20126 0.0046375 1719 2.11 0.1055 0.83593 0.0034518
+35551 -0.20924 0.0042871 1777.6 2.11 0.1055 0.83001 0.0031684
+36724 -0.21323 0.0045471 1836.2 2.11 0.1055 0.82707 0.0033487
+37895 -0.21324 0.0045354 1894.7 2.11 0.1055 0.82706 0.00334
+39067 -0.19905 0.0044141 1953.4 2.11 0.1055 0.83758 0.003292
+40239 -0.1991 0.0047441 2012 2.11 0.1055 0.83754 0.003538
+41411 -0.20359 0.0050136 2070.5 2.11 0.1055 0.8342 0.003724
+42583 -0.21032 0.0049474 2129.1 2.11 0.1055 0.82922 0.0036529
+43755 -0.20689 0.0048203 2187.8 2.11 0.1055 0.83176 0.00357
+44927 -0.21075 0.0052337 2246.4 2.11 0.1055 0.8289 0.0038628
+46099 -0.19956 0.0047827 2304.9 2.11 0.1055 0.8372 0.0035653
Index: test/sasdataloader/test/sesans_examples/sphere_isis.ses
===================================================================
--- test/sasdataloader/test/sesans_examples/sphere_isis.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
+++ test/sasdataloader/test/sesans_examples/sphere_isis.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
@@ -0,0 +1,73 @@
+FileFormatVersion       1.0
+DataFileTitle           PMMA in Mixed Deuterated decalin
+Sample                  Ostensibly 40$ 100nm radius PMMA hard spheres in mixed deuterarted decalin.
+Thickness               2
+Thickness_unit          mm
+Theta_zmax              0.09
+Theta_zmax_unit         radians
+Theta_ymax              0.09
+Theta_ymax_unit         radians
+Orientation             Z
+SpinEchoLength_unit     A
+Depolarisation_unit     A-2 cm-1
+Wavelength_unit         A
+
+BEGIN_DATA
+SpinEchoLength Depolarisation Depolarisation_error Wavelength
+260.0 -1.42E-3 2.04E-3 1.612452
+280.8 -1.45E-3 1.87E-3 1.675709
+303.264 -1.64E-3 1.23E-3 1.741448
+327.525 -1.69E-3 1.17E-3 1.809765
+353.727 -2.23E-3 9.09E-4 1.880763
+382.025 -2.26E-3 8.58E-4 1.954546
+412.587 -2.41E-3 7.29E-4 2.031224
+445.594 -2.58E-3 6.75E-4 2.11091
+481.242 -2.88E-3 6.04E-4 2.193723
+519.741 -3.35E-3 5.56E-4 2.279783
+561.32 -3.60E-3 5.22E-4 2.369219
+606.226 -3.92E-3 4.91E-4 2.462166
+654.724 -4.36E-3 4.73E-4 2.558758
+707.102 -4.67E-3 4.54E-4 2.659139
+763.67 -4.91E-3 4.22E-4 2.763458
+824.764 -5.32E-3 3.88E-4 2.87187
+890.745 -5.43E-3 3.53E-4 2.984535
+962.005 -5.61E-3 3.28E-4 3.101621
+1038.97 -5.83E-3 3.07E-4 3.223306
+1122.08 -5.88E-3 2.91E-4 3.349746
+1211.85 -5.91E-3 2.73E-4 3.481164
+1308.8 -5.71E-3 2.61E-4 3.617734
+1413.5 -5.40E-3 2.49E-4 3.759654
+1526.58 -5.10E-3 2.41E-4 3.907147
+1648.71 -4.77E-3 2.34E-4 4.060431
+1780.6 -4.34E-3 2.26E-4 4.219716
+1923.05 -4.18E-3 2.20E-4 4.385259
+2076.9 -4.08E-3 2.16E-4 4.557302
+2243.05 -4.37E-3 2.13E-4 4.736085
+2422.49 -4.66E-3 2.10E-4 4.92188
+2616.29 -4.96E-3 2.06E-4 5.114968
+2825.59 -5.04E-3 2.03E-4 5.315628
+3051.64 -4.96E-3 1.99E-4 5.524165
+3295.77 -4.72E-3 1.97E-4 5.74088
+3559.43 -4.52E-3 1.92E-4 5.966096
+3844.19 -4.65E-3 1.93E-4 6.200153
+4151.72 -4.74E-3 1.96E-4 6.443384
+4483.86 -4.87E-3 1.99E-4 6.696163
+4842.57 -4.81E-3 2.05E-4 6.958858
+5229.98 -4.57E-3 2.09E-4 7.23186
+5648.38 -4.72E-3 2.17E-4 7.515571
+6100.25 -4.79E-3 2.23E-4 7.81041
+6588.27 -4.68E-3 2.28E-4 8.116816
+7115.33 -4.61E-3 2.32E-4 8.435242
+7684.55 -4.78E-3 2.46E-4 8.766157
+8299.32 -4.74E-3 2.46E-4 9.11006
+8963.26 -4.56E-3 2.50E-4 9.467449
+9680.32 -4.70E-3 2.58E-4 9.838862
+10454.7 -4.81E-3 2.64E-4 10.224823
+11291.1 -4.65E-3 2.69E-4 10.625959
+12194.4 -4.43E-3 2.79E-4 11.042826
+13170.0 -4.55E-3 3.01E-4 11.476062
+14223.6 -4.35E-3 3.20E-4 11.926274
+15361.5 -4.24E-3 3.51E-4 12.394152
+16590.4 -4.68E-3 4.12E-4 12.880373
+17917.6 -4.96E-3 4.98E-4 13.385664
+19303.4 -4.56E-3 5.98E-4 13.893668
Index: test/sasdataloader/test/sesans_examples/too_many_headers.ses
===================================================================
--- test/sasdataloader/test/sesans_examples/too_many_headers.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
+++ test/sasdataloader/test/sesans_examples/too_many_headers.ses	(revision 60820488c1a10ae2d10f1a606e4033bbdff2f503)
@@ -0,0 +1,73 @@
+FileFormatVersion       1.0
+DataFileTitle           PMMA in Mixed Deuterated decalin
+Sample                  Ostensibly 40$ 100nm radius PMMA hard spheres in mixed deuterarted decalin.
+Thickness               2
+Thickness_unit          mm
+Theta_zmax              0.09
+Theta_zmax_unit         radians
+Theta_ymax              0.09
+Theta_ymax_unit         radians
+Orientation             Z
+SpinEchoLength_unit     A
+Depolarisation_unit     A-2 cm-1
+Wavelength_unit         A
+
+BEGIN_DATA
+SpinEchoLength Depolarisation Depolarisation_error Wavelength SpinEchoLength_error
+260.0 -1.42E-3 2.04E-3 1.612452
+280.8 -1.45E-3 1.87E-3 1.675709
+303.264 -1.64E-3 1.23E-3 1.741448
+327.525 -1.69E-3 1.17E-3 1.809765
+353.727 -2.23E-3 9.09E-4 1.880763
+382.025 -2.26E-3 8.58E-4 1.954546
+412.587 -2.41E-3 7.29E-4 2.031224
+445.594 -2.58E-3 6.75E-4 2.11091
+481.242 -2.88E-3 6.04E-4 2.193723
+519.741 -3.35E-3 5.56E-4 2.279783
+561.32 -3.60E-3 5.22E-4 2.369219
+606.226 -3.92E-3 4.91E-4 2.462166
+654.724 -4.36E-3 4.73E-4 2.558758
+707.102 -4.67E-3 4.54E-4 2.659139
+763.67 -4.91E-3 4.22E-4 2.763458
+824.764 -5.32E-3 3.88E-4 2.87187
+890.745 -5.43E-3 3.53E-4 2.984535
+962.005 -5.61E-3 3.28E-4 3.101621
+1038.97 -5.83E-3 3.07E-4 3.223306
+1122.08 -5.88E-3 2.91E-4 3.349746
+1211.85 -5.91E-3 2.73E-4 3.481164
+1308.8 -5.71E-3 2.61E-4 3.617734
+1413.5 -5.40E-3 2.49E-4 3.759654
+1526.58 -5.10E-3 2.41E-4 3.907147
+1648.71 -4.77E-3 2.34E-4 4.060431
+1780.6 -4.34E-3 2.26E-4 4.219716
+1923.05 -4.18E-3 2.20E-4 4.385259
+2076.9 -4.08E-3 2.16E-4 4.557302
+2243.05 -4.37E-3 2.13E-4 4.736085
+2422.49 -4.66E-3 2.10E-4 4.92188
+2616.29 -4.96E-3 2.06E-4 5.114968
+2825.59 -5.04E-3 2.03E-4 5.315628
+3051.64 -4.96E-3 1.99E-4 5.524165
+3295.77 -4.72E-3 1.97E-4 5.74088
+3559.43 -4.52E-3 1.92E-4 5.966096
+3844.19 -4.65E-3 1.93E-4 6.200153
+4151.72 -4.74E-3 1.96E-4 6.443384
+4483.86 -4.87E-3 1.99E-4 6.696163
+4842.57 -4.81E-3 2.05E-4 6.958858
+5229.98 -4.57E-3 2.09E-4 7.23186
+5648.38 -4.72E-3 2.17E-4 7.515571
+6100.25 -4.79E-3 2.23E-4 7.81041
+6588.27 -4.68E-3 2.28E-4 8.116816
+7115.33 -4.61E-3 2.32E-4 8.435242
+7684.55 -4.78E-3 2.46E-4 8.766157
+8299.32 -4.74E-3 2.46E-4 9.11006
+8963.26 -4.56E-3 2.50E-4 9.467449
+9680.32 -4.70E-3 2.58E-4 9.838862
+10454.7 -4.81E-3 2.64E-4 10.224823
+11291.1 -4.65E-3 2.69E-4 10.625959
+12194.4 -4.43E-3 2.79E-4 11.042826
+13170.0 -4.55E-3 3.01E-4 11.476062
+14223.6 -4.35E-3 3.20E-4 11.926274
+15361.5 -4.24E-3 3.51E-4 12.394152
+16590.4 -4.68E-3 4.12E-4 12.880373
+17917.6 -4.96E-3 4.98E-4 13.385664
+19303.4 -4.56E-3 5.98E-4 13.893668
Index: test/sasdataloader/test/testplugings.py
===================================================================
--- test/sasdataloader/test/testplugings.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ test/sasdataloader/test/testplugings.py	(revision 17c943656cb7c598b2d5cf9530ed6227d88ae6f9)
@@ -3,4 +3,5 @@
 """
 
+import os
 import unittest
 from sas.sascalc.dataloader.loader import  Loader, Registry
@@ -41,7 +42,10 @@
         # Create module
         import zipfile
-        z = zipfile.PyZipFile("plugins.zip", 'w')
+        f_name = "plugins.zip"
+        z = zipfile.PyZipFile(f_name, 'w')
         z.writepy("../plugins", "")
         z.close()
+        if os.path.isfile(f_name):
+            os.remove(f_name)
         
     def testplugin_checksetup(self):
Index: test/sasdataloader/test/utest_abs_reader.py
===================================================================
--- test/sasdataloader/test/utest_abs_reader.py	(revision 371b9e2fdd394f51668cf12a42d9872e6f8698d8)
+++ test/sasdataloader/test/utest_abs_reader.py	(revision 371b9e2fdd394f51668cf12a42d9872e6f8698d8)
@@ -2,4 +2,5 @@
     Unit tests for data manipulations
 """
+from __future__ import print_function
 
 import unittest
@@ -7,16 +8,23 @@
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.readers.IgorReader import Reader as IgorReader
-from sas.sascalc.dataloader.readers.abs_reader import Reader as ABSReader
-
-
-class ABSReaderTests(unittest.TestCase):
-    
+from sas.sascalc.dataloader.readers.abs_reader import Reader as AbsReader
+from sas.sascalc.dataloader.readers.hfir1d_reader import Reader as HFIRReader
+from sas.sascalc.dataloader.readers.danse_reader import Reader as DANSEReader
+from sas.sascalc.dataloader.readers.cansas_reader import Reader as CANSASReader
+
+from sas.sascalc.dataloader.data_info import Data1D
+
+import os.path
+
+
+class abs_reader(unittest.TestCase):
+
     def setUp(self):
-        self.data_list = ABSReader().read("jan08002.ABS")
-        self.data = self.data_list[0]
-        
+        reader = AbsReader()
+        self.data = reader.read("jan08002.ABS")
+
     def test_abs_checkdata(self):
         """
-            Check the data content to see whether 
+            Check the data content to see whether
             it matches the specific file we loaded.
             Check the units too to see whether the
@@ -26,13 +34,13 @@
         self.assertEqual(self.data.filename, "jan08002.ABS")
         self.assertEqual(self.data.meta_data['loader'], "IGOR 1D")
-        
+
         self.assertEqual(self.data.source.wavelength_unit, 'A')
         self.assertEqual(self.data.source.wavelength, 6.0)
-        
+
         self.assertEqual(self.data.detector[0].distance_unit, 'mm')
         self.assertEqual(self.data.detector[0].distance, 1000.0)
-        
+
         self.assertEqual(self.data.sample.transmission, 0.5667)
-        
+
         self.assertEqual(self.data.detector[0].beam_center_unit, 'mm')
         center_x = 114.58*5.08
@@ -40,5 +48,5 @@
         self.assertEqual(self.data.detector[0].beam_center.x, center_x)
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
-        
+
         self.assertEqual(self.data.y_unit, '1/cm')
         self.assertEqual(self.data.x[0], 0.002618)
@@ -46,27 +54,33 @@
         self.assertEqual(self.data.x[2], 0.01309)
         self.assertEqual(self.data.x[126], 0.5828)
-        
+
         self.assertEqual(self.data.y[0], 0.02198)
         self.assertEqual(self.data.y[1], 0.02201)
         self.assertEqual(self.data.y[2], 0.02695)
         self.assertEqual(self.data.y[126], 0.2958)
-        
+
         self.assertEqual(self.data.dy[0], 0.002704)
         self.assertEqual(self.data.dy[1], 0.001643)
         self.assertEqual(self.data.dy[2], 0.002452)
         self.assertEqual(self.data.dy[126], 1)
-        
+
     def test_checkdata2(self):
         self.assertEqual(self.data.dy[126], 1)
 
-
-class HFIRReaderTests(unittest.TestCase):
+    def test_generic_loader(self):
+        # the generic loader should work as well
+        data = Loader().load("jan08002.ABS")
+        self.assertEqual(data.meta_data['loader'], "IGOR 1D")
+
+
+class hfir_reader(unittest.TestCase):
 
     def setUp(self):
-        self.data = Loader().load("S2-30dq.d1d")
+        reader = HFIRReader()
+        self.data = reader.read("S2-30dq.d1d")
 
     def test_hfir_checkdata(self):
         """
-            Check the data content to see whether 
+            Check the data content to see whether
             it matches the specific file we loaded.
         """
@@ -76,5 +90,5 @@
         self.assertEqual(len(self.data.x), 134)
         self.assertEqual(len(self.data.y), 134)
-        #          Q           I               dI          dQ  
+        #          Q           I               dI          dQ
         # Point 1: 0.003014    0.003010        0.000315    0.008249
         self.assertEqual(self.data.x[1], 0.003014)
@@ -83,13 +97,21 @@
         self.assertEqual(self.data.dx[1], 0.008249)
 
-
-class DanseReaderTests(unittest.TestCase):
-    
+    def test_generic_loader(self):
+        # the generic loader should work as well
+        data = Loader().load("S2-30dq.d1d")
+        self.assertEqual(data.meta_data['loader'], "HFIR 1D")
+
+
+class igor_reader(unittest.TestCase):
+
     def setUp(self):
-        self.data = Loader().load("MP_New.sans")
-
-    def test_checkdata(self):
-        """
-            Check the data content to see whether 
+        # the IgorReader should be able to read this filetype
+        # if it can't, stop here.
+        reader = IgorReader()
+        self.data = reader.read("MAR07232_rest.ASC")
+
+    def test_igor_checkdata(self):
+        """
+            Check the data content to see whether
             it matches the specific file we loaded.
             Check the units too to see whether the
@@ -97,13 +119,60 @@
             tests won't pass
         """
+        self.assertEqual(self.data.filename, "MAR07232_rest.ASC")
+        self.assertEqual(self.data.meta_data['loader'], "IGOR 2D")
+
+        self.assertEqual(self.data.source.wavelength_unit, 'A')
+        self.assertEqual(self.data.source.wavelength, 8.4)
+
+        self.assertEqual(self.data.detector[0].distance_unit, 'mm')
+        self.assertEqual(self.data.detector[0].distance, 13705)
+
+        self.assertEqual(self.data.sample.transmission, 0.84357)
+
+        self.assertEqual(self.data.detector[0].beam_center_unit, 'mm')
+        center_x = (68.76 - 1)*5.0
+        center_y = (62.47 - 1)*5.0
+        self.assertEqual(self.data.detector[0].beam_center.x, center_x)
+        self.assertEqual(self.data.detector[0].beam_center.y, center_y)
+
+        self.assertEqual(self.data.I_unit, '1/cm')
+        # 3 points should be suffcient to check that the data is in column
+        # major order.
+        np.testing.assert_almost_equal(self.data.data[0:3],
+                                       [0.279783, 0.28951, 0.167634])
+        np.testing.assert_almost_equal(self.data.qx_data[0:3],
+                                       [-0.01849072, -0.01821785, -0.01794498])
+        np.testing.assert_almost_equal(self.data.qy_data[0:3],
+                                       [-0.01677435, -0.01677435, -0.01677435])
+
+    def test_generic_loader(self):
+        # the generic loader should direct the file to IgorReader as well
+        data = Loader().load("MAR07232_rest.ASC")
+        self.assertEqual(data.meta_data['loader'], "IGOR 2D")
+
+
+class DanseReaderTests(unittest.TestCase):
+
+    def setUp(self):
+        reader = DANSEReader()
+        self.data = reader.read("MP_New.sans")
+
+    def test_checkdata(self):
+        """
+            Check the data content to see whether
+            it matches the specific file we loaded.
+            Check the units too to see whether the
+            Data1D defaults changed. Otherwise the
+            tests won't pass
+        """
         self.assertEqual(self.data.filename, "MP_New.sans")
         self.assertEqual(self.data.meta_data['loader'], "DANSE")
-        
+
         self.assertEqual(self.data.source.wavelength_unit, 'A')
         self.assertEqual(self.data.source.wavelength, 7.5)
-        
+
         self.assertEqual(self.data.detector[0].distance_unit, 'mm')
         self.assertAlmostEqual(self.data.detector[0].distance, 5414.99, 3)
-        
+
         self.assertEqual(self.data.detector[0].beam_center_unit, 'mm')
         center_x = 68.74*5.0
@@ -111,5 +180,5 @@
         self.assertEqual(self.data.detector[0].beam_center.x, center_x)
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
-        
+
         self.assertEqual(self.data.I_unit, '1/cm')
         self.assertEqual(self.data.data[0], 1.57831)
@@ -121,18 +190,29 @@
         self.assertEqual(self.data.err_data[2], 2.06313)
 
- 
+    def test_generic_loader(self):
+        # the generic loader should work as well
+        data = Loader().load("MP_New.sans")
+        self.assertEqual(data.meta_data['loader'], "DANSE")
+
+
 class cansas_reader(unittest.TestCase):
-    
+
     def setUp(self):
+        reader = CANSASReader()
+        data = reader.read("cansas1d.xml")
+        self.data = data[0]
+
+    def test_generic_loader(self):
+        # the generic loader should work as well
         data = Loader().load("cansas1d.xml")
-        self.data = data[0]
- 
+        self.assertEqual(data[0].meta_data['loader'], "CanSAS XML 1D")
+
     def test_cansas_checkdata(self):
         self.assertEqual(self.data.filename, "cansas1d.xml")
         self._checkdata()
-        
+
     def _checkdata(self):
         """
-            Check the data content to see whether 
+            Check the data content to see whether
             it matches the specific file we loaded.
             Check the units too to see whether the
@@ -140,8 +220,7 @@
             tests won't pass
         """
-        
         self.assertEqual(self.data.run[0], "1234")
         self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
-        
+
         # Data
         self.assertEqual(len(self.data.x), 2)
@@ -158,5 +237,5 @@
         self.assertEqual(self.data.run_name['1234'], 'run name')
         self.assertEqual(self.data.title, "Test title")
-        
+
         # Sample info
         self.assertEqual(self.data.sample.ID, "SI600-new-long")
@@ -164,7 +243,7 @@
         self.assertEqual(self.data.sample.thickness_unit, 'mm')
         self.assertAlmostEqual(self.data.sample.thickness, 1.03)
-        
+
         self.assertAlmostEqual(self.data.sample.transmission, 0.327)
-        
+
         self.assertEqual(self.data.sample.temperature_unit, 'C')
         self.assertEqual(self.data.sample.temperature, 0)
@@ -178,23 +257,23 @@
         self.assertAlmostEqual(self.data.sample.orientation.y, 0.02, 6)
 
-        self.assertEqual(self.data.sample.details[0], "http://chemtools.chem.soton.ac.uk/projects/blog/blogs.php/bit_id/2720") 
-        self.assertEqual(self.data.sample.details[1], "Some text here") 
-        
+        self.assertEqual(self.data.sample.details[0], "http://chemtools.chem.soton.ac.uk/projects/blog/blogs.php/bit_id/2720")
+        self.assertEqual(self.data.sample.details[1], "Some text here")
+
         # Instrument info
         self.assertEqual(self.data.instrument, "canSAS instrument")
-        
+
         # Source
         self.assertEqual(self.data.source.radiation, "neutron")
-        
+
         self.assertEqual(self.data.source.beam_size_unit, "mm")
         self.assertEqual(self.data.source.beam_size_name, "bm")
         self.assertEqual(self.data.source.beam_size.x, 12)
         self.assertEqual(self.data.source.beam_size.y, 13)
-        
+
         self.assertEqual(self.data.source.beam_shape, "disc")
-        
+
         self.assertEqual(self.data.source.wavelength_unit, "A")
         self.assertEqual(self.data.source.wavelength, 6)
-        
+
         self.assertEqual(self.data.source.wavelength_max_unit, "nm")
         self.assertAlmostEqual(self.data.source.wavelength_max, 1.0)
@@ -203,5 +282,5 @@
         self.assertEqual(self.data.source.wavelength_spread_unit, "percent")
         self.assertEqual(self.data.source.wavelength_spread, 14.3)
-        
+
         # Collimation
         _found1 = False
@@ -209,47 +288,47 @@
         self.assertEqual(self.data.collimation[0].length, 123.)
         self.assertEqual(self.data.collimation[0].name, 'test coll name')
-        
+
         for item in self.data.collimation[0].aperture:
             self.assertEqual(item.size_unit,'mm')
             self.assertEqual(item.distance_unit,'mm')
 
-            if item.size.x==50 \
-                and item.distance==11000.0 \
-                and item.name=='source' \
-                and item.type=='radius':
+            if item.size.x == 50 \
+                and item.distance == 11000.0 \
+                and item.name == 'source' \
+                and item.type == 'radius':
                 _found1 = True
-            elif item.size.x==1.0 \
-                and item.name=='sample' \
-                and item.type=='radius':
+            elif item.size.x == 1.0 \
+                and item.name == 'sample' \
+                and item.type == 'radius':
                 _found2 = True
-                
-        if _found1==False or _found2==False:
-            raise RuntimeError, "Could not find all data %s %s" % (_found1, _found2) 
-            
+
+        if _found1 == False or _found2 == False:
+            raise RuntimeError, "Could not find all data %s %s" % (_found1, _found2)
+
         # Detector
         self.assertEqual(self.data.detector[0].name, "fictional hybrid")
         self.assertEqual(self.data.detector[0].distance_unit, "mm")
         self.assertEqual(self.data.detector[0].distance, 4150)
-        
+
         self.assertEqual(self.data.detector[0].orientation_unit, "degree")
         self.assertAlmostEqual(self.data.detector[0].orientation.x, 1.0, 6)
         self.assertEqual(self.data.detector[0].orientation.y, 0.0)
         self.assertEqual(self.data.detector[0].orientation.z, 0.0)
-        
+
         self.assertEqual(self.data.detector[0].offset_unit, "m")
         self.assertEqual(self.data.detector[0].offset.x, .001)
         self.assertEqual(self.data.detector[0].offset.y, .002)
         self.assertEqual(self.data.detector[0].offset.z, None)
-        
+
         self.assertEqual(self.data.detector[0].beam_center_unit, "mm")
         self.assertEqual(self.data.detector[0].beam_center.x, 322.64)
         self.assertEqual(self.data.detector[0].beam_center.y, 327.68)
         self.assertEqual(self.data.detector[0].beam_center.z, None)
-        
+
         self.assertEqual(self.data.detector[0].pixel_size_unit, "mm")
         self.assertEqual(self.data.detector[0].pixel_size.x, 5)
         self.assertEqual(self.data.detector[0].pixel_size.y, 5)
         self.assertEqual(self.data.detector[0].pixel_size.z, None)
-        
+
         # Process
         _found_term1 = False
@@ -259,25 +338,21 @@
             self.assertTrue(item.date in ['04-Sep-2007 18:35:02',
                                           '03-SEP-2006 11:42:47'])
-            print item.term
+            print(item.term)
             for t in item.term:
-                if t['name']=="ABS:DSTAND" \
-                    and t['unit']=='mm' \
-                    and float(t['value'])==1.0:
+                if (t['name'] == "ABS:DSTAND"
+                    and t['unit'] == 'mm'
+                    and float(t['value']) == 1.0):
                     _found_term2 = True
-                elif t['name']=="radialstep" \
-                    and t['unit']=='mm' \
-                    and float(t['value'])==10.0:
+                elif (t['name'] == "radialstep"
+                      and t['unit'] == 'mm'
+                      and float(t['value']) == 10.0):
                     _found_term1 = True
-                    
-        if _found_term1==False or _found_term2==False:
+
+        if _found_term1 == False or _found_term2 == False:
             raise RuntimeError, "Could not find all process terms %s %s" % (_found_term1, _found_term2)
 
     def test_writer(self):
-        from sas.sascalc.dataloader.readers.cansas_reader import Reader
-        r = Reader()
-        x = np.ones(5)
-        y = np.ones(5)
-        dy = np.ones(5)
-        
+        r = CANSASReader()
+
         filename = "write_test.xml"
         r.write(filename, self.data)
@@ -286,4 +361,6 @@
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
+        if os.path.isfile(filename):
+            os.remove(filename)
 
     def test_units(self):
@@ -293,5 +370,5 @@
         """
         filename = "cansas1d_units.xml"
-        data = Loader().load(filename)
+        data = CANSASReader().read(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -304,5 +381,5 @@
         """
         filename = "cansas1d_badunits.xml"
-        data = Loader().load(filename)
+        data = CANSASReader().read(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -311,7 +388,7 @@
         # This one should
         self.assertAlmostEqual(self.data.sample.transmission, 0.327)
-        
+
         self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
-        print self.data.errors
+        print(self.data.errors)
         self.assertEqual(len(self.data.errors), 1)
 
@@ -321,9 +398,9 @@
         """
         filename = "cansas1d_slit.xml"
-        data = Loader().load(filename)
+        data = CANSASReader().read(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
         self.assertEqual(self.data.run[0], "1234")
-        
+
         # Data
         self.assertEqual(len(self.data.x), 2)
Index: test/sasdataloader/test/utest_averaging.py
===================================================================
--- test/sasdataloader/test/utest_averaging.py	(revision 8ffafd1261e10b3f4556af59ce0dfbe8c7d78c3e)
+++ test/sasdataloader/test/utest_averaging.py	(revision e123eb9d95fae313c2ba30fd80c75cbd20c17c56)
@@ -1,10 +1,16 @@
 
 import math
+import os
 import unittest
+from scipy.stats import binned_statistic_2d
 import numpy as np
+
 import sas.sascalc.dataloader.data_info as data_info
 from sas.sascalc.dataloader.loader import Loader
-from sas.sascalc.dataloader.manipulations import Boxsum, Boxavg, Ring, get_q,\
-    CircularAverage, SectorPhi, SectorQ, reader2D_converter, SlabX, SlabY
+from sas.sascalc.dataloader.manipulations import (Boxavg, Boxsum,
+                                                  CircularAverage, Ring,
+                                                  SectorPhi, SectorQ, SlabX,
+                                                  SlabY, get_q,
+                                                  reader2D_converter)
 
 
@@ -13,4 +19,5 @@
         Test averaging manipulations on a flat distribution
     """
+
     def setUp(self):
         """
@@ -18,37 +25,38 @@
             should return the predefined height of the distribution (1.0).
         """
-        x_0 = np.ones([100,100])
-        dx_0 = np.ones([100,100])
+        x_0 = np.ones([100, 100])
+        dx_0 = np.ones([100, 100])
 
         self.data = data_info.Data2D(data=x_0, err_data=dx_0)
         detector = data_info.Detector()
         detector.distance = 1000.0  # mm
-        detector.pixel_size.x = 1.0 # mm
-        detector.pixel_size.y = 1.0 # mm
+        detector.pixel_size.x = 1.0  # mm
+        detector.pixel_size.y = 1.0  # mm
 
         # center in pixel position = (len(x_0)-1)/2
-        detector.beam_center.x = (len(x_0)-1)/2 # pixel number
-        detector.beam_center.y = (len(x_0)-1)/2 # pixel number
+        detector.beam_center.x = (len(x_0) - 1) / 2  # pixel number
+        detector.beam_center.y = (len(x_0) - 1) / 2  # pixel number
         self.data.detector.append(detector)
-        
+
         source = data_info.Source()
-        source.wavelength = 10.0 # A
+        source.wavelength = 10.0  # A
         self.data.source = source
 
-        # get_q(dx, dy, det_dist, wavelength) where units are mm, mm, mm, and A
+        # get_q(dx, dy, det_dist, wavelength) where units are mm,mm,mm,and A
+        # respectively.
         self.qmin = get_q(1.0, 1.0, detector.distance, source.wavelength)
         self.qmax = get_q(49.5, 49.5, detector.distance, source.wavelength)
 
         self.qstep = len(x_0)
-        x=  np.linspace(start= -1*self.qmax,
-                               stop= self.qmax,
-                               num= self.qstep,
-                               endpoint=True )  
-        y = np.linspace(start= -1*self.qmax,
-                               stop= self.qmax,
-                               num= self.qstep,
-                               endpoint=True )
-        self.data.x_bins=x
-        self.data.y_bins=y
+        x = np.linspace(start=-1 * self.qmax,
+                        stop=self.qmax,
+                        num=self.qstep,
+                        endpoint=True)
+        y = np.linspace(start=-1 * self.qmax,
+                        stop=self.qmax,
+                        num=self.qstep,
+                        endpoint=True)
+        self.data.x_bins = x
+        self.data.y_bins = y
         self.data = reader2D_converter(self.data)
 
@@ -57,6 +65,6 @@
             Test ring averaging
         """
-        r = Ring(r_min=2*self.qmin, r_max=5*self.qmin, 
-                 center_x=self.data.detector[0].beam_center.x, 
+        r = Ring(r_min=2 * self.qmin, r_max=5 * self.qmin,
+                 center_x=self.data.detector[0].beam_center.x,
                  center_y=self.data.detector[0].beam_center.y)
         r.nbins_phi = 20
@@ -70,6 +78,6 @@
             Test sector averaging
         """
-        r = SectorPhi(r_min=self.qmin, r_max=3*self.qmin, 
-                      phi_min=0, phi_max=math.pi*2.0)
+        r = SectorPhi(r_min=self.qmin, r_max=3 * self.qmin,
+                      phi_min=0, phi_max=math.pi * 2.0)
         r.nbins_phi = 20
         o = r(self.data)
@@ -81,5 +89,5 @@
         """
         phi_max = math.pi * 1.5
-        r = SectorPhi(r_min=self.qmin, r_max=3*self.qmin, 
+        r = SectorPhi(r_min=self.qmin, r_max=3 * self.qmin,
                       phi_min=0, phi_max=phi_max)
         self.assertEqual(r.phi_max, phi_max)
@@ -94,5 +102,7 @@
 
     def setUp(self):
-        self.data = Loader().load('MAR07232_rest.ASC')
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'MAR07232_rest.ASC')
+        self.data = Loader().load(filepath)
 
     def test_ring(self):
@@ -100,13 +110,14 @@
             Test ring averaging
         """
-        r = Ring(r_min=.005, r_max=.01, 
-                 center_x=self.data.detector[0].beam_center.x, 
+        r = Ring(r_min=.005, r_max=.01,
+                 center_x=self.data.detector[0].beam_center.x,
                  center_y=self.data.detector[0].beam_center.y,
-                 nbins = 20)
-        # r.nbins_phi = 20
-
-        o = r(self.data)
-        data_list = Loader().load('ring_testdata.txt')
-        answer = data_list[0]
+                 nbins=20)
+        ##r.nbins_phi = 20
+
+        o = r(self.data)
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'ring_testdata.txt')
+        answer = Loader().load(filepath)
 
         for i in range(r.nbins_phi - 1):
@@ -115,31 +126,34 @@
             self.assertAlmostEqual(o.dy[i + 1], answer.dy[i], 4)
 
-    def test_circular_avg(self):
+    def test_circularavg(self):
+        """
+        Test circular averaging
+        The test data was not generated by IGOR.
+        """
+        r = CircularAverage(r_min=.00, r_max=.025,
+                            bin_width=0.0003)
+        r.nbins_phi = 20
+
+        o = r(self.data)
+
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'avg_testdata.txt')
+        answer = Loader().load(filepath)
+        for i in range(r.nbins_phi):
+            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
+            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
+            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
+
+    def test_box(self):
         """
             Test circular averaging
             The test data was not generated by IGOR.
         """
-        r = CircularAverage(r_min=.00, r_max=.025, 
-                 bin_width=0.0003)
-        r.nbins_phi = 20
-        o = r(self.data)
-
-        output = Loader().load('avg_testdata.txt')
-        answer = output[0]
-        for i in range(r.nbins_phi):
-            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
-            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
-            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
-
-    def test_box(self):
-        """
-            Test circular averaging
-            The test data was not generated by IGOR.
-        """
+
         r = Boxsum(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
         s, ds, npoints = r(self.data)
         self.assertAlmostEqual(s, 34.278990899999997, 4)
         self.assertAlmostEqual(ds, 7.8007981835194293, 4)
-        self.assertAlmostEqual(npoints, 324.0000, 4)        
+        self.assertAlmostEqual(npoints, 324.0000, 4)
 
         r = Boxavg(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
@@ -153,10 +167,13 @@
             The test data was not generated by IGOR.
         """
-        r = SlabX(x_min=-.01, x_max=.01, y_min=-0.0002, y_max=0.0002, bin_width=0.0004)
+
+        r = SlabX(x_min=-.01, x_max=.01, y_min=-0.0002,
+                  y_max=0.0002, bin_width=0.0004)
         r.fold = False
         o = r(self.data)
 
-        output = Loader().load('slabx_testdata.txt')
-        answer = output[0]
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'slabx_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -169,10 +186,13 @@
             The test data was not generated by IGOR.
         """
-        r = SlabY(x_min=.005, x_max=.01, y_min=-0.01, y_max=0.01, bin_width=0.0004)
+
+        r = SlabY(x_min=.005, x_max=.01, y_min=-
+                  0.01, y_max=0.01, bin_width=0.0004)
         r.fold = False
         o = r(self.data)
 
-        output = Loader().load('slaby_testdata.txt')
-        answer = output[0]
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'slaby_testdata.txt')
+        answer = Loader().load(filepath)
         for i in range(len(o.x)):
             self.assertAlmostEqual(o.x[i], answer.x[i], 4)
@@ -183,8 +203,9 @@
         """
             Test sector averaging I(phi)
-            When considering the whole azimuthal range (2pi), 
+            When considering the whole azimuthal range (2pi),
             the answer should be the same as ring averaging.
             The test data was not generated by IGOR.
         """
+
         nbins = 19
         phi_min = math.pi / (nbins + 1)
@@ -198,11 +219,12 @@
         o = r(self.data)
 
-        output = Loader().load('ring_testdata.txt')
-        answer = output[0]
-        for i in range(len(o.x)):
-            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
-            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
-            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
-            
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'ring_testdata.txt')
+        answer = Loader().load(filepath)
+        for i in range(len(o.x)):
+            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
+            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
+            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
+
     def test_sectorphi_quarter(self):
         """
@@ -210,15 +232,17 @@
             The test data was not generated by IGOR.
         """
-        r = SectorPhi(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi/2.0)
-        r.nbins_phi = 20
-        o = r(self.data)
-
-        output = Loader().load('sectorphi_testdata.txt')
-        answer = output[0]
-        for i in range(len(o.x)):
-            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
-            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
-            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
-            
+
+        r = SectorPhi(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi / 2.0)
+        r.nbins_phi = 20
+        o = r(self.data)
+
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'sectorphi_testdata.txt')
+        answer = Loader().load(filepath)
+        for i in range(len(o.x)):
+            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
+            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
+            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
+
     def test_sectorq_full(self):
         """
@@ -226,14 +250,47 @@
             The test data was not generated by IGOR.
         """
-        r = SectorQ(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi/2.0)
-        r.nbins_phi = 20
-        o = r(self.data)
-
-        output = Loader().load('sectorq_testdata.txt')
-        answer = output[0]
-        for i in range(len(o.x)):
-            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
-            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
-            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
+
+        r = SectorQ(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi / 2.0)
+        r.nbins_phi = 20
+        o = r(self.data)
+
+        filepath = os.path.join(os.path.dirname(
+            os.path.realpath(__file__)), 'sectorq_testdata.txt')
+        answer = Loader().load(filepath)
+        for i in range(len(o.x)):
+            self.assertAlmostEqual(o.x[i], answer.x[i], 4)
+            self.assertAlmostEqual(o.y[i], answer.y[i], 4)
+            self.assertAlmostEqual(o.dy[i], answer.dy[i], 4)
+
+    def test_sectorq_log(self):
+        """
+            Test sector averaging I(q)
+            The test data was not generated by IGOR.
+        """
+
+        r = SectorQ(r_min=.005, r_max=.01, phi_min=0, phi_max=math.pi / 2.0, base=10)
+        r.nbins_phi = 20
+        o = r(self.data)
+
+        expected_binning = np.logspace(np.log10(0.005), np.log10(0.01), 20, base=10)
+        for i in range(len(o.x)):
+            self.assertAlmostEqual(o.x[i], expected_binning[i], 3)
+
+        # TODO: Test for Y values (o.y)
+        # print len(self.data.x_bins)
+        # print len(self.data.y_bins)
+        # print self.data.q_data.shape
+        # data_to_bin = np.array(self.data.q_data)
+        # data_to_bin = data_to_bin.reshape(len(self.data.x_bins), len(self.data.y_bins))
+        # H, xedges, yedges, binnumber = binned_statistic_2d(self.data.x_bins, self.data.y_bins, data_to_bin,
+        #     bins=[[0, math.pi / 2.0], expected_binning], statistic='mean')
+        # xedges_width = (xedges[1] - xedges[0])
+        # xedges_center = xedges[1:] - xedges_width / 2
+
+        # yedges_width = (yedges[1] - yedges[0])
+        # yedges_center = yedges[1:] - yedges_width / 2
+
+        # print H.flatten().shape
+        # print o.y.shape
 
 
Index: test/sasdataloader/test/utest_cansas.py
===================================================================
--- test/sasdataloader/test/utest_cansas.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
+++ test/sasdataloader/test/utest_cansas.py	(revision 1fc50fb2f9e67f986acaa06fc7cbcba6b1edd00a)
@@ -46,5 +46,6 @@
         self.schema_1_0 = "cansas1d_v1_0.xsd"
         self.schema_1_1 = "cansas1d_v1_1.xsd"
-
+        self.write_1_0_filename = "isis_1_0_write_test.xml"
+        self.write_1_1_filename = "isis_1_1_write_test.xml"
 
     def get_number_of_entries(self, dictionary, name, i):
@@ -56,5 +57,4 @@
         return name
 
-
     def test_invalid_xml(self):
         """
@@ -62,6 +62,5 @@
         """
         invalid = StringIO.StringIO('<a><c></b></a>')
-        reader = XMLreader(invalid)
-
+        XMLreader(invalid)
 
     def test_xml_validate(self):
@@ -82,5 +81,4 @@
         self.assertFalse(xmlschema.validate(invalid))
 
-
     def test_real_xml(self):
         reader = XMLreader(self.xml_valid, self.schema_1_0)
@@ -90,5 +88,4 @@
         else:
             self.assertFalse(valid)
-
 
     def _check_data(self, data):
@@ -105,18 +102,13 @@
         self.assertTrue(data.meta_data["xmlpreprocess"] is not None)
 
-
     def _check_data_1_1(self, data):
         spectrum = data.trans_spectrum[0]
         self.assertTrue(len(spectrum.wavelength) == 138)
 
-
     def test_cansas_xml(self):
-        filename = "isis_1_1_write_test.xml"
         xmlreader = XMLreader(self.isis_1_1, self.schema_1_1)
         valid = xmlreader.validate_xml()
         xmlreader.set_processing_instructions()
         self.assertTrue(valid)
-        fo = open(self.isis_1_1)
-        str = fo.read()
         reader_generic = Loader()
         dataloader = reader_generic.load(self.isis_1_1)
@@ -128,12 +120,12 @@
             self._check_data(cansasreader[i])
             self._check_data_1_1(cansasreader[i])
-            reader_generic.save(filename, dataloader[i], None)
-            fo = open(filename)
-            str = fo.read()
+            reader_generic.save(self.write_1_1_filename, dataloader[i], None)
             reader2 = Loader()
-            return_data = reader2.load(filename)
+            self.assertTrue(os.path.isfile(self.write_1_1_filename))
+            return_data = reader2.load(self.write_1_1_filename)
             written_data = return_data[0]
             self._check_data(written_data)
-
+        if os.path.isfile(self.write_1_1_filename):
+            os.remove(self.write_1_1_filename)
 
     def test_double_trans_spectra(self):
@@ -144,5 +136,4 @@
         for item in data:
             self._check_data(item)
-
 
     def test_entry_name_recurse(self):
@@ -155,7 +146,5 @@
         self.assertTrue(len(d) == 6)
 
-
     def test_load_cansas_file(self):
-        valid = []
         reader1 = XMLreader(self.xml_valid, self.schema_1_0)
         self.assertTrue(reader1.validate_xml())
@@ -173,5 +162,4 @@
         self.assertFalse(reader7.validate_xml())
 
-
     def test_invalid_cansas(self):
         list = self.loader.load(self.cansas1d_notitle)
@@ -184,10 +172,9 @@
         self.assertTrue(data.detector[0].distance == 4150)
 
-
     def test_old_cansas_files(self):
         reader1 = XMLreader(self.cansas1d, self.schema_1_0)
         self.assertTrue(reader1.validate_xml())
         file_loader = Loader()
-        file1 = file_loader.load(self.cansas1d)
+        file_loader.load(self.cansas1d)
         reader2 = XMLreader(self.cansas1d_units, self.schema_1_0)
         self.assertTrue(reader2.validate_xml())
@@ -197,7 +184,5 @@
         self.assertTrue(reader4.validate_xml())
 
-
     def test_save_cansas_v1_0(self):
-        filename = "isis_1_0_write_test.xml"
         xmlreader = XMLreader(self.isis_1_0, self.schema_1_0)
         valid = xmlreader.validate_xml()
@@ -210,13 +195,15 @@
             self._check_data(dataloader[i])
             self._check_data(cansasreader[i])
-            reader_generic.save(filename, dataloader[i], None)
+            reader_generic.save(self.write_1_0_filename, dataloader[i], None)
             reader2 = Reader()
-            return_data = reader2.read(filename)
+            self.assertTrue(os.path.isfile(self.write_1_0_filename))
+            return_data = reader2.read(self.write_1_0_filename)
             written_data = return_data[0]
-            xmlwrite = XMLreader(filename, self.schema_1_0)
+            XMLreader(self.write_1_0_filename, self.schema_1_0)
             valid = xmlreader.validate_xml()
             self.assertTrue(valid)
             self._check_data(written_data)
-
+        if os.path.isfile(self.write_1_0_filename):
+            os.remove(self.write_1_0_filename)
 
     def test_processing_instructions(self):
@@ -224,5 +211,5 @@
         valid = reader.validate_xml()
         if valid:
-            ## find the processing instructions and make into a dictionary
+            # find the processing instructions and make into a dictionary
             dic = self.get_processing_instructions(reader)
             self.assertTrue(dic == {'xml-stylesheet': \
@@ -232,8 +219,7 @@
             xmldoc = minidom.parseString(xml)
 
-            ## take the processing instructions and put them back in
+            # take the processing instructions and put them back in
             xmldoc = self.set_processing_instructions(xmldoc, dic)
-            xml_output = xmldoc.toprettyxml()
-
+            xmldoc.toprettyxml()
 
     def set_processing_instructions(self, minidom_object, dic):
@@ -243,5 +229,4 @@
             minidom_object.insertBefore(pi, xmlroot)
         return minidom_object
-
 
     def get_processing_instructions(self, xml_reader_object):
Index: test/sasdataloader/test/utest_sesans.py
===================================================================
--- test/sasdataloader/test/utest_sesans.py	(revision a67c494cf1732add92a4fd2796ea7d12b3cd618a)
+++ test/sasdataloader/test/utest_sesans.py	(revision a67c494cf1732add92a4fd2796ea7d12b3cd618a)
@@ -0,0 +1,100 @@
+"""
+    Unit tests for the SESANS .ses reader
+"""
+
+import unittest
+from sas.sascalc.dataloader.readers.sesans_reader import Reader
+from sas.sascalc.dataloader.loader import  Loader
+
+class sesans_reader(unittest.TestCase):
+
+    def setUp(self):
+        reader = Reader()
+        self.loader = reader.read
+
+    def test_full_load(self):
+        """
+            Test .SES in the full loader to make sure that the file type is correctly accepted
+        """
+        f = Loader().load("sesans_examples/sphere2micron.ses")
+        # self.assertEqual(f, 5)
+        self.assertEqual(len(f.x), 40)
+        self.assertEqual(f.x[0], 391.56)
+        self.assertEqual(f.x[-1], 46099)
+        self.assertEqual(f.y[-1], -0.19956)
+        self.assertEqual(f.x_unit, "A")
+        self.assertEqual(f.y_unit, "A-2 cm-1")
+        self.assertEqual(f.sample.name, "Polystyrene 2 um in 53% H2O, 47% D2O")
+        self.assertEqual(f.sample.thickness, 0.2)
+        self.assertEqual(f.sample.zacceptance, (0.0168, "radians"))
+        self.assertEqual(f.isSesans, True)
+
+    def test_sesans_tof(self):
+        """
+            Test .SES loading on a TOF dataset
+        """
+        f = self.loader("sesans_examples/sphere_isis.ses")
+        self.assertEqual(len(f.x), 57)
+        self.assertEqual(f.x[-1], 19303.4)
+        self.assertEqual(f.source.wavelength[-1], 13.893668)
+        self.assertEqual(f.source.wavelength[0], 1.612452)
+        self.assertEqual(f.sample.yacceptance, (0.09, "radians"))
+        self.assertEqual(f.sample.zacceptance, (0.09, "radians"))
+        self.assertEqual(f.sample.thickness, 0.2)
+
+    def test_sesans_no_data(self):
+        """
+            Confirm that sesans files with no actual data won't load.
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/sesans_no_data.ses")
+
+    def test_sesans_no_spin_echo_unit(self):
+        """
+            Confirm that sesans files with no units from the spin echo length raise an appropriate error
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/no_spin_echo_unit.ses")
+
+    def test_sesans_no_version(self):
+        """
+            Confirm that sesans files with no file format version raise an appropriate error
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/no_version.ses")
+
+    def test_sesans_future_version(self):
+        """
+            Confirm that sesans files that, according to semantic version, are from a future, backwards-incompatible version of the SES file format throw an exception.
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/next_gen.ses")
+
+    def test_sesans_mandatory_headers(self):
+        """
+            Confirm that sesans files throw an exception if one of the mandator headers is missing.
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/no_wavelength.ses")
+
+    def test_sesans_columns_match_headers(self):
+        """
+            Confirm that sesans files throw an exception if one of the mandator headers is missing.
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/too_many_headers.ses")
+
+if __name__ == "__main__":
+    unittest.main()
Index: test/sasdataloader/test/write_test.xml
===================================================================
--- test/sasdataloader/test/write_test.xml	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<SASroot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="cansas1d/1.0" version="1.0" xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd">
-  <SASentry>
-    <Title>Test title</Title>
-    <Run name="run name">1234</Run>
-    <SASdata>
-      <Idata>
-        <Q unit="Q | 1/A">0.02</Q>
-        <I unit="Intensity | 1/cm">1000.0</I>
-        <Idev unit="Intensity | 1/cm">3.0</Idev>
-        <Qdev unit="Q | 1/A">0.01</Qdev>
-      </Idata>
-      <Idata>
-        <Q unit="Q | 1/A">0.03</Q>
-        <I unit="Intensity | 1/cm">1001.0</I>
-        <Idev unit="Intensity | 1/cm">4.0</Idev>
-        <Qdev unit="Q | 1/A">0.02</Qdev>
-      </Idata>
-    </SASdata>
-    <SASsample name="my sample">
-      <ID>SI600-new-long</ID>
-      <thickness unit="mm">1.03</thickness>
-      <transmission>0.327</transmission>
-      <temperature unit="C">0.0</temperature>
-      <position>
-        <x unit="mm">10.0</x>
-        <y unit="mm">0.0</y>
-      </position>
-      <orientation>
-        <roll unit="degree">22.5</roll>
-        <pitch unit="degree">0.02</pitch>
-      </orientation>
-      <details>http://chemtools.chem.soton.ac.uk/projects/blog/blogs.php/bit_id/2720</details>
-      <details>Some text here</details>
-    </SASsample>
-    <SASinstrument>
-      <name>canSAS instrument</name>
-      <SASsource>
-        <radiation>neutron</radiation>
-        <beam_size name="bm">
-          <x unit="mm">12.0</x>
-          <y unit="mm">13.0</y>
-        </beam_size>
-        <beam_shape>disc</beam_shape>
-        <wavelength unit="A">6.0</wavelength>
-        <wavelength_min unit="nm">0.22</wavelength_min>
-        <wavelength_max unit="nm">1.0</wavelength_max>
-        <wavelength_spread unit="percent">14.3</wavelength_spread>
-      </SASsource>
-      <SAScollimation name="test coll name">
-        <length unit="mm">123.0</length>
-        <aperture name="source" type="radius">
-          <size>
-            <x unit="mm">50.0</x>
-          </size>
-          <distance unit="mm">11000.0</distance>
-        </aperture>
-        <aperture name="sample" type="radius">
-          <size>
-            <x unit="mm">1.0</x>
-          </size>
-        </aperture>
-      </SAScollimation>
-      <SASdetector>
-        <name>fictional hybrid</name>
-        <SDD unit="mm">4150.0</SDD>
-        <offset>
-          <x unit="m">0.001</x>
-          <y unit="m">0.002</y>
-        </offset>
-        <orientation>
-          <roll unit="degree">1.0</roll>
-          <pitch unit="degree">0.0</pitch>
-          <yaw unit="degree">0.0</yaw>
-        </orientation>
-        <beam_center>
-          <x unit="mm">322.64</x>
-          <y unit="mm">327.68</y>
-        </beam_center>
-        <pixel_size>
-          <x unit="mm">5.0</x>
-          <y unit="mm">5.0</y>
-        </pixel_size>
-      </SASdetector>
-    </SASinstrument>
-    <SASprocess>
-      <name>spol</name>
-      <date>04-Sep-2007 18:35:02</date>
-      <description></description>
-      <term unit="mm" name="radialstep">10.000</term>
-      <term unit="degree" name="sector_width">180.0</term>
-      <term unit="degree" name="sector_orient">0.0</term>
-      <term unit="" name="MASK_file">USER:MASK.COM</term>
-      <SASprocessnote>AvA1 0.0000E+00 AsA2 1.0000E+00 XvA3 1.0526E+03 XsA4 5.2200E-02 XfA5 0.0000E+00</SASprocessnote>
-      <SASprocessnote>S... 13597 0 2.26E+02 2A 5mM 0%D2O Sbak 13594 0 1.13E+02 H2O Buffer</SASprocessnote>
-      <SASprocessnote>V... 13552 3 1.00E+00 H2O5m</SASprocessnote>
-    </SASprocess>
-    <SASprocess>
-      <name>NCNR-IGOR</name>
-      <date>03-SEP-2006 11:42:47</date>
-      <description></description>
-      <term unit="" name="average_type">Circular</term>
-      <term unit="" name="SAM_file">SEP06064.SA3_AJJ_L205</term>
-      <term unit="" name="BKD_file">SEP06064.SA3_AJJ_L205</term>
-      <term unit="" name="EMP_file">SEP06064.SA3_AJJ_L205</term>
-      <term unit="" name="DIV_file">SEP06064.SA3_AJJ_L205</term>
-      <term unit="" name="MASK_file">SEP06064.SA3_AJJ_L205</term>
-      <term unit="" name="ABS:TSTAND">1</term>
-      <term unit="mm" name="ABS:DSTAND">1</term>
-      <term unit="" name="ABS:IZERO">230.09</term>
-      <term unit="mm" name="ABS:XSECT">1</term>
-      <SASprocessnote>No Information</SASprocessnote>
-    </SASprocess>
-    <SASnote></SASnote>
-  </SASentry>
-</SASroot>
Index: test/sasguiframe/test/utest_manipulations.py
===================================================================
--- test/sasguiframe/test/utest_manipulations.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ test/sasguiframe/test/utest_manipulations.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -2,21 +2,23 @@
     Unit tests for data manipulations
 """
-#TODO: what happens if you add a Data1D to a Data2D?
-
+# TODO: what happens if you add a Data1D to a Data2D?
+
+import math
+import os.path
 import unittest
-import math
+
 import numpy as np
-from sas.sascalc.dataloader.loader import  Loader
-from sas.sasgui.guiframe.dataFitting import Data1D, Data2D
-from sas.sasgui.guiframe.dataFitting import Data1D as Theory1D
- 
-import os.path
-
-class data_info_tests(unittest.TestCase):
-    
+
+from sas.sascalc.dataloader.loader import Loader
+from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.sasgui.guiframe.dataFitting import Data2D
+
+
+class DataInfoTests(unittest.TestCase):
+
     def setUp(self):
         data = Loader().load("cansas1d.xml")
         self.data = data[0]
-        
+
     def test_clone1D(self):
         """
@@ -24,24 +26,27 @@
         """
         clone = self.data.clone_without_data()
-        
+
         for i in range(len(self.data.detector)):
-            self.assertEqual(self.data.detector[i].distance, clone.detector[i].distance)
-            
-class theory1d_tests(unittest.TestCase):
-    
+            self.assertEqual(
+                self.data.detector[i].distance, clone.detector[i].distance)
+
+
+class Theory1DTests(unittest.TestCase):
+
     def setUp(self):
         data = Loader().load("cansas1d.xml")
         self.data = data[0]
-        
+
     def test_clone_theory1D(self):
         """
             Test basic cloning
         """
-        theory = Theory1D(x=[], y=[], dy=None)
+        theory = Data1D(x=[], y=[], dy=None)
         theory.clone_without_data(clone=self.data)
         theory.copy_from_datainfo(data1d=self.data)
         for i in range(len(self.data.detector)):
-            self.assertEqual(self.data.detector[i].distance, theory.detector[i].distance)
-            
+            self.assertEqual(
+                self.data.detector[i].distance, theory.detector[i].distance)
+
         for i in range(len(self.data.x)):
             self.assertEqual(self.data.x[i], theory.x[i])
@@ -49,22 +54,22 @@
             self.assertEqual(self.data.dy[i], theory.dy[i])
 
-class manip_tests(unittest.TestCase):
-    
+
+class ManipTests(unittest.TestCase):
+
     def setUp(self):
         # Create two data sets to play with
         x_0 = np.ones(5)
         for i in range(5):
-            x_0[i] = x_0[i]*(i+1.0)
-            
-        y_0 = 2.0*np.ones(5)
-        dy_0 = 0.5*np.ones(5)
+            x_0[i] = x_0[i] * (i + 1.0)
+
+        y_0 = 2.0 * np.ones(5)
+        dy_0 = 0.5 * np.ones(5)
         self.data = Data1D(x_0, y_0, dy=dy_0)
-        
+
         x = self.data.x
         y = np.ones(5)
         dy = np.ones(5)
         self.data2 = Data1D(x, y, dy=dy)
-        
-        
+
     def test_load(self):
         """
@@ -73,99 +78,102 @@
         # There should be 5 entries in the file
         self.assertEqual(len(self.data.x), 5)
-        
+
         for i in range(5):
             # The x values should be from 1 to 5
-            self.assertEqual(self.data.x[i], float(i+1))
-        
+            self.assertEqual(self.data.x[i], float(i + 1))
+
             # All y-error values should be 0.5
-            self.assertEqual(self.data.dy[i], 0.5)    
-            
+            self.assertEqual(self.data.dy[i], 0.5)
+
             # All y values should be 2.0
-            self.assertEqual(self.data.y[i], 2.0)    
-        
+            self.assertEqual(self.data.y[i], 2.0)
+
     def test_add(self):
-        result = self.data2+self.data
+        result = self.data2 + self.data
         for i in range(5):
             self.assertEqual(result.y[i], 3.0)
-            self.assertEqual(result.dy[i], math.sqrt(0.5**2+1.0))
-        
+            self.assertEqual(result.dy[i], math.sqrt(0.5**2 + 1.0))
+
     def test_sub(self):
-        result = self.data2-self.data
+        result = self.data2 - self.data
         for i in range(5):
             self.assertEqual(result.y[i], -1.0)
-            self.assertEqual(result.dy[i], math.sqrt(0.5**2+1.0))
-        
+            self.assertEqual(result.dy[i], math.sqrt(0.5**2 + 1.0))
+
     def test_mul(self):
-        result = self.data2*self.data
+        result = self.data2 * self.data
         for i in range(5):
             self.assertEqual(result.y[i], 2.0)
-            self.assertEqual(result.dy[i], math.sqrt((0.5*1.0)**2+(1.0*2.0)**2))
-        
+            self.assertEqual(result.dy[i], math.sqrt(
+                (0.5 * 1.0)**2 + (1.0 * 2.0)**2))
+
     def test_div(self):
-        result = self.data2/self.data
+        result = self.data2 / self.data
         for i in range(5):
             self.assertEqual(result.y[i], 0.5)
-            self.assertEqual(result.dy[i], math.sqrt((1.0/2.0)**2+(0.5*1.0/4.0)**2))
-        
+            self.assertEqual(result.dy[i], math.sqrt(
+                (1.0 / 2.0)**2 + (0.5 * 1.0 / 4.0)**2))
+
     def test_radd(self):
-        result = self.data+3.0
+        result = self.data + 3.0
         for i in range(5):
             self.assertEqual(result.y[i], 5.0)
             self.assertEqual(result.dy[i], 0.5)
-            
-        result = 3.0+self.data
+
+        result = 3.0 + self.data
         for i in range(5):
             self.assertEqual(result.y[i], 5.0)
             self.assertEqual(result.dy[i], 0.5)
-            
+
     def test_rsub(self):
-        result = self.data-3.0
+        result = self.data - 3.0
         for i in range(5):
             self.assertEqual(result.y[i], -1.0)
             self.assertEqual(result.dy[i], 0.5)
-            
-        result = 3.0-self.data
+
+        result = 3.0 - self.data
         for i in range(5):
             self.assertEqual(result.y[i], 1.0)
             self.assertEqual(result.dy[i], 0.5)
-            
+
     def test_rmul(self):
-        result = self.data*3.0
+        result = self.data * 3.0
         for i in range(5):
             self.assertEqual(result.y[i], 6.0)
             self.assertEqual(result.dy[i], 1.5)
-            
-        result = 3.0*self.data
+
+        result = 3.0 * self.data
         for i in range(5):
             self.assertEqual(result.y[i], 6.0)
             self.assertEqual(result.dy[i], 1.5)
-            
+
     def test_rdiv(self):
-        result = self.data/4.0
+        result = self.data / 4.0
         for i in range(5):
             self.assertEqual(result.y[i], 0.5)
             self.assertEqual(result.dy[i], 0.125)
-            
-        result = 6.0/self.data
+
+        result = 6.0 / self.data
         for i in range(5):
             self.assertEqual(result.y[i], 3.0)
-            self.assertEqual(result.dy[i], 6.0*0.5/4.0)
-            
-class manip_2D(unittest.TestCase):
-    
+            self.assertEqual(result.dy[i], 6.0 * 0.5 / 4.0)
+
+
+class Manin2DTests(unittest.TestCase):
+
     def setUp(self):
         # Create two data sets to play with
-        x_0 = 2.0*np.ones(25)
-        dx_0 = 0.5*np.ones(25)
+        x_0 = 2.0 * np.ones(25)
+        dx_0 = 0.5 * np.ones(25)
         qx_0 = np.arange(25)
         qy_0 = np.arange(25)
         mask_0 = np.zeros(25)
-        dqx_0 = np.arange(25)/100
-        dqy_0 = np.arange(25)/100
+        dqx_0 = np.arange(25) / 100
+        dqy_0 = np.arange(25) / 100
         q_0 = np.sqrt(qx_0 * qx_0 + qy_0 * qy_0)
-        self.data = Data2D(image=x_0, err_image=dx_0, qx_data=qx_0, 
-                           qy_data=qy_0, q_data=q_0, mask=mask_0, 
+        self.data = Data2D(image=x_0, err_image=dx_0, qx_data=qx_0,
+                           qy_data=qy_0, q_data=q_0, mask=mask_0,
                            dqx_data=dqx_0, dqy_data=dqy_0)
-        
+
         y = np.ones(25)
         dy = np.ones(25)
@@ -174,8 +182,7 @@
         mask = np.zeros(25)
         q = np.sqrt(qx * qx + qy * qy)
-        self.data2 = Data2D(image=y, err_image=dy, qx_data=qx, qy_data=qy, 
+        self.data2 = Data2D(image=y, err_image=dy, qx_data=qx, qy_data=qy,
                             q_data=q, mask=mask)
-        
-        
+
     def test_load(self):
         """
@@ -184,96 +191,99 @@
         # There should be 5 entries in the file
         self.assertEqual(np.size(self.data.data), 25)
-        
+
         for i in range(25):
             # All y-error values should be 0.5
-            self.assertEqual(self.data.err_data[i], 0.5)    
-            
+            self.assertEqual(self.data.err_data[i], 0.5)
+
             # All y values should be 2.0
-            self.assertEqual(self.data.data[i], 2.0)    
-        
+            self.assertEqual(self.data.data[i], 2.0)
+
     def test_add(self):
-        result = self.data2+self.data
+        result = self.data2 + self.data
         for i in range(25):
             self.assertEqual(result.data[i], 3.0)
-            self.assertEqual(result.err_data[i], math.sqrt(0.5**2+1.0))
-        
+            self.assertEqual(result.err_data[i], math.sqrt(0.5**2 + 1.0))
+
     def test_sub(self):
-        result = self.data2-self.data
-        for i in range(25):
-                self.assertEqual(result.data[i], -1.0)
-                self.assertEqual(result.err_data[i], math.sqrt(0.5**2+1.0))
-        
+        result = self.data2 - self.data
+        for i in range(25):
+            self.assertEqual(result.data[i], -1.0)
+            self.assertEqual(result.err_data[i], math.sqrt(0.5**2 + 1.0))
+
     def test_mul(self):
-        result = self.data2*self.data
+        result = self.data2 * self.data
         for i in range(25):
             self.assertEqual(result.data[i], 2.0)
-            self.assertEqual(result.err_data[i], math.sqrt((0.5*1.0)**2+(1.0*2.0)**2))
-        
+            self.assertEqual(result.err_data[i], math.sqrt(
+                (0.5 * 1.0)**2 + (1.0 * 2.0)**2))
+
     def test_div(self):
-        result = self.data2/self.data
+        result = self.data2 / self.data
         for i in range(25):
             self.assertEqual(result.data[i], 0.5)
-            self.assertEqual(result.err_data[i], math.sqrt((1.0/2.0)**2+(0.5*1.0/4.0)**2))
-        
+            self.assertEqual(result.err_data[i], math.sqrt(
+                (1.0 / 2.0)**2 + (0.5 * 1.0 / 4.0)**2))
+
     def test_radd(self):
-        result = self.data+3.0
+        result = self.data + 3.0
         for i in range(25):
             self.assertEqual(result.data[i], 5.0)
             self.assertEqual(result.err_data[i], 0.5)
-   
-        result = 3.0+self.data
+
+        result = 3.0 + self.data
         for i in range(25):
             self.assertEqual(result.data[i], 5.0)
             self.assertEqual(result.err_data[i], 0.5)
-            
+
     def test_rsub(self):
-        result = self.data-3.0
+        result = self.data - 3.0
         for i in range(25):
             self.assertEqual(result.data[i], -1.0)
             self.assertEqual(result.err_data[i], 0.5)
-    
-        result = 3.0-self.data
+
+        result = 3.0 - self.data
         for i in range(25):
             self.assertEqual(result.data[i], 1.0)
             self.assertEqual(result.err_data[i], 0.5)
-            
+
     def test_rmul(self):
-        result = self.data*3.0
+        result = self.data * 3.0
         for i in range(25):
             self.assertEqual(result.data[i], 6.0)
             self.assertEqual(result.err_data[i], 1.5)
- 
-        result = 3.0*self.data
+
+        result = 3.0 * self.data
         for i in range(25):
             self.assertEqual(result.data[i], 6.0)
             self.assertEqual(result.err_data[i], 1.5)
-            
+
     def test_rdiv(self):
-        result = self.data/4.0
+        result = self.data / 4.0
         for i in range(25):
             self.assertEqual(result.data[i], 0.5)
             self.assertEqual(result.err_data[i], 0.125)
 
-        result = 6.0/self.data
+        result = 6.0 / self.data
         for i in range(25):
             self.assertEqual(result.data[i], 3.0)
-            self.assertEqual(result.err_data[i], 6.0*0.5/4.0)
-    
-class extra_manip_2D(unittest.TestCase):
-    
+            self.assertEqual(result.err_data[i], 6.0 * 0.5 / 4.0)
+
+
+class ExtraManip2DTests(unittest.TestCase):
+
     def setUp(self):
         # Create two data sets to play with
-        x_0 = 2.0*np.ones(25)
-        dx_0 = 0.5*np.ones(25)
+        x_0 = 2.0 * np.ones(25)
+        dx_0 = 0.5 * np.ones(25)
         qx_0 = np.arange(25)
         qy_0 = np.arange(25)
         mask_0 = np.zeros(25)
-        dqx_0 = np.arange(25)/100
-        dqy_0 = np.arange(25)/100
+        dqx_0 = np.arange(25) / 100
+        dqy_0 = np.arange(25) / 100
         q_0 = np.sqrt(qx_0 * qx_0 + qy_0 * qy_0)
-        self.data = Data2D(image=x_0, err_image=dx_0, qx_data=qx_0, 
-                           qy_data=qy_0, q_data=q_0, mask=mask_0, 
+        self.data = Data2D(image=x_0, err_image=dx_0, qx_data=qx_0,
+                           qy_data=qy_0, q_data=q_0, mask=mask_0,
                            dqx_data=dqx_0, dqy_data=dqy_0)
-        
+
         y = np.ones(25)
         dy = np.ones(25)
@@ -282,8 +292,7 @@
         mask = np.zeros(25)
         q = np.sqrt(qx * qx + qy * qy)
-        self.data2 = Data2D(image=y, err_image=dy, qx_data=qx, qy_data=qy, 
+        self.data2 = Data2D(image=y, err_image=dy, qx_data=qx, qy_data=qy,
                             q_data=q, mask=mask)
-        
-        
+
     def test_load(self):
         """
@@ -292,81 +301,83 @@
         # There should be 5 entries in the file
         self.assertEqual(np.size(self.data.data), 25)
-        
+
         for i in range(25):
             # All y-error values should be 0.5
-            self.assertEqual(self.data.err_data[i], 0.5)    
-            
+            self.assertEqual(self.data.err_data[i], 0.5)
+
             # All y values should be 2.0
-            self.assertEqual(self.data.data[i], 2.0)    
-        
+            self.assertEqual(self.data.data[i], 2.0)
+
     def test_add(self):
-        result = self.data2+self.data
+        result = self.data2 + self.data
         for i in range(25):
             self.assertEqual(result.data[i], 3.0)
-            self.assertEqual(result.err_data[i], math.sqrt(0.5**2+1.0))
-        
+            self.assertEqual(result.err_data[i], math.sqrt(0.5**2 + 1.0))
+
     def test_sub(self):
-        result = self.data2-self.data
-        for i in range(25):
-                self.assertEqual(result.data[i], -1.0)
-                self.assertEqual(result.err_data[i], math.sqrt(0.5**2+1.0))
-        
+        result = self.data2 - self.data
+        for i in range(25):
+            self.assertEqual(result.data[i], -1.0)
+            self.assertEqual(result.err_data[i], math.sqrt(0.5**2 + 1.0))
+
     def test_mul(self):
-        result = self.data2*self.data
+        result = self.data2 * self.data
         for i in range(25):
             self.assertEqual(result.data[i], 2.0)
-            self.assertEqual(result.err_data[i], math.sqrt((0.5*1.0)**2+(1.0*2.0)**2))
-        
+            self.assertEqual(result.err_data[i], math.sqrt(
+                (0.5 * 1.0)**2 + (1.0 * 2.0)**2))
+
     def test_div(self):
-        result = self.data2/self.data
+        result = self.data2 / self.data
         for i in range(25):
             self.assertEqual(result.data[i], 0.5)
-            self.assertEqual(result.err_data[i], math.sqrt((1.0/2.0)**2+(0.5*1.0/4.0)**2))
-        
+            self.assertEqual(result.err_data[i], math.sqrt(
+                (1.0 / 2.0)**2 + (0.5 * 1.0 / 4.0)**2))
+
     def test_radd(self):
-        result = self.data+3.0
+        result = self.data + 3.0
         for i in range(25):
             self.assertEqual(result.data[i], 5.0)
             self.assertEqual(result.err_data[i], 0.5)
-   
-        result = 3.0+self.data
+
+        result = 3.0 + self.data
         for i in range(25):
             self.assertEqual(result.data[i], 5.0)
             self.assertEqual(result.err_data[i], 0.5)
-            
+
     def test_rsub(self):
-        result = self.data-3.0
+        result = self.data - 3.0
         for i in range(25):
             self.assertEqual(result.data[i], -1.0)
             self.assertEqual(result.err_data[i], 0.5)
-    
-        result = 3.0-self.data
+
+        result = 3.0 - self.data
         for i in range(25):
             self.assertEqual(result.data[i], 1.0)
             self.assertEqual(result.err_data[i], 0.5)
-            
+
     def test_rmul(self):
-        result = self.data*3.0
+        result = self.data * 3.0
         for i in range(25):
             self.assertEqual(result.data[i], 6.0)
             self.assertEqual(result.err_data[i], 1.5)
- 
-        result = 3.0*self.data
+
+        result = 3.0 * self.data
         for i in range(25):
             self.assertEqual(result.data[i], 6.0)
             self.assertEqual(result.err_data[i], 1.5)
-            
+
     def test_rdiv(self):
-        result = self.data/4.0
+        result = self.data / 4.0
         for i in range(25):
             self.assertEqual(result.data[i], 0.5)
             self.assertEqual(result.err_data[i], 0.125)
 
-        result = 6.0/self.data
+        result = 6.0 / self.data
         for i in range(25):
             self.assertEqual(result.data[i], 3.0)
-            self.assertEqual(result.err_data[i], 6.0*0.5/4.0)
+            self.assertEqual(result.err_data[i], 6.0 * 0.5 / 4.0)
+
 
 if __name__ == '__main__':
     unittest.main()
-   
Index: test/sasrealspace/test/early_test.py
===================================================================
--- test/sasrealspace/test/early_test.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ test/sasrealspace/test/early_test.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -1,2 +1,3 @@
+from __future__ import print_function
 
 import VolumeCanvas
@@ -30,16 +31,16 @@
         t_0 = time.time()
         value_1 = 1.0e8*canvas.getIq(0.1)
-        print "density = 0.1:  output=%g  time=%g" % (value_1, time.time()-t_0)
+        print("density = 0.1:  output=%g  time=%g" % (value_1, time.time()-t_0))
         
         t_0 = time.time()
         canvas.setParam('lores_density', 1)
         value_1 = 1.0e8*canvas.getIq(0.1)
-        print "density = 1000:  output=%g  time=%g" % (value_1, time.time()-t_0)
+        print("density = 1000:  output=%g  time=%g" % (value_1, time.time()-t_0))
         
         t_0 = time.time()
         canvas.setParam('lores_density', 0.01)
         value_1 = 1.0e8*canvas.getIq(0.1)
-        print "density = 0.00001:  output=%g  time=%g" % (value_1, time.time()-t_0)
-        print
+        print("density = 0.00001:  output=%g  time=%g" % (value_1, time.time()-t_0))
+        print()
     
     
@@ -63,5 +64,5 @@
         #ana_1 = form_factor(q, radius)
         
-        print "q=%g  sim=%g  ana=%g   ratio=%g" % (q, sim_1, ana_1, sim_1/ana_1)
+        print("q=%g  sim=%g  ana=%g   ratio=%g" % (q, sim_1, ana_1, sim_1/ana_1))
     
 def test_2():
@@ -73,5 +74,5 @@
     shell_vol = 4.0/3.0*math.pi*outer_radius*outer_radius*outer_radius - core_vol
     shell_sld = -1.0*core_vol/shell_vol
-    print "Shell SLD", shell_sld
+    print("Shell SLD", shell_sld)
 
     
@@ -126,5 +127,5 @@
         ana_1 = sphere.run(q)
         
-        print "q=%g  sim=%g  ana=%g   ratio=%g" % (q, sim_1, ana_1, sim_1/ana_1)
+        print("q=%g  sim=%g  ana=%g   ratio=%g" % (q, sim_1, ana_1, sim_1/ana_1))
         out.write( "%g  %g  %g\n" % (q, sim_1, ana_1))
 
@@ -168,5 +169,5 @@
         #ana_1 = form_factor(q, radius)
         
-        print "q=%g  sim=%g  ana=%g   ratio=%g" % (q, sim_1, ana_1, sim_1/ana_1)
+        print("q=%g  sim=%g  ana=%g   ratio=%g" % (q, sim_1, ana_1, sim_1/ana_1))
 
 def test_5():
@@ -193,5 +194,5 @@
     ana = ana.runXY([0.1, 0.1])
     sim = model.getIq2D(0.1, 0.1)
-    print ana, sim, sim/ana, ana/sim
+    print(ana, sim, sim/ana, ana/sim)
 
 def test_6():
@@ -232,5 +233,5 @@
     
     
-    print model.npts
+    print(model.npts)
     for i in range(40):
         qmax = 0.5
@@ -240,9 +241,9 @@
         anaY = ana.runXY([0, qmax*i/40.0])
         simY = model.getIq2D(0, qmax*i/40.0)
-        print anaX, simX, simX/anaX, '|', anaY, simY, simY/anaY
+        print(anaX, simX, simX/anaX, '|', anaY, simY, simY/anaY)
     
 def test_7():
     from sas.models.CoreShellModel import CoreShellModel
-    print "Testing core-shell"
+    print("Testing core-shell")
     radius = 15
     thickness = 5
@@ -287,5 +288,5 @@
         ana_val = ana.runXY([q, 0.2])
         sim_val, err = canvas.getIq2DError(q, 0.2)
-        print ana_val, sim_val, sim_val/ana_val, err, (sim_val-ana_val)/err
+        print(ana_val, sim_val, sim_val/ana_val, err, (sim_val-ana_val)/err)
     
     
Index: test/sasrealspace/test/sim_validation.py
===================================================================
--- test/sasrealspace/test/sim_validation.py	(revision ac07a3acc20dbf79c564bf642aece71a02c2c862)
+++ test/sasrealspace/test/sim_validation.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -5,11 +5,13 @@
     @license: This software is provided as part of the DANSE project
 """
+from __future__ import print_function
+
 import math, time, pylab
 
 try:
     import VolumeCanvas
-    print "Testing local version"
+    print("Testing local version")
 except:
-    print "Testing installed version"
+    print("Testing installed version")
     import sas.sascalc.realspace.VolumeCanvas as VolumeCanvas
      
@@ -250,6 +252,6 @@
         ana = validator.run_ana(q)
         sim, err = validator.run_sim(q)
-        print "q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
-                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err))
+        print("q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
+                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err)))
         output.write("%g  %g  %g  %g\n" % (q, ana, sim, err))
     output.close()
@@ -278,8 +280,8 @@
         ana = validator.run_ana2D(q*math.cos(phi), q*math.sin(phi))
         sim, err = validator.run_sim2D(q*math.cos(phi), q*math.sin(phi))
-        print "q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
-                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err))
+        print("q=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%-g) %s" % (q, ana, sim, err, 
+                        (sim-ana), sim/ana, str(math.fabs(sim-ana)>err)))
         output.write("%g  %g  %g  %g\n" % (q, ana, sim, err))
-    print "Time elapsed: ", time.time()-t_0
+    print("Time elapsed: ", time.time()-t_0)
     output.close()
        
@@ -306,7 +308,7 @@
     for d in d_list:
         sim, err = validator.run_sim(q, density=d)
-        print "d=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%g) %s" % \
+        print("d=%-g  ana=%-g  sim=%-g  err=%-g  diff=%-g (%g) %s" % \
             (d, ana, sim, err, (sim-ana), (sim-ana)/ana, 
-             str(math.fabs(sim-ana)>err))
+             str(math.fabs(sim-ana)>err)))
         output.write("%g  %g  %g  %g \n" % (d, ana, sim, err))
     output.close()
Index: test/sasrealspace/test/utest_oriented.py
===================================================================
--- test/sasrealspace/test/utest_oriented.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ test/sasrealspace/test/utest_oriented.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -3,4 +3,5 @@
     @copyright: University of Tennessee, for the DANSE project
 """
+from __future__ import print_function
 
 import unittest, math, sys
@@ -16,9 +17,9 @@
 try:
     import VolumeCanvas
-    print "Testing local version"
+    print("Testing local version")
 except:
-    print sys.exc_value
+    print(sys.exc_value)
     #testing the version that is working on
-    print "Testing installed version"
+    print("Testing installed version")
     import sas.sascalc.realspace.VolumeCanvas as VolumeCanvas
  
@@ -241,5 +242,5 @@
             self.assert_( math.fabs(sim_val/ana_val-1.0)<0.05 )
         except:
-            print "Error", ana_val, sim_val, sim_val/ana_val
+            print("Error", ana_val, sim_val, sim_val/ana_val)
             raise sys.exc_type, sys.exc_value
 
@@ -395,5 +396,5 @@
             self.assert_( math.fabs(sim_val/ana_val-1.0)<0.05 )
         except:
-            print "Error", ana_val, sim_val, sim_val/ana_val
+            print("Error", ana_val, sim_val, sim_val/ana_val)
             raise sys.exc_type, sys.exc_value
 
@@ -407,5 +408,5 @@
             self.assert_( math.fabs(sim_val/ana_val-1.0)<0.05 )
         except:
-            print "Error", ana_val, sim_val, sim_val/ana_val
+            print("Error", ana_val, sim_val, sim_val/ana_val)
             raise sys.exc_type, sys.exc_value
 
@@ -419,5 +420,5 @@
             self.assert_( math.fabs(sim_val/ana_val-1.0)<0.05 )
         except:
-            print "Error", ana_val, sim_val, sim_val/ana_val
+            print("Error", ana_val, sim_val, sim_val/ana_val)
             raise sys.exc_type, sys.exc_value
 
@@ -431,5 +432,5 @@
             self.assert_( math.fabs(sim_val/ana_val-1.0)<0.05 )
         except:
-            print "Error", ana_val, sim_val, sim_val/ana_val
+            print("Error", ana_val, sim_val, sim_val/ana_val)
             raise sys.exc_type, sys.exc_value
 
Index: test/sasrealspace/test/utest_realspace.py
===================================================================
--- test/sasrealspace/test/utest_realspace.py	(revision 45dffa69cb5935e2da7c77a2f040debb07ceb1c6)
+++ test/sasrealspace/test/utest_realspace.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -3,4 +3,5 @@
     @author: Mathieu Doucet / UTK
 """
+from __future__ import print_function
 
 import unittest, math, time
@@ -15,10 +16,10 @@
 try:
     import VolumeCanvas
-    print "Testing local version"
+    print("Testing local version")
 except:
     import sys
-    print sys.exc_value
+    print(sys.exc_value)
     #testing the version that is working on
-    print "Testing installed version"
+    print("Testing installed version")
     import sas.sascalc.realspace.VolumeCanvas as VolumeCanvas
      
Index: test/utest_sasview.py
===================================================================
--- test/utest_sasview.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ test/utest_sasview.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
@@ -1,3 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function
+
 import os
 import subprocess
@@ -80,24 +82,24 @@
                     if has_failed:
                         failed += 1
-                        print "Result for %s (%s): FAILED" % (module_name, module_dir)
-                        print std_out
+                        print("Result for %s (%s): FAILED" % (module_name, module_dir))
+                        print(std_out)
                     else:
                         passed += 1
-                        print "Result for %s: SUCCESS" % module_name
+                        print("Result for %s: SUCCESS" % module_name)
 
-    print "\n----------------------------------------------"
+    print("\n----------------------------------------------")
     if n_tests == 0:
-        print "No tests."
+        print("No tests.")
     else:
-        print "Results by test modules:"
-        print "    PASSED: %d" % passed
+        print("Results by test modules:")
+        print("    PASSED: %d" % passed)
         ratio = 100.0*failed/(failed+passed)
-        print "    FAILED: %d    (%.0f%%)" % (failed,ratio)
+        print("    FAILED: %d    (%.0f%%)" % (failed,ratio))
 
-        print "Results by tests:"
-        print "    Tests run:    %d" % n_tests
-        print "    Tests failed: %d" % n_failures
-        print "    Test errors:  %d" % n_errors
-    print "----------------------------------------------"
+        print("Results by tests:")
+        print("    Tests run:    %d" % n_tests)
+        print("    Tests failed: %d" % n_failures)
+        print("    Test errors:  %d" % n_errors)
+    print("----------------------------------------------")
     
     return failed
