Index: sasview/installer_generator.py
===================================================================
--- sasview/installer_generator.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ sasview/installer_generator.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -4,10 +4,7 @@
 exists in the current directory. Edit local_config.py according to your needs.
 """
-from __future__ import print_function
-
 import local_config
 import os 
 import string
-
 
 REG_PROGRAM = """{app}\MYPROG.EXE"" ""%1"""
@@ -367,6 +364,6 @@
     f.write(TEMPLATE)
     f.close()
-    print("Generate Inno setup installer script complete")
-    print("A new file %s.iss should be created.Please refresh your directory" % str(INSTALLER_FILE))
+    print "Generate Inno setup installer script complete"
+    print "A new file %s.iss should be created.Please refresh your directory" % str(INSTALLER_FILE)
     
 if __name__ == "__main__":
Index: sasview/local_config.py
===================================================================
--- sasview/local_config.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ sasview/local_config.py	(revision ea45bfe4e68bda8abf0866aa2c51cfcf4cf63e36)
@@ -2,6 +2,4 @@
     Application settings
 """
-from __future__ import print_function
-
 import time
 import os
@@ -152,5 +150,5 @@
         :TODO - Need method doc string
         """
-        print("%g:  %s" % (time.clock(), message))
+        print "%g:  %s" % (time.clock(), message)
 
         if __EVT_DEBUG_2_FILE__:
Index: sasview/setup_exe.py
===================================================================
--- sasview/setup_exe.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ sasview/setup_exe.py	(revision f36e01fa1b9b521d3f7496b637e33bed18626df2)
@@ -13,5 +13,4 @@
 # be added to the distribution directory for that purpose.
 # See for example the 'images' directory below.
-from __future__ import print_function
 
 import os
@@ -63,6 +62,6 @@
         sys.argv.remove('--extrapath')
 except:
-    print("Error processing extra python path needed to build SasView\n  %s" %
-          sys.exc_value)
+    print("Error processing extra python path needed to build SasView\n  %s" % \
+                sys.exc_value)
 
 
Index: sasview/setup_mac.py
===================================================================
--- sasview/setup_mac.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ sasview/setup_mac.py	(revision cfa88eef20961bfc7dcff1169b6743d6c13b2451)
@@ -11,6 +11,4 @@
    12/05/2011: Needs macholib >= 1.4.3 and py2app >= 0.6.4 to create a 64-bit app
 """
-from __future__ import print_function
-
 from setuptools import setup
 import periodictable.xsf
@@ -30,5 +28,5 @@
 build_path = os.path.join(root, 'build','lib.'+platform)
 sys.path.insert(0, build_path)
-print("BUILDING PATH INSIDE", build_path)
+print "BUILDING PATH INSIDE", build_path
 ICON = local_config.SetupIconFile_mac
 EXTENSIONS_LIST = []
@@ -72,5 +70,5 @@
 # See if the documentation has been built, and if so include it.
 doc_path = os.path.join(build_path, "doc")
-print(doc_path)
+print doc_path
 if os.path.exists(doc_path):
     for dirpath, dirnames, filenames in os.walk(doc_path):
Index: sasview/wxcruft.py
===================================================================
--- sasview/wxcruft.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ sasview/wxcruft.py	(revision 12e5cc86b4462244202093bccc9f4a494ab24208)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 import inspect
 import wx
@@ -31,5 +29,5 @@
     else:
         tag = ""
-    print("NewId %d from %s(%d):%s%s"%(id, path, line, function, tag))
+    print "NewId %d from %s(%d):%s%s"%(id, path, line, function, tag)
     return id
 
Index: src/examples/data_generator/testdata_generator.py
===================================================================
--- src/examples/data_generator/testdata_generator.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/examples/data_generator/testdata_generator.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 """
     Generate two correlated sets of data
@@ -44,5 +42,5 @@
         # Write line data set
         fd = open(filename, 'w')
-        print("Creating ", filename)
+        print "Creating ", filename
         fd.write("#y=A*x+B\n#A=%g\n#B=%g\n" % (self.constant_a, self.constant_b))
         
Index: src/sas/sascalc/calculator/sas_gen.py
===================================================================
--- src/sas/sascalc/calculator/sas_gen.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/calculator/sas_gen.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -3,6 +3,4 @@
 SAS generic computation and sld file readers
 """
-from __future__ import print_function
-
 import sas.sascalc.calculator.core.sld2i as mod
 from sas.sascalc.calculator.BaseComponent import BaseComponent
@@ -560,5 +558,5 @@
                             vol_pix = np.append(vol_pix, vol)
                         except:
-                            print("Error: set the sld of %s to zero"% atom_name)
+                            print "Error: set the sld of %s to zero"% atom_name
                             sld_n = np.append(sld_n, 0.0)
                         sld_mx = np.append(sld_mx, 0)
@@ -611,5 +609,5 @@
         Write
         """
-        print("Not implemented... ")
+        print "Not implemented... "
 
 class SLDReader(object):
@@ -1046,5 +1044,5 @@
     from mpl_toolkits.mplot3d import Axes3D
     current_dir = os.path.abspath(os.path.curdir)
-    print(current_dir)
+    print current_dir
     for i in range(6):
         current_dir, _ = os.path.split(current_dir)
Index: src/sas/sascalc/data_util/calcthread.py
===================================================================
--- src/sas/sascalc/data_util/calcthread.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/data_util/calcthread.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -4,5 +4,4 @@
 #  \brief Abstract class for defining calculation threads.
 #
-from __future__ import print_function
 
 import thread
@@ -296,5 +295,5 @@
     """
     def __init__(self, n=20000):
-        print(thread.get_ident())
+        print thread.get_ident()
         self.starttime = clock()
         self.done = False
@@ -308,20 +307,20 @@
         self.work2.queue(n)
         self.work3.queue(n)
-        print("Expect updates from Main every second and from thread every 2.5 seconds")
-        print("")
+        print "Expect updates from Main every second and from thread every 2.5 seconds"
+        print ""
         self.work.ready(.5)
         while not self.done:
             sleep(1)
-            print("Main thread %d at %.2f" % (thread.get_ident(),
-                                              clock() - self.starttime))
+            print "Main thread %d at %.2f" % (thread.get_ident(),
+                                              clock() - self.starttime)
 
     def update(self, i=0):
-        print("Update i=%d from thread %d at %.2f" % (i, thread.get_ident(),
-                                                      clock() - self.starttime))
+        print "Update i=%d from thread %d at %.2f" % (i, thread.get_ident(),
+                                                      clock() - self.starttime)
         self.work.ready(2.5)
 
     def complete(self, total=0.0):
-        print("Complete total=%g from thread %d at %.2f" % (total,
+        print "Complete total=%g from thread %d at %.2f" % (total,
                                                     thread.get_ident(),
-                                                    clock() - self.starttime))
+                                                    clock() - self.starttime)
         self.done = True
Index: src/sas/sascalc/data_util/formatnum.py
===================================================================
--- src/sas/sascalc/data_util/formatnum.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/data_util/formatnum.py	(revision 9a5097cd1c76689d1f997b85ba43d12a95d8f243)
@@ -37,5 +37,5 @@
 formatter.compact flag.
 """
-from __future__ import division, print_function
+from __future__ import division
 
 import math
Index: src/sas/sascalc/data_util/registry.py
===================================================================
--- src/sas/sascalc/data_util/registry.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/data_util/registry.py	(revision b699768550de9d4b35b087234ec1d2a461922bab)
@@ -6,5 +6,4 @@
 and registers the built-in file extensions.
 """
-from __future__ import print_function
 
 import os.path
Index: src/sas/sascalc/dataloader/data_info.py
===================================================================
--- src/sas/sascalc/dataloader/data_info.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/dataloader/data_info.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -16,5 +16,4 @@
 ######################################################################
 
-from __future__ import print_function
 
 #TODO: Keep track of data manipulation in the 'process' data structure.
Index: src/sas/sascalc/dataloader/readers/IgorReader.py
===================================================================
--- src/sas/sascalc/dataloader/readers/IgorReader.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/dataloader/readers/IgorReader.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -12,6 +12,4 @@
 #copyright 2008, University of Tennessee
 #############################################################################
-from __future__ import print_function
-
 import os
 
Index: src/sas/sascalc/dataloader/readers/associations.py
===================================================================
--- src/sas/sascalc/dataloader/readers/associations.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/dataloader/readers/associations.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -14,6 +14,4 @@
 #copyright 2009, University of Tennessee
 #############################################################################
-from __future__ import print_function
-
 import os
 import sys
@@ -73,5 +71,5 @@
                     logger.error(msg)
     else:
-        print("Could not find reader association settings\n  %s [%s]" % (__file__, os.getcwd()))
+        print "Could not find reader association settings\n  %s [%s]" % (__file__, os.getcwd())
          
          
Index: src/sas/sascalc/dataloader/readers/red2d_reader.py
===================================================================
--- src/sas/sascalc/dataloader/readers/red2d_reader.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/dataloader/readers/red2d_reader.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -9,6 +9,4 @@
 #copyright 2008, University of Tennessee
 ######################################################################
-from __future__ import print_function
-
 import os
 import numpy as np
@@ -84,5 +82,5 @@
         detector = Detector()
         if len(output.detector) > 0:
-            print(str(output.detector[0]))
+            print str(output.detector[0])
         output.detector.append(detector)
                 
Index: src/sas/sascalc/fit/AbstractFitEngine.py
===================================================================
--- src/sas/sascalc/fit/AbstractFitEngine.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/fit/AbstractFitEngine.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -1,3 +1,2 @@
-from __future__ import print_function
 
 import  copy
@@ -628,3 +627,3 @@
         """
         """
-        print(str(self))
+        print str(self)
Index: src/sas/sascalc/fit/Loader.py
===================================================================
--- src/sas/sascalc/fit/Loader.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/fit/Loader.py	(revision ac07a3acc20dbf79c564bf642aece71a02c2c862)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 # class Loader  to load any king of file
 #import wx
@@ -56,5 +54,5 @@
                     self.dx = np.zeros(len(self.x))
                 except:
-                    print("READ ERROR", line)
+                    print "READ ERROR", line
             # Sanity check
             if not len(self.x) == len(self.dx):
@@ -82,7 +80,7 @@
     load = Load()
     load.set_filename("testdata_line.txt")
-    print(load.get_filename()) 
+    print load.get_filename() 
     load.set_values()
-    print(load.get_values())
+    print load.get_values()
     
             
Index: src/sas/sascalc/fit/expression.py
===================================================================
--- src/sas/sascalc/fit/expression.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/fit/expression.py	(revision 9a5097cd1c76689d1f997b85ba43d12a95d8f243)
@@ -43,6 +43,4 @@
 Ideally, this interface will change
 """
-from __future__ import print_function
-
 import math
 import re
Index: src/sas/sascalc/pr/fit/AbstractFitEngine.py
===================================================================
--- src/sas/sascalc/pr/fit/AbstractFitEngine.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/pr/fit/AbstractFitEngine.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -1,3 +1,2 @@
-from __future__ import print_function
 
 import  copy
@@ -631,3 +630,3 @@
         """
         """
-        print(str(self))
+        print str(self)
Index: src/sas/sascalc/pr/fit/Loader.py
===================================================================
--- src/sas/sascalc/pr/fit/Loader.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/pr/fit/Loader.py	(revision ac07a3acc20dbf79c564bf642aece71a02c2c862)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 # class Loader  to load any king of file
 #import wx
@@ -56,5 +54,5 @@
                     self.dx = np.zeros(len(self.x))
                 except:
-                    print("READ ERROR", line)
+                    print "READ ERROR", line
             # Sanity check
             if not len(self.x) == len(self.dx):
@@ -82,7 +80,7 @@
     load = Load()
     load.set_filename("testdata_line.txt")
-    print(load.get_filename()) 
+    print load.get_filename() 
     load.set_values()
-    print(load.get_values())
+    print load.get_values()
     
             
Index: src/sas/sascalc/pr/fit/expression.py
===================================================================
--- src/sas/sascalc/pr/fit/expression.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/pr/fit/expression.py	(revision 9a5097cd1c76689d1f997b85ba43d12a95d8f243)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 # This program is public domain
 """
Index: src/sas/sascalc/pr/num_term.py
===================================================================
--- src/sas/sascalc/pr/num_term.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/pr/num_term.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 import math
 import numpy as np
@@ -199,3 +197,3 @@
     # Testing estimator
     est = NTermEstimator(invert)
-    print(est.num_terms())
+    print est.num_terms()
Index: src/sas/sascalc/simulation/analmodelpy/tests/signon.py
===================================================================
--- src/sas/sascalc/simulation/analmodelpy/tests/signon.py	(revision 9c3d784dfd54f5c129d7220da877e5dd6c18f62b)
+++ src/sas/sascalc/simulation/analmodelpy/tests/signon.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
@@ -17,16 +17,16 @@
     from analmodelpy import analmodelpy as analmodelpymodule
 
-    print("copyright information:")
-    print("   ", analmodelpy.copyright())
-    print("   ", analmodelpymodule.copyright())
+    print "copyright information:"
+    print "   ", analmodelpy.copyright()
+    print "   ", analmodelpymodule.copyright()
 
-    print()
-    print("module information:")
-    print("    file:", analmodelpymodule.__file__)
-    print("    doc:", analmodelpymodule.__doc__)
-    print("    contents:", dir(analmodelpymodule))
+    print
+    print "module information:"
+    print "    file:", analmodelpymodule.__file__
+    print "    doc:", analmodelpymodule.__doc__
+    print "    contents:", dir(analmodelpymodule)
 
-    print()
-    print(analmodelpymodule.hello())
+    print
+    print analmodelpymodule.hello()
 
 # version
Index: src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py
===================================================================
--- src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
@@ -11,6 +11,4 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
-from __future__ import print_function
-
 
 if __name__ == "__main__":
@@ -20,12 +18,12 @@
     from SASsimulation import geoshapespy
 
-    print("copyright information:")
-    print("   ", analmodelpymodule.copyright())
+    print "copyright information:"
+    print "   ", analmodelpymodule.copyright()
 
-    print()
-    print("module information:")
-    print("    file:", analmodelpymodule.__file__)
-    print("    doc:", analmodelpymodule.__doc__)
-    print("    contents:", dir(analmodelpymodule))
+    print
+    print "module information:"
+    print "    file:", analmodelpymodule.__file__
+    print "    doc:", analmodelpymodule.__doc__
+    print "    contents:", dir(analmodelpymodule)
 
     a = geoshapespy.new_sphere(1.0)
Index: src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py
===================================================================
--- src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
@@ -11,6 +11,4 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
-from __future__ import print_function
-
 
 if __name__ == "__main__":
@@ -18,9 +16,9 @@
     from SASsimulation import geoshapespy
 
-    print()
-    print("module information:")
-    print("    file:", geoshapespy.__file__)
-    print("    doc:", geoshapespy.__doc__)
-    print("    contents:", dir(geoshapespy))
+    print
+    print "module information:"
+    print "    file:", geoshapespy.__file__
+    print "    doc:", geoshapespy.__doc__
+    print "    contents:", dir(geoshapespy)
 
     sp = geoshapespy.new_sphere(10)
Index: src/sas/sascalc/simulation/iqPy/tests/signon.py
===================================================================
--- src/sas/sascalc/simulation/iqPy/tests/signon.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/iqPy/tests/signon.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
@@ -11,6 +11,4 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
-from __future__ import print_function
-
 
 if __name__ == "__main__":
@@ -19,15 +17,15 @@
     from iqPy import iqPy as iqPymodule
 
-    print("copyright information:")
-    print("   ", iqPy.copyright())
-    print("   ", iqPymodule.copyright())
+    print "copyright information:"
+    print "   ", iqPy.copyright()
+    print "   ", iqPymodule.copyright()
 
-    print()
-    print("module information:")
-    print("    file:", iqPymodule.__file__)
-    print("    doc:", iqPymodule.__doc__)
-    print("    contents:", dir(iqPymodule))
+    print
+    print "module information:"
+    print "    file:", iqPymodule.__file__
+    print "    doc:", iqPymodule.__doc__
+    print "    contents:", dir(iqPymodule)
 
-    print()
+    print
 
 # version
Index: src/sas/sascalc/simulation/iqPy/tests/testiq.py
===================================================================
--- src/sas/sascalc/simulation/iqPy/tests/testiq.py	(revision 9c3d784dfd54f5c129d7220da877e5dd6c18f62b)
+++ src/sas/sascalc/simulation/iqPy/tests/testiq.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
@@ -17,5 +17,5 @@
 	iqPy.new_iq(10,0.01,0.4)
 
-	print("pass.")
+	print "pass."
 
 # version
Index: src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py
===================================================================
--- src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
@@ -11,6 +11,4 @@
 #  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # 
-from __future__ import print_function
-
 
 if __name__ == "__main__":
@@ -19,16 +17,16 @@
     from pointsmodelpy import pointsmodelpy as pointsmodelpymodule
 
-    print("copyright information:")
-    print("   ", pointsmodelpy.copyright())
-    print("   ", pointsmodelpymodule.copyright())
+    print "copyright information:"
+    print "   ", pointsmodelpy.copyright()
+    print "   ", pointsmodelpymodule.copyright()
 
-    print()
-    print("module information:")
-    print("    file:", pointsmodelpymodule.__file__)
-    print("    doc:", pointsmodelpymodule.__doc__)
-    print("    contents:", dir(pointsmodelpymodule))
+    print
+    print "module information:"
+    print "    file:", pointsmodelpymodule.__file__
+    print "    doc:", pointsmodelpymodule.__doc__
+    print "    contents:", dir(pointsmodelpymodule)
 
-    print()
-    print(pointsmodelpymodule.hello())
+    print
+    print pointsmodelpymodule.hello()
 
 # version
Index: src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py
===================================================================
--- src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -7,5 +7,4 @@
 #  Imports:
 #--------------------------------------------------------------------------------
-from __future__ import print_function
 
 import wx
@@ -47,5 +46,5 @@
 
         data = ImageData(value_grid, index_vals)
-        print(value_grid, index_vals)
+        print value_grid, index_vals
         
         # Create the index axes
Index: src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py
===================================================================
--- src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,8 +1,5 @@
-from __future__ import print_function
-
 from sasModeling.pointsmodelpy import pointsmodelpy
 from sasModeling.iqPy import iqPy
 from sasModeling.geoshapespy import geoshapespy
-
 
 #First testing: a normal case, a lores model holds a sphere
@@ -64,7 +61,7 @@
   iqPy.OutputIQ(iqcomplex,"testcomplex2.iq")
 
-  print("p(r) is saved in testcomplex2.pr")
-  print("I(Q) is saved in testcomplex2.iq")
-  print("pass")
+  print "p(r) is saved in testcomplex2.pr"
+  print "I(Q) is saved in testcomplex2.iq"
+  print "pass"
 
 #testing 3, insert one empty pdbmodel and one loresmodel
@@ -91,7 +88,7 @@
   iqPy.OutputIQ(iqcomplex,"testcomplex3.iq")
 
-  print("p(r) is saved in testcomplex3.pr")
-  print("I(Q) is saved in testcomplex3.iq")
-  print("pass")
+  print "p(r) is saved in testcomplex3.pr"
+  print "I(Q) is saved in testcomplex3.iq"
+  print "pass"
 
 # Test 2D complex model
@@ -109,6 +106,6 @@
     pointsmodelpy.get_complexpoints(complex,vpcomplex);
  
-    print(pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.1,0.1));
-    print(pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.01,0.1));
+    print pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.1,0.1);
+    print pointsmodelpy.get_complex_iq_2D(complex,vpcomplex,0.01,0.1);
 
 
Index: src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py
===================================================================
--- src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,5 +1,2 @@
-from __future__ import print_function
-
-
 if __name__ == "__main__":
 
@@ -13,10 +10,10 @@
 #    print "   ", pointsmodelpymodule.copyright()
 
-    print()
-    print("module information:")
-    print("    file:", pointsmodelpy.__file__)
-    print("    doc:", pointsmodelpy.__doc__)
-    print("    contents:", dir(pointsmodelpy))
-    print("    contents:", dir(geoshapespy))
+    print
+    print "module information:"
+    print "    file:", pointsmodelpy.__file__
+    print "    doc:", pointsmodelpy.__doc__
+    print "    contents:", dir(pointsmodelpy)
+    print "    contents:", dir(geoshapespy)
 
 #    a = geoshapespy.new_singlehelix(10,2,30,2)
@@ -49,7 +46,7 @@
     pointsmodelpy.outputPDB(lm,vp,"modelpy.pseudo.pdb")
 
-    print("calculating distance distribution")
+    print "calculating distance distribution"
     rmax = pointsmodelpy.get_lores_pr(lm,vp)
-    print("finish calculating get_lores_pr, and rmax is:", rmax)
+    print "finish calculating get_lores_pr, and rmax is:", rmax
     pointsmodelpy.outputPR(lm,"testlores.pr")
     pointsmodelpy.get_lores_iq(lm,iq)
@@ -57,7 +54,7 @@
     iqPy.OutputIQ(iq, "testlores.iq")
 
-    print("Testing get I from a single q")
+    print "Testing get I from a single q"
     result = pointsmodelpy.get_lores_i(lm,0.1)
-    print("The I(0.1) is: %s" % str(result)) 
+    print "The I(0.1) is: %s" % str(result) 
 
 # version
Index: src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py
===================================================================
--- src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,5 +1,2 @@
-from __future__ import print_function
-
-
 def test_lores2d(phi):
   from sasModeling.pointsmodelpy import pointsmodelpy 
@@ -48,8 +45,8 @@
   value_grid = zeros((100,100),Float)
   width, height = value_grid.shape
-  print(width,height)
+  print width,height
 
   I = pointsmodelpy.calculateI_Qxy(lm,0.00001,0.000002)
-  print(I)
+  print I
 
   Imax = 0
@@ -89,8 +86,8 @@
   value_grid = zeros((100,100),Float)
   width, height = value_grid.shape
-  print(width,height)
+  print width,height
 
   I = pointsmodelpy.calculateI_Qxy(lm,0.00001,0.000002)
-  print(I)
+  print I
 
   Imax = 0
@@ -112,7 +109,7 @@
 if __name__ == "__main__":
 
-  print("start to test lores 2D")
+  print "start to test lores 2D"
 #  test_lores2d(10)
   value_grid = get2d_2()
-  print(value_grid)
-  print("pass")
+  print value_grid
+  print "pass"
Index: src/sas/sasgui/guiframe/config.py
===================================================================
--- src/sas/sasgui/guiframe/config.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/guiframe/config.py	(revision ea45bfe4e68bda8abf0866aa2c51cfcf4cf63e36)
@@ -2,6 +2,4 @@
     Application settings
 """
-from __future__ import print_function
-
 import time
 import os
@@ -152,5 +150,5 @@
         :TODO - Need method doc string
         """
-        print("%g:  %s" % (time.clock(), message))
+        print "%g:  %s" % (time.clock(), message)
 
         if __EVT_DEBUG_2_FILE__:
Index: src/sas/sasgui/guiframe/data_panel.py
===================================================================
--- src/sas/sasgui/guiframe/data_panel.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/guiframe/data_panel.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -11,6 +11,4 @@
 This module provides Graphic interface for the data_manager module.
 """
-from __future__ import print_function
-
 import wx
 from wx.build import build_options
@@ -516,5 +514,5 @@
                 self.parent.save_data2d(data, default_name)
             else:
-                print("unable to save this type of data")
+                print "unable to save this type of data"
 
     def layout_data_list(self):
@@ -1499,5 +1497,5 @@
     except:
         # raise
-        print("error", sys.exc_value)
+        print "error", sys.exc_value
 
     app.MainLoop()
Index: src/sas/sasgui/guiframe/data_processor.py
===================================================================
--- src/sas/sasgui/guiframe/data_processor.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/guiframe/data_processor.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -18,6 +18,4 @@
 
 """
-from __future__ import print_function
-
 import os
 import sys
@@ -2037,5 +2035,5 @@
         frame.Show(True)
     except:
-        print(sys.exc_value)
+        print sys.exc_value
 
     app.MainLoop()
Index: src/sas/sasgui/guiframe/dummyapp.py
===================================================================
--- src/sas/sasgui/guiframe/dummyapp.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/guiframe/dummyapp.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -3,6 +3,4 @@
 Allows the user to set an external data manager
 """
-from __future__ import print_function
-
 import sas.sasgui.guiframe.gui_manager as gui_manager
 
@@ -34,5 +32,5 @@
         plug_menu.Append(id, '&Do something')
         def _on_do_something(event):
-            print("Do something")
+            print "Do something"
         wx.EVT_MENU(self.parent, id, _on_do_something)
     
Index: src/sas/sasgui/guiframe/gui_style.py
===================================================================
--- src/sas/sasgui/guiframe/gui_style.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/guiframe/gui_style.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -3,6 +3,4 @@
 Provide the style for guiframe
 """
-from __future__ import print_function
-
 import wx
 import os
@@ -81,12 +79,12 @@
 if __name__ == "__main__":
   
-    print(GUIFRAME.DEFAULT_STYLE)
-    print(GUIFRAME.FLOATING_PANEL)
-    print(GUIFRAME.SINGLE_APPLICATION)
+    print GUIFRAME.DEFAULT_STYLE
+    print GUIFRAME.FLOATING_PANEL
+    print GUIFRAME.SINGLE_APPLICATION
     style = GUIFRAME.MULTIPLE_APPLICATIONS
     style &= GUIFRAME.PLOTTING_ON
-    print(style == GUIFRAME.PLOTTING_ON)
+    print style == GUIFRAME.PLOTTING_ON
     style1 = GUIFRAME.MULTIPLE_APPLICATIONS
     style1 &= (~GUIFRAME.MANAGER_ON)
-    print(style1 == GUIFRAME.DEFAULT_STYLE)
-    print(style1)
+    print style1 == GUIFRAME.DEFAULT_STYLE
+    print style1
Index: src/sas/sasgui/guiframe/proxy.py
===================================================================
--- src/sas/sasgui/guiframe/proxy.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/guiframe/proxy.py	(revision 463e7ffce130ae386f93cd18b87a1120743e88b5)
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import print_function
-
 import urllib2
 import sys
@@ -159,5 +157,5 @@
     response = c.connect()
     if response is not None:
-        print(50 * '-')
+        print 50 * '-'
         content = json.loads(response.read().strip())
         pprint(content)
Index: src/sas/sasgui/perspectives/calculator/detector_editor.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/detector_editor.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/calculator/detector_editor.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,3 +1,2 @@
-from __future__ import print_function
 
 import wx
@@ -35,5 +34,5 @@
             self.set_values()
         except:
-            print("error", sys.exc_value)
+            print "error", sys.exc_value
 
     def _define_structure(self):
Index: src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -3,5 +3,4 @@
 This module relies on guiframe manager.
 """
-from __future__ import print_function
 
 import wx
@@ -1999,5 +1998,5 @@
             self.panel.set_volume_ctl_val(str(val))
         except:
-            print("self.panel is not initialized yet")
+            print "self.panel is not initialized yet"
 
     def set_omfpanel_default_shap(self, shape):
Index: src/sas/sasgui/perspectives/calculator/image_viewer.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/image_viewer.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/calculator/image_viewer.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 import os
 import sys
@@ -80,5 +78,5 @@
                 wx.PostEvent(parent, StatusEvent(status=err_msg, info="error"))
             else:
-                print(err_msg)
+                print err_msg
 
     def choose_data_file(self, location=None):
@@ -303,5 +301,5 @@
                                                     info="error"))
             else:
-                print(err_msg)
+                print err_msg
         return flag
 
@@ -334,5 +332,5 @@
                                                     info="error"))
             else:
-                print(err_msg)
+                print err_msg
         return flag
 
@@ -363,5 +361,5 @@
                                                     info="error"))
             else:
-                print(err_msg)
+                print err_msg
 
         self.OnClose(event)
Index: src/sas/sasgui/perspectives/calculator/model_editor.py
===================================================================
--- src/sas/sasgui/perspectives/calculator/model_editor.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/calculator/model_editor.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -23,6 +23,4 @@
 #copyright 2009, University of Tennessee
 ################################################################################
-from __future__ import print_function
-
 import wx
 import sys
@@ -873,5 +871,5 @@
         # Put the cursor at appropriate position
         length = len(label)
-        print(length)
+        print length
         if label[length-1] == ')':
             length -= 1
Index: src/sas/sasgui/perspectives/fitting/basepage.py
===================================================================
--- src/sas/sasgui/perspectives/fitting/basepage.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/fitting/basepage.py	(revision ac0578cbd1e386c1f53e80a19f8b71c89037567a)
@@ -2,6 +2,4 @@
 Base Page for fitting
 """
-from __future__ import print_function
-
 import sys
 import os
@@ -659,8 +657,8 @@
         # It seems MAC needs wxCallAfter
         if event.GetId() == GUIFRAME_ID.COPYEX_ID:
-            print("copy excel")
+            print "copy excel"
             wx.CallAfter(self.get_copy_excel)
         elif event.GetId() == GUIFRAME_ID.COPYLAT_ID:
-            print("copy latex")
+            print "copy latex"
             wx.CallAfter(self.get_copy_latex)
         else:
@@ -3370,6 +3368,6 @@
         except Exception:
             logger.error(traceback.format_exc())
-            print("Error in BasePage._paste_poly_help: %s" % \
-                  sys.exc_info()[1])
+            print "Error in BasePage._paste_poly_help: %s" % \
+                  sys.exc_info()[1]
 
     def _set_disp_cb(self, isarray, item):
@@ -3400,5 +3398,5 @@
             Moveit; This method doesn't belong here
         """
-        print("BasicPage.update_pinhole_smear was called: skipping")
+        print "BasicPage.update_pinhole_smear was called: skipping"
         return
 
@@ -3576,5 +3574,5 @@
         # check model type to show sizer
         if self.model is not None:
-            print("_set_model_sizer_selection: disabled.")
+            print "_set_model_sizer_selection: disabled."
             # self._set_model_sizer_selection(self.model)
 
Index: src/sas/sasgui/perspectives/fitting/fitting.py
===================================================================
--- src/sas/sasgui/perspectives/fitting/fitting.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/fitting/fitting.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -11,6 +11,4 @@
 #copyright 2009, University of Tennessee
 ################################################################################
-from __future__ import print_function
-
 import re
 import sys
@@ -1255,5 +1253,5 @@
         """
         """
-        print("update_fit result", result)
+        print "update_fit result", result
 
     def _batch_fit_complete(self, result, pars, page_id,
@@ -2048,5 +2046,5 @@
             res = (fn - gn) / en
         except ValueError:
-            print("Unmatch lengths %s, %s, %s" % (len(fn), len(gn), len(en)))
+            print "Unmatch lengths %s, %s, %s" % (len(fn), len(gn), len(en))
             return
 
Index: src/sas/sasgui/perspectives/fitting/media/plugin.rst
===================================================================
--- src/sas/sasgui/perspectives/fitting/media/plugin.rst	(revision 72100ee7baecfd5d180a35d3c9f34a0b02fa5726)
+++ src/sas/sasgui/perspectives/fitting/media/plugin.rst	(revision 984f3fc674aba45cfbaea60989743bfcf9507987)
@@ -538,5 +538,5 @@
     sin, cos, tan, asin, acos, atan:
         Trigonometry functions and inverses, operating on radians.
-    sinh, cosh, tanh, asinh, acosh, atanh:
+    sinh, cos, tanh, asinh, acosh, atanh:
         Hyperbolic trigonometry functions.
     atan2(y,x):
Index: src/sas/sasgui/perspectives/fitting/models.py
===================================================================
--- src/sas/sasgui/perspectives/fitting/models.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/fitting/models.py	(revision 463e7ffce130ae386f93cd18b87a1120743e88b5)
@@ -2,6 +2,4 @@
     Utilities to manage models
 """
-from __future__ import print_function
-
 import traceback
 import os
@@ -143,5 +141,5 @@
         type, value, tb = sys.exc_info()
         if type is not None and issubclass(type, py_compile.PyCompileError):
-            print("Problem with", repr(value))
+            print "Problem with", repr(value)
             raise type, value, tb
         return 1
Index: src/sas/sasgui/perspectives/pr/pr.py
===================================================================
--- src/sas/sasgui/perspectives/pr/pr.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/pr/pr.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -15,5 +15,4 @@
 # Make sure the option of saving each curve is available
 # Use the I(q) curve as input and compare the output to P(r)
-from __future__ import print_function
 
 import sys
@@ -231,5 +230,5 @@
         out, cov = pr.pr_fit()
         for i in range(len(out)):
-            print("%g +- %g" % (out[i], math.sqrt(cov[i][i])))
+            print "%g +- %g" % (out[i], math.sqrt(cov[i][i]))
 
         # Show input P(r)
@@ -319,5 +318,5 @@
             except:
                 err[i] = 1.0
-                print("Error getting error", value, x[i])
+                print "Error getting error", value, x[i]
 
         new_plot = Data1D(x, y)
Index: src/sas/sasgui/perspectives/simulation/ShapeParameters.py
===================================================================
--- src/sas/sasgui/perspectives/simulation/ShapeParameters.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/perspectives/simulation/ShapeParameters.py	(revision d85c194ea2f78cb2b9b3de9c969e1b8ebea6b6d2)
@@ -8,6 +8,4 @@
 copyright 2009, University of Tennessee
 """
-from __future__ import print_function
-
 import wx
 import sys
@@ -314,5 +312,5 @@
             self.parent.GetSizer().Layout()
         except:
-            print("TODO: move the Layout call of editShape up to the caller")
+            print "TODO: move the Layout call of editShape up to the caller"
 
     def _readCtrlFloat(self, ctrl):
@@ -394,6 +392,6 @@
                     self.current_shape.params[item[0]] = tmp 
         except:
-            print("Could not create")
-            print(sys.exc_value)
+            print "Could not create"
+            print sys.exc_value
                 
     def _onCreate(self, evt):
@@ -487,5 +485,5 @@
         indices = self.shape_listbox.GetSelections()
         if len(indices)>0:
-            print("NOT YET IMPLMENTED")
-            print("renaming", self.shape_listbox.GetString(indices[0]))
-                
+            print "NOT YET IMPLMENTED"
+            print "renaming", self.shape_listbox.GetString(indices[0])
+                
Index: src/sas/sasgui/plottools/PlotPanel.py
===================================================================
--- src/sas/sasgui/plottools/PlotPanel.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/plottools/PlotPanel.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -2,6 +2,4 @@
     Plot panel.
 """
-from __future__ import print_function
-
 import logging
 import traceback
@@ -40,5 +38,5 @@
 def show_tree(obj, d=0):
     """Handy function for displaying a tree of graph objects"""
-    print("%s%s" % ("-"*d, obj.__class__.__name__))
+    print "%s%s" % ("-"*d, obj.__class__.__name__)
     if 'get_children' in dir(obj):
         for a in obj.get_children(): show_tree(a, d + 1)
@@ -2016,5 +2014,5 @@
             self.toolbar.copy_figure(self.canvas)
         except:
-            print("Error in copy Image")
+            print "Error in copy Image"
 
 
Index: src/sas/sasgui/plottools/binder.py
===================================================================
--- src/sas/sasgui/plottools/binder.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/plottools/binder.py	(revision 463e7ffce130ae386f93cd18b87a1120743e88b5)
@@ -2,6 +2,4 @@
 Extension to MPL to support the binding of artists to key/mouse events.
 """
-from __future__ import print_function
-
 import sys
 import logging
@@ -65,5 +63,5 @@
             ]
         except:
-            print("bypassing scroll_event: wrong matplotlib version")
+            print "bypassing scroll_event: wrong matplotlib version"
             self._connections = [
                 canvas.mpl_connect('motion_notify_event', self._onMotion),
Index: src/sas/sasgui/plottools/convert_units.py
===================================================================
--- src/sas/sasgui/plottools/convert_units.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/plottools/convert_units.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -3,6 +3,4 @@
     This is a cleaned up version of unitConverter.py
 """
-from __future__ import print_function
-
 import re
 import string
@@ -70,11 +68,11 @@
     unit8 = "m/s^{4}"  #         x^2               (m/s^{4})^{2}
 
-    print("this unit1 %s ,its powerer %s , and value %s" % (unit1, 1, convert_unit(1, unit1)))
-    print("this unit2 %s ,its powerer %s , and value %s" % (unit2, 1, convert_unit(1, unit2)))
-    print("this unit3 %s ,its powerer %s , and value %s" % (unit3, 2, convert_unit(2, unit3)))
-    print("this unit4 %s ,its powerer %s , and value %s" % (unit4, -1, convert_unit(-1, unit4)))
-    print("this unit5 %s ,its powerer %s , and value %s" % (unit5, 2, convert_unit(2, unit5)))
-    print("this unit6 %s ,its powerer %s , and value %s" % (unit6, 2, convert_unit(2, unit6)))
-    print("this unit7 %s ,its powerer %s , and value %s" % (unit7, -1, convert_unit(-1, unit7)))
-    print("this unit8 %s ,its powerer %s , and value %s" % (unit8, 2, convert_unit(2, unit8)))
-    print("this unit9 %s ,its powerer %s , and value %s" % (unit9, 2, convert_unit(2, unit9)))
+    print "this unit1 %s ,its powerer %s , and value %s" % (unit1, 1, convert_unit(1, unit1))
+    print "this unit2 %s ,its powerer %s , and value %s" % (unit2, 1, convert_unit(1, unit2))
+    print "this unit3 %s ,its powerer %s , and value %s" % (unit3, 2, convert_unit(2, unit3))
+    print "this unit4 %s ,its powerer %s , and value %s" % (unit4, -1, convert_unit(-1, unit4))
+    print "this unit5 %s ,its powerer %s , and value %s" % (unit5, 2, convert_unit(2, unit5))
+    print "this unit6 %s ,its powerer %s , and value %s" % (unit6, 2, convert_unit(2, unit6))
+    print "this unit7 %s ,its powerer %s , and value %s" % (unit7, -1, convert_unit(-1, unit7))
+    print "this unit8 %s ,its powerer %s , and value %s" % (unit8, 2, convert_unit(2, unit8))
+    print "this unit9 %s ,its powerer %s , and value %s" % (unit9, 2, convert_unit(2, unit9))
Index: src/sas/sasgui/plottools/fittings.py
===================================================================
--- src/sas/sasgui/plottools/fittings.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/plottools/fittings.py	(revision ac07a3acc20dbf79c564bf642aece71a02c2c862)
@@ -14,6 +14,4 @@
 
 """
-from __future__ import print_function
-
 from scipy import optimize
 
@@ -108,4 +106,4 @@
     chisqr, out, cov = sasfit(line, [cstA, cstB], event.x, y, 0)
     # print "Output parameters:", out
-    print("The right answer is [70.0, 1.0]")
-    print(chisqr, out, cov)
+    print "The right answer is [70.0, 1.0]"
+    print chisqr, out, cov
Index: src/sas/sasgui/plottools/plottable_interactor.py
===================================================================
--- src/sas/sasgui/plottools/plottable_interactor.py	(revision a1b8fee73528559155793dd74cda07d0c32e9d72)
+++ src/sas/sasgui/plottools/plottable_interactor.py	(revision 45dffa69cb5935e2da7c77a2f040debb07ceb1c6)
@@ -2,8 +2,5 @@
     This module allows more interaction with the plot
 """
-from __future__ import print_function
-
 from BaseInteractor import _BaseInteractor
-
 
 class PointInteractor(_BaseInteractor):
@@ -159,5 +156,5 @@
 
     def clear(self):
-        print("plottable_interactor.clear()")
+        print "plottable_interactor.clear()"
 
     def _on_click(self, evt):
Index: test/fileconverter/test/utest_nxcansas_writer.py
===================================================================
--- test/fileconverter/test/utest_nxcansas_writer.py	(revision 17c943656cb7c598b2d5cf9530ed6227d88ae6f9)
+++ test/fileconverter/test/utest_nxcansas_writer.py	(revision c476457a8268dc70465327ac7898306c6c214bb4)
@@ -66,4 +66,2 @@
         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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/pr_inversion/test/utest_invertor.py	(revision ac07a3acc20dbf79c564bf642aece71a02c2c862)
@@ -6,14 +6,9 @@
 # Disable "too many methods" complaint 
 # pylint: disable-msg=R0904 
-from __future__ import print_function
-
-
-import os
-import unittest
-import math
-import numpy
+
+
+import unittest, math, numpy
 from sas.sascalc.pr.invertor import Invertor
-
-
+        
 class TestFiguresOfMerit(unittest.TestCase):
             
@@ -240,5 +235,5 @@
             self.assertTrue(chi2/51.0<10.0)
         except:
-            print("chi2 =", chi2/51.0)
+            print "chi2 =", chi2/51.0
             raise
         
@@ -268,5 +263,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
         
@@ -302,5 +297,5 @@
             self.assertTrue(chi2/51.0<50.0)
         except:
-            print("chi2(P(r)) =", chi2/51.0)
+            print "chi2(P(r)) =", chi2/51.0
             raise
         
@@ -346,5 +341,5 @@
             self.assertTrue(self.invertor.chi2>0)
         except:
-            print("Chi2 =", self.invertor.chi2)
+            print "Chi2 =", self.invertor.chi2
             raise
                             
@@ -370,5 +365,5 @@
             self.assertTrue(self.invertor.chi2>0)
         except:
-            print("Chi2 =", self.invertor.chi2)
+            print "Chi2 =", self.invertor.chi2
             raise
         
@@ -421,15 +416,12 @@
         
         # Save
-        f_name = "test_output.txt"
-        self.invertor.to_file(f_name)
+        self.invertor.to_file("test_output.txt")
     
         # Load
-        self.invertor.from_file(f_name)
+        self.invertor.from_file("test_output.txt")
         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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/run_one.py	(revision aaad4c950340dd661ea6ea88902bb2c1a895de57)
@@ -1,4 +1,3 @@
 #!/usr/bin/env python
-from __future__ import print_function
 
 import os
@@ -25,5 +24,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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/sasdataloader/plugins/test_reader.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -8,6 +8,4 @@
 copyright 2008, University of Tennessee
 """
-from __future__ import print_function
-
 import os
 import numpy as np
@@ -61,5 +59,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)
+++ test/sasdataloader/test/isis_1_0_write_test.xml	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
@@ -0,0 +1,865 @@
+<?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)
+++ test/sasdataloader/test/isis_1_1_write_test.xml	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
@@ -0,0 +1,865 @@
+<?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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/sasdataloader/test/sequence_tests.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,4 +1,2 @@
-from __future__ import print_function
-
 from DataLoader.loader import Loader
 from DataLoader.readers.IgorReader import Reader as igor_reader
@@ -10,5 +8,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():
@@ -16,7 +14,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():
@@ -31,3 +29,3 @@
     single_igor()
     single_abs()
-    print("Test passed")
+    print "Test passed"
Index: test/sasdataloader/test/testplugings.py
===================================================================
--- test/sasdataloader/test/testplugings.py	(revision 17c943656cb7c598b2d5cf9530ed6227d88ae6f9)
+++ test/sasdataloader/test/testplugings.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -3,5 +3,4 @@
 """
 
-import os
 import unittest
 from sas.sascalc.dataloader.loader import  Loader, Registry
@@ -42,10 +41,7 @@
         # Create module
         import zipfile
-        f_name = "plugins.zip"
-        z = zipfile.PyZipFile(f_name, 'w')
+        z = zipfile.PyZipFile("plugins.zip", '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 c551bb3b1844a2c446021559f24b790187450d46)
+++ test/sasdataloader/test/utest_abs_reader.py	(revision dd11014add466ed4ba0564fcf61e5880d53e6c8b)
@@ -2,5 +2,4 @@
     Unit tests for data manipulations
 """
-from __future__ import print_function
 
 import unittest
@@ -9,20 +8,14 @@
 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
-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):
-        reader = AbsReader()
-        self.data = reader.read("jan08002.ABS")
-
+        from sas.sascalc.dataloader.readers.abs_reader import Reader
+        self.data = Reader().read("jan08002.ABS")
+        
     def test_abs_checkdata(self):
         """
@@ -68,17 +61,10 @@
     def test_checkdata2(self):
         self.assertEqual(self.data.dy[126], 1)
-
-    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):
-        reader = HFIRReader()
-        self.data = reader.read("S2-30dq.d1d")
-
+        self.data = Loader().load("S2-30dq.d1d")
+        
     def test_hfir_checkdata(self):
         """
@@ -97,10 +83,5 @@
         self.assertEqual(self.data.dy[1], 0.000315)
         self.assertEqual(self.data.dx[1], 0.008249)
-
-    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):
@@ -156,6 +137,5 @@
     
     def setUp(self):
-        reader = DANSEReader()
-        self.data = reader.read("MP_New.sans")
+        self.data = Loader().load("MP_New.sans")
 
     def test_checkdata(self):
@@ -191,22 +171,11 @@
         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")
+        data = Loader().load("cansas1d.xml")
         self.data = data[0]
-
-    def test_generic_loader(self):
-        # the generic loader should work as well
-        data = Loader().load("cansas1d.xml")
-        self.assertEqual(data[0].meta_data['loader'], "CanSAS XML 1D")
-
+ 
     def test_cansas_checkdata(self):
         self.assertEqual(self.data.filename, "cansas1d.xml")
@@ -221,4 +190,5 @@
             tests won't pass
         """
+        
         self.assertEqual(self.data.run[0], "1234")
         self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
@@ -294,15 +264,15 @@
             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:
+        if _found1==False or _found2==False:
             raise RuntimeError, "Could not find all data %s %s" % (_found1, _found2) 
             
@@ -339,21 +309,28 @@
             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:
-            raise RuntimeError, "Could not find all process terms %s %s" % (_found_term1, _found_term2)
+        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):
-        r = CANSASReader()
-
+        from sas.sascalc.dataloader.readers.cansas_reader import Reader
+        r = Reader()
+        x = np.ones(5)
+        y = np.ones(5)
+        dy = np.ones(5)
+        
         filename = "write_test.xml"
         r.write(filename, self.data)
@@ -362,6 +339,4 @@
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
-        if os.path.isfile(filename):
-            os.remove(filename)
         
     def test_units(self):
@@ -371,5 +346,5 @@
         """
         filename = "cansas1d_units.xml"
-        data = CANSASReader().read(filename)
+        data = Loader().load(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -382,5 +357,5 @@
         """
         filename = "cansas1d_badunits.xml"
-        data = CANSASReader().read(filename)
+        data = Loader().load(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -391,7 +366,8 @@
         
         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)
-
+        
+        
     def test_slits(self):
         """
@@ -399,5 +375,5 @@
         """
         filename = "cansas1d_slit.xml"
-        data = CANSASReader().read(filename)
+        data = Loader().load(filename)
         self.data = data[0]
         self.assertEqual(self.data.filename, filename)
@@ -421,5 +397,6 @@
         self.assertEqual(self.data.run_name['1234'], 'run name')
         self.assertEqual(self.data.title, "Test title")
-
+        
+            
 
 if __name__ == '__main__':
Index: test/sasdataloader/test/utest_cansas.py
===================================================================
--- test/sasdataloader/test/utest_cansas.py	(revision 1fc50fb2f9e67f986acaa06fc7cbcba6b1edd00a)
+++ test/sasdataloader/test/utest_cansas.py	(revision 7432acb919f4013119ca918a73350297e0d4c93f)
@@ -46,6 +46,5 @@
         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):
@@ -57,4 +56,5 @@
         return name
 
+
     def test_invalid_xml(self):
         """
@@ -62,5 +62,6 @@
         """
         invalid = StringIO.StringIO('<a><c></b></a>')
-        XMLreader(invalid)
+        reader = XMLreader(invalid)
+
 
     def test_xml_validate(self):
@@ -81,4 +82,5 @@
         self.assertFalse(xmlschema.validate(invalid))
 
+
     def test_real_xml(self):
         reader = XMLreader(self.xml_valid, self.schema_1_0)
@@ -88,4 +90,5 @@
         else:
             self.assertFalse(valid)
+
 
     def _check_data(self, data):
@@ -102,13 +105,18 @@
         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)
@@ -120,12 +128,12 @@
             self._check_data(cansasreader[i])
             self._check_data_1_1(cansasreader[i])
-            reader_generic.save(self.write_1_1_filename, dataloader[i], None)
+            reader_generic.save(filename, dataloader[i], None)
+            fo = open(filename)
+            str = fo.read()
             reader2 = Loader()
-            self.assertTrue(os.path.isfile(self.write_1_1_filename))
-            return_data = reader2.load(self.write_1_1_filename)
+            return_data = reader2.load(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):
@@ -136,4 +144,5 @@
         for item in data:
             self._check_data(item)
+
 
     def test_entry_name_recurse(self):
@@ -146,5 +155,7 @@
         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())
@@ -162,4 +173,5 @@
         self.assertFalse(reader7.validate_xml())
 
+
     def test_invalid_cansas(self):
         list = self.loader.load(self.cansas1d_notitle)
@@ -172,9 +184,10 @@
         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()
-        file_loader.load(self.cansas1d)
+        file1 = file_loader.load(self.cansas1d)
         reader2 = XMLreader(self.cansas1d_units, self.schema_1_0)
         self.assertTrue(reader2.validate_xml())
@@ -184,5 +197,7 @@
         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()
@@ -195,15 +210,13 @@
             self._check_data(dataloader[i])
             self._check_data(cansasreader[i])
-            reader_generic.save(self.write_1_0_filename, dataloader[i], None)
+            reader_generic.save(filename, dataloader[i], None)
             reader2 = Reader()
-            self.assertTrue(os.path.isfile(self.write_1_0_filename))
-            return_data = reader2.read(self.write_1_0_filename)
+            return_data = reader2.read(filename)
             written_data = return_data[0]
-            XMLreader(self.write_1_0_filename, self.schema_1_0)
+            xmlwrite = XMLreader(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):
@@ -211,5 +224,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': \
@@ -219,7 +232,8 @@
             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)
-            xmldoc.toprettyxml()
+            xml_output = xmldoc.toprettyxml()
+
 
     def set_processing_instructions(self, minidom_object, dic):
@@ -229,4 +243,5 @@
             minidom_object.insertBefore(pi, xmlroot)
         return minidom_object
+
 
     def get_processing_instructions(self, xml_reader_object):
Index: test/sasdataloader/test/write_test.xml
===================================================================
--- test/sasdataloader/test/write_test.xml	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
+++ test/sasdataloader/test/write_test.xml	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
@@ -0,0 +1,116 @@
+<?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/sasrealspace/test/early_test.py
===================================================================
--- test/sasrealspace/test/early_test.py	(revision aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/sasrealspace/test/early_test.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,3 +1,2 @@
-from __future__ import print_function
 
 import VolumeCanvas
@@ -31,16 +30,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
     
     
@@ -64,5 +63,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():
@@ -74,5 +73,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
 
     
@@ -127,5 +126,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))
 
@@ -169,5 +168,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():
@@ -194,5 +193,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():
@@ -233,5 +232,5 @@
     
     
-    print(model.npts)
+    print model.npts
     for i in range(40):
         qmax = 0.5
@@ -241,9 +240,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
@@ -288,5 +287,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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/sasrealspace/test/sim_validation.py	(revision ac07a3acc20dbf79c564bf642aece71a02c2c862)
@@ -5,13 +5,11 @@
     @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
      
@@ -252,6 +250,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()
@@ -280,8 +278,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()
        
@@ -308,7 +306,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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/sasrealspace/test/utest_oriented.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -3,5 +3,4 @@
     @copyright: University of Tennessee, for the DANSE project
 """
-from __future__ import print_function
 
 import unittest, math, sys
@@ -17,9 +16,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
  
@@ -242,5 +241,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
 
@@ -396,5 +395,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
 
@@ -408,5 +407,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
 
@@ -420,5 +419,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
 
@@ -432,5 +431,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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/sasrealspace/test/utest_realspace.py	(revision 45dffa69cb5935e2da7c77a2f040debb07ceb1c6)
@@ -3,5 +3,4 @@
     @author: Mathieu Doucet / UTK
 """
-from __future__ import print_function
 
 import unittest, math, time
@@ -16,10 +15,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 aaf5e497ff1af2aa7b8b3d361ab951e2a0ca7c93)
+++ test/utest_sasview.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
@@ -1,5 +1,3 @@
 #!/usr/bin/env python
-from __future__ import print_function
-
 import os
 import subprocess
@@ -82,24 +80,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
