Index: .pydevproject
===================================================================
--- .pydevproject	(revision f468791f8ac1d2498ad79b33a2c4a0f06236dec8)
+++ .pydevproject	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -4,5 +4,5 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/code/src</path>
+<path>/trunk/src</path>
 </pydev_pathproperty>
 </pydev_project>
Index: src/sans/dataloader/data_info.py
===================================================================
--- src/sans/dataloader/data_info.py	(revision ffbe487235261db53473e1fe28d7b1953c7e31dd)
+++ src/sans/dataloader/data_info.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -401,4 +401,38 @@
         return _str
     
+class TransmissionSpectrum:
+    """
+    Class that holds information about transmission spectrum
+    for white beams and spallation sources.
+    """
+    name = ''
+    timestamp = ''
+    ## Wavelength (float) [A]
+    wavelength = None
+    wavelength_unit = 'A'
+    ## Transmission (float) [unit less]
+    transmission = None
+    transmission_unit = ''
+    ## Transmission Deviation (float) [unit less]
+    transmission_deviation = None
+    transmission_deviation_unit = ''
+    
+    def __init__(self):
+        self.wavelength = []
+        self.transmission = []
+        self.transmission_deviation = []
+    
+    def __str__(self):
+        _str  = "Transmission Spectrum:\n"
+        _str += "   Name:       {0}".format(self.name)
+        _str += "   Timestamp:  {1}".format(self.timestamp)
+        _str += "   Wavelength [{0}] | Transmission [{1}] | Trans Dev [{2}]\n".format(self.wavelength_unit, self.transmission_unit, self.transmission_deviation_unit)
+        for i in range(len(self.wavelength)):
+            _str += "   {0}, {1}".format(self.wavelength[i], self.transmission[i])
+            if len(self.transmission_deviation > i):
+                _str += ", {0}".format(self.transmission_deviation[i])
+            _str += "\n"
+        return _str
+    
   
 class DataInfo:
@@ -431,4 +465,6 @@
     ## Collimation information
     collimation = None
+    ## Transmission Spectrum INfo
+    trans_spectrum = None
     ## Additional meta-data
     meta_data  = None
@@ -461,4 +497,6 @@
         ## Collimation information
         self.collimation = []
+        ## Transmission Spectrum
+        self.trans_spectrum = TransmissionSpectrum()
         ## Additional meta-data
         self.meta_data  = {}
Index: src/sans/dataloader/readers/cansas_constants.py
===================================================================
--- src/sans/dataloader/readers/cansas_constants.py	(revision eda89725afadff916f49a3a51d5823023263ff33)
+++ src/sans/dataloader/readers/cansas_constants.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -15,5 +15,5 @@
                      "SASentry" : {
                                    "units_optional" : True,
-                                   "variable" : " ",
+                                   "variable" : None,
                                    "storeas" : "content",
                                    "attributes" : {"name" : {"variable" : "{0}.run_name[node_value] = \"{1}\""}},
@@ -26,8 +26,9 @@
                                                  "SASdata" : {
                                                               "attributes" : {"name" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\"",}},
+                                                              "variable" : None,
                                                               "children" : {"Idata" : {
                                                                                        "storeas" : "float",
+                                                                                       "units_optional" : False,
                                                                                        "variable" : None,
-                                                                                       "units_optional" : False,
                                                                                        "attributes" : {
                                                                                                        "name" : {
@@ -43,8 +44,8 @@
                                                                                                      "Q" : {
                                                                                                             "variable" : "{0}.x = numpy.append({0}.x, {1})",
-                                                                                                            "unit" : "_xunit",
+                                                                                                            "unit" : "x_unit",
                                                                                                             "attributes" : {
                                                                                                                             "unit" : {
-                                                                                                                                      "variable" : "{0}._xunit",
+                                                                                                                                      "variable" : "{0}._xunit = \"{1}\"",
                                                                                                                                       "storeas" : "content"
                                                                                                                                       }
@@ -53,8 +54,8 @@
                                                                                                      "I" : {
                                                                                                             "variable" : "{0}.y = numpy.append({0}.y, {1})",
-                                                                                                            "unit" : "_yunit",
+                                                                                                            "unit" : "y_unit",
                                                                                                             "attributes" : {
                                                                                                                             "unit" : {
-                                                                                                                                      "variable" : "{0}._yunit",
+                                                                                                                                      "variable" : "{0}._yunit = \"{1}\"",
                                                                                                                                       "storeas" : "content"
                                                                                                                                       }
@@ -63,4 +64,5 @@
                                                                                                      "Idev" : {
                                                                                                                "variable" : "{0}.dy = numpy.append({0}.dy, {1})",
+                                                                                                               "unit" : "y_unit",
                                                                                                                "attributes" : {
                                                                                                                                "unit" : {
@@ -72,4 +74,5 @@
                                                                                                      "Qdev" : {
                                                                                                                "variable" : "{0}.dx = numpy.append({0}.dx, {1})",
+                                                                                                               "unit" : "x_unit",
                                                                                                                "attributes" : {
                                                                                                                                "unit" : {
@@ -81,4 +84,5 @@
                                                                                                      "dQw" : {
                                                                                                               "variable" : "{0}.dxw = numpy.append({0}.dxw, {1})",
+                                                                                                              "unit" : "x_unit",
                                                                                                               "attributes" : {
                                                                                                                               "unit" : {
@@ -90,4 +94,5 @@
                                                                                                      "dQl" : {
                                                                                                               "variable" : "{0}.dxl = numpy.append({0}.dxl, {1})",
+                                                                                                              "unit" : "x_unit",
                                                                                                               "attributes" : {
                                                                                                                               "unit" : {
@@ -99,4 +104,5 @@
                                                                                                      "Qmean" : {
                                                                                                                 "storeas" : "content",
+                                                                                                                "unit" : "x_unit",
                                                                                                                 "variable" : "{0}.meta_data[\"{2}\"] = {1}",
                                                                                                                 "attributes" : {"unit" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""}},
@@ -116,18 +122,39 @@
                                                               },
                                                  "SAStransmission_spectrum" : {
+                                                                               "variable" : None,
                                                                                "children" : {
                                                                                              "Tdata" : {
+                                                                                                        "storeas" : "float",
+                                                                                                        "variable" : None,
                                                                                                         "children" : {
                                                                                                                       "Lambda" : {
-                                                                                                                                  "variable" : "{0}.meta_data[\"{2}\"] = \"{1}\"",
-                                                                                                                                  "attributes" : {"unit" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""}}
+                                                                                                                                  "variable" : "{0}.trans_spectrum.wavelength.append({1})",
+                                                                                                                                  "unit" : "trans_spectrum.wavelength_unit",
+                                                                                                                                  "attributes" : {
+                                                                                                                                                  "unit" : {
+                                                                                                                                                            "variable" : "{0}.trans_spectrum.wavelength_unit = \"{1}\"",
+                                                                                                                                                            "storeas" : "content"
+                                                                                                                                                            }
+                                                                                                                                                  }
                                                                                                                                   },
                                                                                                                       "T" : {
-                                                                                                                             "variable" : "{0}.meta_data[\"{2}\"] = \"{1}\"",
-                                                                                                                             "attributes" : {"unit" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""}}
+                                                                                                                             "variable" : "{0}.trans_spectrum.transmission.append({1})",
+                                                                                                                             "unit" : "trans_spectrum.transmission_unit",
+                                                                                                                             "attributes" : {
+                                                                                                                                             "unit" : {
+                                                                                                                                                       "variable" : "{0}.trans_spectrum.transmission_unit = \"{1}\"",
+                                                                                                                                                       "storeas" : "content"
+                                                                                                                                                       }
+                                                                                                                                             }
                                                                                                                              },
                                                                                                                       "Tdev" : {
-                                                                                                                                "variable" : "{0}.meta_data[\"{2}\"] = \"{1}\"",
-                                                                                                                                "attributes" : {"unit" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""}}
+                                                                                                                                "variable" : "{0}.trans_spectrum.transmission_deviation.append({1})",
+                                                                                                                                "unit" : "trans_spectrum.transmission_deviation_unit",
+                                                                                                                                "attributes" : {
+                                                                                                                                             "unit" : {
+                                                                                                                                                       "variable" : "{0}.trans_spectrum.transmission_deviation_unit = \"{1}\"",
+                                                                                                                                                       "storeas" : "content"
+                                                                                                                                                       }
+                                                                                                                                             }
                                                                                                                                 },
                                                                                                                       "<any>" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""},
@@ -136,9 +163,10 @@
                                                                                              "<any>" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""},
                                                                                              },
-                                                                               "attributes" : {"name" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""},
-                                                                                               "timestamp" : {"variable" : "{0}.meta_data[\"{2}\"] = \"{1}\""},}
+                                                                               "attributes" : {"name" : {"variable" : "{0}.trans_spectrum.name = \"{1}\""},
+                                                                                               "timestamp" : {"variable" : "{0}.trans_spectrum.timestamp = \"{1}\""},}
                                                                                },
                                                  "SASsample" : {
                                                                 "attributes" : {"name" : {"variable" : "{0}.sample.name = \"{1}\""},},
+                                                                "variable" : None,
                                                                 "children" : {
                                                                               "ID" : {"variable" : "{0}.sample.ID = \"{1}\""},
@@ -171,4 +199,5 @@
                                                                               "position" : {
                                                                                             "children" : {
+                                                                                                          "variable" : None,
                                                                                                           "x" : {
                                                                                                                  "variable" : "{0}.sample.position.x = {1}",
@@ -205,4 +234,5 @@
                                                                                             },
                                                                               "orientation" : {
+                                                                                               "variable" : None,
                                                                                                "children" : {
                                                                                                              "roll" : {
@@ -246,12 +276,16 @@
                                                                 },
                                                  "SASinstrument" : {
+                                                                    "variable" : None,
                                                                     "children" : {
+                                                                                  "variable" : None,
                                                                                   "name" : {"variable" : "{0}.instrument = \"{1}\""},
                                                                                   "SASsource" : {
                                                                                                  "attributes" : {"name" : {"variable" : "{0}.source.name = \"{1}\""}},
+                                                                                                 "variable" : None,
                                                                                                  "children" : {
                                                                                                                "radiation" : {"variable" : "{0}.source.radiation = \"{1}\""},
                                                                                                                "beam_size" : {
                                                                                                                               "attributes" : {"name" : {"variable" : "{0}.source.beam_size_name = \"{1}\""}},
+                                                                                                                              "variable" : None,
                                                                                                                               "children" : {
                                                                                                                                             "x" : {
@@ -343,4 +377,5 @@
                                                                                                                                 },
                                                                                                                     "aperture" : {
+                                                                                                                                  "variable" : None,
                                                                                                                                   "attributes" : {
                                                                                                                                                   "name" : {"variable" : "{0}.name = \"{1}\""},
@@ -386,7 +421,11 @@
                                                                                                                                                                         }
                                                                                                                                                           },
-                                                                                                                                                "distance" : {"attributes" : {"unit" : {"variable" : "{0}.distance_unit = \"{1}\""}},
+                                                                                                                                                "distance" : {
+                                                                                                                                                              "storeas" : "float",
+                                                                                                                                                              "attributes" : {
+                                                                                                                                                                              "storeas" : "content",
+                                                                                                                                                                              "unit" : {"variable" : "{0}.distance_unit = \"{1}\""}},
                                                                                                                                                               "variable" : "{0}.distance = {1}",
-                                                                                                                                                              "unit" : "length_unit",
+                                                                                                                                                              "unit" : "distance_unit",
                                                                                                                                                               }
                                                                                                                                                 }
@@ -419,4 +458,5 @@
                                                                                                                           },
                                                                                                                  "offset" : {
+                                                                                                                             "variable" : None,
                                                                                                                              "children" : {
                                                                                                                                            "x" : {
@@ -453,4 +493,5 @@
                                                                                                                              },
                                                                                                                  "orientation" : {
+                                                                                                                                  "variable" : None,
                                                                                                                                   "children" : {
                                                                                                                                                 "roll" : {
@@ -481,4 +522,5 @@
                                                                                                                                   },
                                                                                                                  "beam_center" : {
+                                                                                                                                  "variable" : None,
                                                                                                                                   "children" : {
                                                                                                                                                 "x" : {
@@ -509,4 +551,5 @@
                                                                                                                                   },
                                                                                                                  "pixel_size" : {
+                                                                                                                                 "variable" : None,
                                                                                                                                  "children" : {
                                                                                                                                                "x" : {
@@ -551,9 +594,9 @@
                                                                     },
                                                  "SASprocess" : {
-                                                                 "variable" : " ",
+                                                                 "variable" : None,
                                                                  "children" : {
-                                                                               "name" : {"variable" : "{0}.name = \"{1}\""},
-                                                                               "date" : {"variable" : "{0}.date = \"{1}\""},
-                                                                               "description" : {"variable" : "{0}.description = \"{1}\""},
+                                                                               "name" : {"variable" : "{0}.name = \'{1}\'"},
+                                                                               "date" : {"variable" : "{0}.date = \'{1}\'"},
+                                                                               "description" : {"variable" : "{0}.description = \'{1}\'"},
                                                                                "term" : {
                                                                                          "variable" : None,
@@ -563,10 +606,12 @@
                                                                                                          }
                                                                                          },
-                                                                               "SASprocessnote" : {"children" : {"<any>" : {"variable" : "{0}.notes.append(\"{2}: {1}\")"}}},
-                                                                               "<any>" : {"variable" : "{0}.notes.append(\"{2}: {1}\")",}
+                                                                               "SASprocessnote" : {
+                                                                                                   "variable" : None,
+                                                                                                   "children" : {"<any>" : {"variable" : "{0}.notes.append(\'2}: {1}\')"}}},
+                                                                               "<any>" : {"variable" : "{0}.notes.append(\'{2}: {1}\')",}
                                                                                },
                                                                  },
-                                                 "SASnote" : {"variable" : "{0}.notes.append(\"{1}\")"},
-                                                 "<any>" : {"variable" : "{0}.meta_data[\"{2}\" = \"{1}\""},
+                                                 "SASnote" : {"variable" : "{0}.notes.append(\'{1}\')"},
+                                                 "<any>" : {"variable" : "{0}.meta_data[\"{2}\"] = \'{1}\'"},
                                                  }
                                    }
Index: src/sans/dataloader/readers/cansas_reader.py
===================================================================
--- src/sans/dataloader/readers/cansas_reader.py	(revision eda89725afadff916f49a3a51d5823023263ff33)
+++ src/sans/dataloader/readers/cansas_reader.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -123,4 +123,14 @@
     errors = []
     
+    type_name = "canSAS"
+    
+    ## Wildcards
+    type = ["XML files (*.xml)|*.xml"]
+    ## List of allowed extensions
+    ext = ['.xml', '.XML']
+    
+    ## Flag to bypass extension check
+    allow_all = True
+    
     def __init__(self):
         ## List of errors
@@ -156,79 +166,89 @@
         ns = []
         
-        try:
-            # Load in the xml file and get the cansas version from the header
-            self.reader.setXMLFile(xml)
-            root = self.reader.xmlroot
-            self.cansasVersion = root.get("version")
-            # Generic values for the cansas file based on the version
-            cansas_defaults = CANSAS_NS.get(self.cansasVersion)
-        
-            # Link a schema to the XML file.
+        # Check that the file exists
+        if os.path.isfile(xml):
             basename = os.path.basename(xml)
-            base_name = xml_reader.__file__
-            base = base_name.split("\\sans\\")[0]
-            schema_path = "{0}\\sans\\dataloader\\readers\\schema\\{1}".format(base, cansas_defaults.get("schema")).replace("\\", "/")
-            self.reader.setSchema(schema_path)
-        
-            # Try to load the file, but raise an error if unable to.
-            # Check the file matches the XML schema
-            if self.isCansas():
-                # Get each SASentry from the XML file and add it to a list.
-                entry_list = root.xpath('/ns:SASroot/ns:SASentry',
-                                             namespaces={'ns': cansas_defaults.get("ns")})
-                ns.append("SASentry")
-                
-                # If there are multiple files, modify the name for each is unique
-                multipleFiles = len(entry_list) - 1
-                n = 0
-                name = basename
-                # Parse each SASentry item
-                for entry in entry_list:
-                    
-                    # Define a new Data1D object with zeroes for x and y
-                    data1D = Data1D(x,y,dx,dy)
-                    data1D.dxl = dxl
-                    data1D.dxw = dxw
-                    
-                    # If more than one SASentry, number each in order
-                    if multipleFiles:
-                        name += "_{0}".format(n)
-                        n += 1
-                    
-                    # Set the Data1D name and then parse the entry. The entry is appended to a list of entry values
-                    data1D.filename = name
-                    data1D.meta_data["loader"] = "CanSAS 1D"
-                    return_value, extras = self._parse_entry(entry, ns, data1D)
-                    del extras[:]
-                    
-                    #Final cleanup - Remove empty nodes, verify array sizes are correct
-                    return_value.errors = self.errors
-                    del self.errors[:]
-                    numpy.trim_zeros(return_value.x)
-                    numpy.trim_zeros(return_value.y)
-                    numpy.trim_zeros(return_value.dy)
-                    size_dx = return_value.dx.size
-                    size_dxl = return_value.dxl.size
-                    size_dxw = return_value.dxw.size
-                    if size_dxl == 0 and size_dxw == 0:
-                        return_value.dxl = None
-                        return_value.dxw = None
-                        numpy.trim_zeros(return_value.dx)
-                    elif size_dx == 0:
-                        return_value.dx = None
-                        size_dx = size_dxl
-                        numpy.trim_zeros(return_value.dxl)
-                        numpy.trim_zeros(return_value.dxw)
-                    
-                    output.append(return_value)
-            else:
-                # If the file does not match the schema, raise this error
-                raise RuntimeError, "%s cannot be read \n" % xml
-        # If an exception occurs while loading the file, give a descriptive output.
-        except Exception:
-            raise RuntimeError, "%s cannot be read \n" % xml
+            _, extension = os.path.splitext(basename)
+            # If the fiel type is not allowed, return nothing
+            if extension in self.ext or self.allow_all:
+                base_name = xml_reader.__file__
+                base = base_name.split("\\sans\\")[0]
+                
+                # Load in the xml file and get the cansas version from the header
+                self.reader.setXMLFile(xml)
+                root = self.reader.xmlroot
+                if root is None:
+                    root = {}
+                self.cansasVersion = root.get("version", "1.0")
+                
+                # Generic values for the cansas file based on the version
+                cansas_defaults = CANSAS_NS.get(self.cansasVersion, "1.0")
+                schema_path = "{0}\\sans\\dataloader\\readers\\schema\\{1}".format(base, cansas_defaults.get("schema")).replace("\\", "/")
+                
+                # Link a schema to the XML file.
+                self.reader.setSchema(schema_path)
             
+                # Try to load the file, but raise an error if unable to.
+                # Check the file matches the XML schema
+                try:
+                    if self.isCansas():
+                        # Get each SASentry from the XML file and add it to a list.
+                        entry_list = root.xpath('/ns:SASroot/ns:SASentry',
+                                                     namespaces={'ns': cansas_defaults.get("ns")})
+                        ns.append("SASentry")
+                        
+                        # If there are multiple files, modify the name for each is unique
+                        multipleFiles = len(entry_list) - 1
+                        n = 0
+                        name = basename
+                        # Parse each SASentry item
+                        for entry in entry_list:
+                            
+                            # Define a new Data1D object with zeroes for x and y
+                            data1D = Data1D(x,y,dx,dy)
+                            data1D.dxl = dxl
+                            data1D.dxw = dxw
+                            
+                            # If more than one SASentry, number each in order
+                            if multipleFiles:
+                                name += "_{0}".format(n)
+                                n += 1
+                            
+                            # Set the Data1D name and then parse the entry. The entry is appended to a list of entry values
+                            data1D.filename = name
+                            data1D.meta_data["loader"] = "CanSAS 1D"
+                            return_value, extras = self._parse_entry(entry, ns, data1D)
+                            del extras[:]
+                            
+                            #Final cleanup - Remove empty nodes, verify array sizes are correct
+                            for error in self.errors:
+                                return_value.errors.append(error)
+                            del self.errors[:]
+                            numpy.trim_zeros(return_value.x)
+                            numpy.trim_zeros(return_value.y)
+                            numpy.trim_zeros(return_value.dy)
+                            size_dx = return_value.dx.size
+                            size_dxl = return_value.dxl.size
+                            size_dxw = return_value.dxw.size
+                            if size_dxl == 0 and size_dxw == 0:
+                                return_value.dxl = None
+                                return_value.dxw = None
+                                numpy.trim_zeros(return_value.dx)
+                            elif size_dx == 0:
+                                return_value.dx = None
+                                size_dx = size_dxl
+                                numpy.trim_zeros(return_value.dxl)
+                                numpy.trim_zeros(return_value.dxw)
+                            
+                            output.append(return_value)
+                    else:
+                        value = self.reader.findInvalidXML()
+                        output.append("Invalid XML at: {0}".format(value))
+                except:
+                    # If the file does not match the schema, raise this error
+                    raise RuntimeError, "%s cannot be read \n" % xml
+                return output
         # Return a list of parsed entries that dataloader can manage
-        return output
+        return None
     
     def _create_unique_key(self, dictionary, name, i):
@@ -264,5 +284,5 @@
     def _unit_conversion(self, new_current_level, attr, data1D, node_value, optional = True):
         value_unit = ''
-        if 'unit' in attr and 'unit' in new_current_level:
+        if 'unit' in attr and new_current_level.get('unit') is not None:
             try:
                 if isinstance(node_value, float) is False:
@@ -270,7 +290,8 @@
                 default_unit = None
                 unitname = new_current_level.get("unit")
-                exec "default_unit = data1D.{0}.lower()".format(unitname)
-                local_unit = attr['unit'].lower()
-                if local_unit != default_unit:
+                exec "default_unit = data1D.{0}".format(unitname)
+                local_unit = attr['unit']
+                if local_unit.lower() != default_unit.lower() and local_unit is not None\
+                    and local_unit.lower() != "none" and default_unit is not None:
                     if HAS_CONVERTER == True:
                         try:
@@ -279,24 +300,34 @@
                             exec "node_value = data_conv_q(node_value, units=data1D.{0})".format(unitname)
                         except:
-                            msg = "CanSAS reader: could not convert "
-                            msg += "Q unit [%s]; " % attr['unit'],
-                            exec "msg += \"expecting [%s]\n  %s\" % (data1D.{0}, sys.exc_info()[1])".format(unitname)
-                            raise ValueError, msg
+                            err_msg = "CanSAS reader: could not convert "
+                            err_msg += "Q unit {0}; ".format(local_unit)
+                            intermediate = "err_msg += \"expecting [{1}]  {2}\".format(data1D.{0}, sys.exc_info()[1])".format(unitname, "{0}", "{1}")
+                            exec intermediate
+                            self.errors.append(err_msg)
+                            if optional:
+                                logging.info(err_msg)
+                            else:
+                                raise ValueError, err_msg
                     else:
                         value_unit = local_unit
-                        err_mess = "CanSAS reader: unrecognized %s unit [%s];"\
+                        err_msg = "CanSAS reader: unrecognized %s unit [%s];"\
                         % (node_value, default_unit)
-                        err_mess += " expecting [%s]" % local_unit
-                        self.errors.append(err_mess)
+                        err_msg += " expecting [%s]" % local_unit
+                        self.errors.append(err_msg)
                         if optional:
-                            logging.info(err_mess)
+                            logging.info(err_msg)
                         else:
-                            raise ValueError, err_mess
-            except Exception as e:
-                msg = "CanSAS reader: could not convert "
-                msg += "Q unit [%s]; " % attr['unit'],
-                exec "msg += \"expecting [%s]\n  %s\" % (data1D.{0}, sys.exc_info()[1])".format(unitname)
-                self.errors.append(msg)
-                raise ValueError, msg
+                            raise ValueError, err_msg
+                else:
+                    value_unit = local_unit
+            except:
+                err_msg = "CanSAS reader: could not convert "
+                err_msg += "Q unit [%s]; " % attr['unit'],
+                exec "err_msg += \"expecting [%s]\n  %s\" % (data1D.{0}, sys.exc_info()[1])".format(unitname)
+                self.errors.append(err_msg)
+                if optional:
+                    logging.info(err_msg)
+                else:
+                    raise ValueError, err_msg
         elif 'unit' in attr:
             value_unit = attr['unit']
@@ -340,8 +371,8 @@
                             term_attr = {}
                             for attr in child.keys():
-                                term_attr[attr] = child.get(attr).strip()
+                                term_attr[attr] = ' '.join(child.get(attr).split())
                             if child.text is not None:
-                                term_attr['value'] = child.text.strip()
-                                data1D.term.append(term_attr)
+                                term_attr['value'] = ' '.join(child.text.split())
+                            data1D.term.append(term_attr)
                 elif tagname == "aperture":
                     data1D = Aperture()
@@ -356,15 +387,13 @@
                 #Get the information from the node
                 node_value = node.text
-                if node_value is not None:
-                    node_value = node_value.strip().replace("\r"," ").replace("\n"," ")
                 if node_value == "":
                     node_value = None
+                if node_value is not None:
+                    node_value = ' '.join(node_value.split())
                 
                 # If the value is a float, compile with units.
                 if ns_datatype == "float":
                     # If an empty value is given, store as zero.
-                    if node_value is None:
-                        node_value = "0.0"
-                    elif node_value.isspace():
+                    if node_value is None or node_value.isspace() or node_value.lower() == "nan":
                         node_value = "0.0"
                     node_value, unit = self._unit_conversion(new_current_level, attr, data1D, node_value, optional)
@@ -438,12 +467,13 @@
             raise RuntimeError, "The cansas writer expects a Data1D instance"
         
+        ns = CANSAS_NS.get(self.cansasVersion).get("ns")
         doc = xml.dom.minidom.Document()
         main_node = doc.createElement("SASroot")
-        main_node.setAttribute("cansasVersion", self.cansasVersion)
-        main_node.setAttribute("xmlns", "cansas1d/%s" % self.cansasVersion)
+        main_node.setAttribute("version", self.cansasVersion)
+        main_node.setAttribute("xmlns", ns)
         main_node.setAttribute("xmlns:xsi",
                                "http://www.w3.org/2001/XMLSchema-instance")
         main_node.setAttribute("xsi:schemaLocation",
-                               "cansas1d/%s http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" % self.cansasVersion)
+                               "{0} http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd".format(ns))
         
         doc.appendChild(main_node)
@@ -471,16 +501,32 @@
                 write_node(doc, pt, "I", datainfo.y[i],
                             {'unit': datainfo.y_unit})
+            if datainfo.dy != None and len(datainfo.dy) >= i:
+                write_node(doc, pt, "Idev", datainfo.dy[i],
+                            {'unit': datainfo.y_unit})
             if datainfo.dx != None and len(datainfo.dx) >= i:
                 write_node(doc, pt, "Qdev", datainfo.dx[i],
+                            {'unit': datainfo.x_unit})
+            if datainfo.dxw != None and len(datainfo.dxw) >= i:
+                write_node(doc, pt, "dQw", datainfo.dxw[i],
                             {'unit': datainfo.x_unit})
             if datainfo.dxl != None and len(datainfo.dxl) >= i:
                 write_node(doc, pt, "dQl", datainfo.dxl[i],
                             {'unit': datainfo.x_unit})
-            if datainfo.dxw != None and len(datainfo.dxw) >= i:
-                write_node(doc, pt, "dQw", datainfo.dxw[i],
-                            {'unit': datainfo.x_unit})
-            if datainfo.dy != None and len(datainfo.dy) >= i:
-                write_node(doc, pt, "Idev", datainfo.dy[i],
-                            {'unit': datainfo.y_unit})
+
+        # Transmission Spectrum Info
+        if len(datainfo.trans_spectrum.wavelength) > 0:
+            node = doc.createElement("SAStransmission_spectrum")
+            entry_node.appendChild(node)
+            for i in range(len(datainfo.trans_spectrum.wavelength)):
+                pt = doc.createElement("Tdata")
+                node.appendChild(pt)
+                write_node(doc, pt, "Lambda", datainfo.trans_spectrum.wavelength[i], 
+                           {'unit': datainfo.trans_spectrum.wavelength_unit})
+                write_node(doc, pt, "T", datainfo.trans_spectrum.transmission[i], 
+                           {'unit': datainfo.trans_spectrum.transmission_unit})
+                if datainfo.trans_spectrum.transmission_deviation != None \
+                and len(datainfo.trans_spectrum.transmission_deviation) >= i:
+                    write_node(doc, pt, "Tdev", datainfo.trans_spectrum.transmission_deviation[i], 
+                               {'unit': datainfo.trans_spectrum.transmission_deviation_unit})
 
         # Sample info
@@ -495,7 +541,4 @@
         write_node(doc, sample, "temperature", datainfo.sample.temperature,
                    {"unit": datainfo.sample.temperature_unit})
-        
-        for item in datainfo.sample.details:
-            write_node(doc, sample, "details", item)
         
         pos = doc.createElement("position")
@@ -524,4 +567,7 @@
             sample.appendChild(ori)
         
+        for item in datainfo.sample.details:
+            write_node(doc, sample, "details", item)
+        
         # Instrument info
         instr = doc.createElement("SASinstrument")
@@ -535,7 +581,6 @@
             source.setAttribute("name", str(datainfo.source.name))
         instr.appendChild(source)
-        
         write_node(doc, source, "radiation", datainfo.source.radiation)
-        write_node(doc, source, "beam_shape", datainfo.source.beam_shape)
+        
         size = doc.createElement("beam_size")
         if datainfo.source.beam_size_name is not None:
@@ -552,4 +597,5 @@
             source.appendChild(size)
             
+        write_node(doc, source, "beam_shape", datainfo.source.beam_shape)
         write_node(doc, source, "wavelength",
                    datainfo.source.wavelength,
@@ -583,7 +629,4 @@
                 coll.appendChild(ap)
                 
-                write_node(doc, ap, "distance", apert.distance,
-                           {"unit": apert.distance_unit})
-                
                 size = doc.createElement("size")
                 if apert.size_name is not None:
@@ -597,4 +640,7 @@
                 if written == True:
                     ap.appendChild(size)
+                
+                write_node(doc, ap, "distance", apert.distance,
+                           {"unit": apert.distance_unit})
 
         #   Detectors
@@ -604,7 +650,4 @@
             written = written | write_node(doc, det, "SDD", item.distance,
                                            {"unit": item.distance_unit})
-            written = written | write_node(doc, det, "slit_length",
-                                           item.slit_length,
-                                           {"unit": item.slit_length_unit})
             if written == True:
                 instr.appendChild(det)
@@ -619,4 +662,16 @@
             if written == True:
                 det.appendChild(off)
+                
+            ori = doc.createElement("orientation")
+            written = write_node(doc, ori, "roll", item.orientation.x,
+                                 {"unit": item.orientation_unit})
+            written = written | write_node(doc, ori, "pitch",
+                                           item.orientation.y,
+                                           {"unit": item.orientation_unit})
+            written = written | write_node(doc, ori, "yaw",
+                                           item.orientation.z,
+                                           {"unit": item.orientation_unit})
+            if written == True:
+                det.appendChild(ori)
             
             center = doc.createElement("beam_center")
@@ -641,17 +696,8 @@
             if written == True:
                 det.appendChild(pix)
-                
-            ori = doc.createElement("orientation")
-            written = write_node(doc, ori, "roll", item.orientation.x,
-                                 {"unit": item.orientation_unit})
-            written = written | write_node(doc, ori, "pitch",
-                                           item.orientation.y,
-                                           {"unit": item.orientation_unit})
-            written = written | write_node(doc, ori, "yaw",
-                                           item.orientation.z,
-                                           {"unit": item.orientation_unit})
-            if written == True:
-                det.appendChild(ori)
-                
+            written = written | write_node(doc, det, "slit_length",
+                                           item.slit_length,
+                                           {"unit": item.slit_length_unit})
+            
         # Processes info
         for item in datainfo.process:
@@ -668,5 +714,20 @@
             for note in item.notes:
                 write_node(doc, node, "SASprocessnote", note)
-        
+            if len(item.notes) == 0:
+                write_node(doc, node, "SASprocessnote", "")
+                
+        # Note info
+        if len(datainfo.notes) == 0:
+            node = doc.createElement("SASnote")
+            entry_node.appendChild(node)
+            if node.hasChildNodes():
+                for child in node.childNodes:
+                    node.removeChild(child)
+        else:
+            for item in datainfo.notes:
+                node = doc.createElement("SASnote")
+                entry_node.appendChild(node)
+                node.appendChild(doc.createTextNode(item))
+                
         # Return the document, and the SASentry node associated with
         # the data we just wrote
Index: src/sans/dataloader/readers/schema/cansas1d_v1_0.xsd
===================================================================
--- src/sans/dataloader/readers/schema/cansas1d_v1_0.xsd	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ src/sans/dataloader/readers/schema/cansas1d_v1_0.xsd	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="xsd-documentation.xsl" ?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"  jaxb:version="2.0"
+	targetNamespace="cansas1d/1.0" xmlns:tns="cansas1d/1.0"
+	elementFormDefault="qualified">
+
+<!-- JAXB: http://java.sun.com/developer/technicalArticles/WebServices/jaxb/ -->
+
+	<complexType name="floatUnitType">
+		<simpleContent>
+			<extension base="float">
+				<attribute name="unit" type="string" use="required" />
+			</extension>
+		</simpleContent>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<group name="positionGroup">
+		<sequence>
+			<element name="x" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+			<element name="y" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+			<element name="z" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+		</sequence>
+	</group>
+
+	<complexType name="positionType">
+		<group ref="tns:positionGroup" />
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<group name="orientationGroup">
+		<sequence>
+			<element name="roll" type="tns:floatUnitType" minOccurs="0"  maxOccurs="1" />
+			<element name="pitch" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+			<element name="yaw" type="tns:floatUnitType" minOccurs="0"   maxOccurs="1" />
+		</sequence>
+	</group>
+
+	<complexType name="orientationType">
+		<group ref="tns:orientationGroup" />
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="IdataType">
+		<sequence>
+			<element name="Q" minOccurs="1" maxOccurs="1"    type="tns:floatUnitType" />
+			<element name="I" minOccurs="1" maxOccurs="1"    type="tns:floatUnitType" />
+			<element name="Idev" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+			<xsd:choice>
+				<!-- [ [Qdev] | [[dQw] | [dQl]] ] -->
+				<element name="Qdev" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+				<xsd:sequence>
+					<element name="dQw" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+					<element name="dQl" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+				</xsd:sequence>
+			</xsd:choice>
+			<element name="Qmean" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+			<element name="Shadowfactor" minOccurs="0" maxOccurs="1" type="float" default="1.0" />
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+	</complexType>
+
+	<complexType name="SASdataType">
+		<sequence>
+			<element name="Idata" minOccurs="1" maxOccurs="unbounded" type="tns:IdataType" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASsampleType">
+		<sequence>
+			<element name="ID" minOccurs="1" maxOccurs="1" type="string" />
+			<element name="thickness" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="transmission" minOccurs="0" maxOccurs="1" type="float" />
+			<element name="temperature" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="position" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="orientation" minOccurs="0" maxOccurs="1" type="tns:orientationType" />
+			<element name="details" minOccurs="0" maxOccurs="unbounded" />
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="termType">
+		<simpleContent>
+			<extension base="string">
+				<attribute name="name" type="string" use="optional" default="" />
+				<attribute name="unit" type="string" use="optional"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASprocessType">
+		<annotation>
+			<appinfo>
+				<!-- JAXB: simplify class name -->
+				<jaxb:property name="SASprocess" />
+			</appinfo>
+		</annotation>
+		<sequence>
+			<element name="name" minOccurs="0" maxOccurs="1"
+				type="string" default="">
+				<annotation>
+					<appinfo>
+						<!-- Remap collision of Name when using JAXB -->
+						<jaxb:property name="SASprocessName" />
+					</appinfo>
+				</annotation>
+			</element>
+			<element name="date" minOccurs="0" maxOccurs="1" type="string" />
+			<element name="description" minOccurs="0" maxOccurs="1" />
+			<element name="term" minOccurs="0" maxOccurs="unbounded" type="tns:termType" />
+			<element name="SASprocessnote" minOccurs="1" maxOccurs="unbounded" />
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="">
+			<annotation>
+				<appinfo>
+					<!-- Remap collision of Name when using JAXB -->
+					<jaxb:property name="SASprocessNameAttr" />
+				</appinfo>
+			</annotation>
+		</attribute>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASsourceType">
+		<sequence>
+			<element name="radiation" minOccurs="1" maxOccurs="1" type="string" />
+			<element name="beam_size" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="beam_shape" minOccurs="0" maxOccurs="1" type="string" />
+			<element name="wavelength" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="wavelength_min" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="wavelength_max" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="wavelength_spread" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<complexType name="SAScollimationType">
+		<sequence>
+			<element name="length" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="aperture" minOccurs="0"
+				maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="size" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+						<element name="distance" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+					</sequence>
+					<attribute name="name" type="string" use="optional" default="" />
+					<attribute name="type" type="string" use="optional" default="" />
+				</complexType>
+			</element>
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<complexType name="SASdetectorType">
+		<sequence>
+			<element name="name" minOccurs="1" maxOccurs="1" type="string" default=""/>
+			<element name="SDD" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="offset" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="orientation" minOccurs="0" maxOccurs="1" type="tns:orientationType" />
+			<element name="beam_center" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="pixel_size" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="slit_length" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+		</sequence>
+	</complexType>
+
+	<complexType name="SASinstrumentType">
+		<sequence>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1" default="" />
+			<element name="SASsource" type="tns:SASsourceType" minOccurs="1" maxOccurs="1" />
+			<element name="SAScollimation" type="tns:SAScollimationType" minOccurs="1" maxOccurs="unbounded" />
+			<element name="SASdetector" type="tns:SASdetectorType" minOccurs="1" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASentryType">
+		<sequence>
+			<element name="Title" minOccurs="1" maxOccurs="1" type="string" />
+			<element name="Run" minOccurs="1" maxOccurs="unbounded">
+				<xsd:complexType>
+					<simpleContent>
+						<extension base="string">
+							<attribute name="name" type="string" use="optional" default="" />
+						</extension>
+					</simpleContent>
+				</xsd:complexType>
+			</element>
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+			<element name="SASdata" minOccurs="1" maxOccurs="unbounded" type="tns:SASdataType" />
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other">
+				<!-- Is a second *any* element needed here? -->
+				<annotation>
+					<appinfo>
+						<!-- Remap collision of Any when using JAXB --> 
+						<jaxb:property name="SASentryAny2" />
+					</appinfo>
+				</annotation>
+			</xsd:any>
+			<element name="SASsample" type="tns:SASsampleType" />
+			<element name="SASinstrument" type="tns:SASinstrumentType" minOccurs="1" maxOccurs="1" />
+			<element name="SASprocess" type="tns:SASprocessType" minOccurs="0" maxOccurs="unbounded" />
+			<element name="SASnote" minOccurs="1" maxOccurs="unbounded" />
+				<!-- SASnote is a free-form element.
+					Do not define any content for it or it will become restrictive.
+				-->
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASrootType">
+		<sequence>
+			<element name="SASentry" minOccurs="1" maxOccurs="unbounded" type="tns:SASentryType" />
+		</sequence>
+		<attribute name="version" type="string" fixed="1.0" use="required" />
+	</complexType>
+
+	<element name="SASroot" type="tns:SASrootType" />
+
+</schema>
Index: src/sans/dataloader/readers/schema/cansas1d_v1_1.xsd
===================================================================
--- src/sans/dataloader/readers/schema/cansas1d_v1_1.xsd	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ src/sans/dataloader/readers/schema/cansas1d_v1_1.xsd	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="xsd-documentation.xsl" ?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"  jaxb:version="2.0"
+	targetNamespace="urn:cansas1d:1.1" xmlns:tns="urn:cansas1d:1.1"
+	elementFormDefault="qualified">
+
+<!-- 
+Copyright (c) 2013, UChicago Argonne, LLC
+This file is distributed subject to a Software License Agreement found
+in the file LICENSE that is included with this distribution. 
+ -->
+ 
+<!-- JAXB: http://java.sun.com/developer/technicalArticles/WebServices/jaxb/ -->
+
+	<complexType name="floatUnitType">
+		<simpleContent>
+			<extension base="float">
+				<attribute name="unit" type="string" use="required" />
+			</extension>
+		</simpleContent>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<group name="positionGroup">
+		<sequence>
+			<element name="x" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+			<element name="y" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+			<element name="z" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+		</sequence>
+	</group>
+
+	<complexType name="positionType">
+		<group ref="tns:positionGroup" />
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<group name="orientationGroup">
+		<sequence>
+			<element name="roll" type="tns:floatUnitType" minOccurs="0"  maxOccurs="1" />
+			<element name="pitch" type="tns:floatUnitType" minOccurs="0" maxOccurs="1" />
+			<element name="yaw" type="tns:floatUnitType" minOccurs="0"   maxOccurs="1" />
+		</sequence>
+	</group>
+
+	<complexType name="orientationType">
+		<group ref="tns:orientationGroup" />
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+	
+	<complexType name="IdataType">
+		<sequence>
+			<element name="Q" minOccurs="1" maxOccurs="1"    type="tns:floatUnitType" />
+			<element name="I" minOccurs="1" maxOccurs="1"    type="tns:floatUnitType" />
+			<element name="Idev" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+			<xsd:choice>
+				<!-- [ [Qdev] | [[dQw] | [dQl]] ] -->
+				<element name="Qdev" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+				<xsd:sequence>
+					<element name="dQw" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+					<element name="dQl" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+				</xsd:sequence>
+			</xsd:choice>
+			<element name="Qmean" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+			<element name="Shadowfactor" minOccurs="0" maxOccurs="1" type="float" default="1.0" />
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+	</complexType>
+	
+	<complexType name="SASdataType">
+		<sequence minOccurs="1" maxOccurs="1">  <!-- http://svn.cansas.org/trac/ticket/21 -->
+			<sequence>
+				<element name="Idata" minOccurs="1" maxOccurs="unbounded" type="tns:IdataType" />
+			</sequence>
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+		<attribute name="timestamp" type="dateTime" use="optional" />
+	</complexType>
+	
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+	
+	<complexType name="TdataType">
+			<sequence>
+				<element name="Lambda" minOccurs="1" maxOccurs="1"    type="tns:floatUnitType" />
+				<element name="T" minOccurs="1" maxOccurs="1"    type="tns:floatUnitType" />
+				<element name="Tdev" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" default="0" />
+				<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+	</complexType>
+	
+	<complexType name="SAStransmission_spectrumType">
+		<sequence minOccurs="1" maxOccurs="1">
+			<sequence minOccurs="1" maxOccurs="1">
+				<element name="Tdata" minOccurs="1" maxOccurs="unbounded" type="tns:TdataType" />
+			</sequence>
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+		<attribute name="timestamp" type="dateTime" use="optional" />
+	</complexType>
+	
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASsampleType">
+		<sequence>
+			<element name="ID" minOccurs="1" maxOccurs="1" type="string" />
+			<element name="thickness" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="transmission" minOccurs="0" maxOccurs="1" type="float" />
+			<element name="temperature" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="position" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="orientation" minOccurs="0" maxOccurs="1" type="tns:orientationType" />
+			<element name="details" minOccurs="0" maxOccurs="unbounded" />
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="termType">
+		<simpleContent>
+			<extension base="string">
+				<attribute name="name" type="string" use="optional" default="" />
+				<attribute name="unit" type="string" use="optional"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASprocessType">
+		<annotation>
+			<appinfo>
+				<!-- JAXB: simplify class name -->
+				<jaxb:property name="SASprocess" />
+			</appinfo>
+		</annotation>
+		<sequence>
+			<element name="name" minOccurs="0" maxOccurs="1"
+				type="string" default="">
+				<annotation>
+					<appinfo>
+						<!-- Remap collision of Name when using JAXB -->
+						<jaxb:property name="SASprocessName" />
+					</appinfo>
+				</annotation>
+			</element>
+			<element name="date" minOccurs="0" maxOccurs="1" type="string" />
+			<element name="description" minOccurs="0" maxOccurs="1" />
+			<element name="term" minOccurs="0" maxOccurs="unbounded" type="tns:termType" />
+			<element name="SASprocessnote" minOccurs="1" maxOccurs="unbounded" />
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="">
+			<annotation>
+				<appinfo>
+					<!-- Remap collision of Name when using JAXB -->
+					<jaxb:property name="SASprocessNameAttr" />
+				</appinfo>
+			</annotation>
+		</attribute>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASsourceType">
+		<sequence>
+			<element name="radiation" minOccurs="1" maxOccurs="1" type="string" />
+			<element name="beam_size" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="beam_shape" minOccurs="0" maxOccurs="1" type="string" />
+			<element name="wavelength" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="wavelength_min" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="wavelength_max" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="wavelength_spread" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<complexType name="SAScollimationType">
+		<sequence>
+			<element name="length" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="aperture" minOccurs="0"
+				maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="size" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+						<element name="distance" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+					</sequence>
+					<attribute name="name" type="string" use="optional" default="" />
+					<attribute name="type" type="string" use="optional" default="" />
+				</complexType>
+			</element>
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<complexType name="SASdetectorType">
+		<sequence>
+			<element name="name" minOccurs="1" maxOccurs="1" type="string" default=""/>
+			<element name="SDD" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+			<element name="offset" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="orientation" minOccurs="0" maxOccurs="1" type="tns:orientationType" />
+			<element name="beam_center" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="pixel_size" minOccurs="0" maxOccurs="1" type="tns:positionType" />
+			<element name="slit_length" minOccurs="0" maxOccurs="1" type="tns:floatUnitType" />
+		</sequence>
+	</complexType>
+
+	<complexType name="SASinstrumentType">
+		<sequence>
+			<element name="name" type="string" minOccurs="1" maxOccurs="1" default="" />
+			<element name="SASsource" type="tns:SASsourceType" minOccurs="1" maxOccurs="1" />
+			<element name="SAScollimation" type="tns:SAScollimationType" minOccurs="1" maxOccurs="unbounded" />
+			<element name="SASdetector" type="tns:SASdetectorType" minOccurs="1" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASentryType">
+		<sequence>
+			<element name="Title" minOccurs="1" maxOccurs="1" type="string" />
+			<element name="Run" minOccurs="1" maxOccurs="unbounded">
+				<xsd:complexType>
+					<simpleContent>
+						<extension base="string">
+							<attribute name="name" type="string" use="optional" default="" />
+						</extension>
+					</simpleContent>
+				</xsd:complexType>
+			</element>
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other" />
+			<element name="SASdata" minOccurs="1" maxOccurs="unbounded" type="tns:SASdataType" />
+			<element name="SAStransmission_spectrum" minOccurs="0" maxOccurs="unbounded" type="tns:SAStransmission_spectrumType"/>
+			<xsd:any minOccurs="0" maxOccurs="unbounded" processContents="skip" namespace="##other">
+				<!-- Is a second *any* element needed here? -->
+				<annotation>
+					<appinfo>
+						<!-- Remap collision of Any when using JAXB --> 
+						<jaxb:property name="SASentryAny2" />
+					</appinfo>
+				</annotation>
+			</xsd:any>
+			<element name="SASsample" type="tns:SASsampleType" />
+			<element name="SASinstrument" type="tns:SASinstrumentType" minOccurs="1" maxOccurs="1" />
+			<element name="SASprocess" type="tns:SASprocessType" minOccurs="0" maxOccurs="unbounded" />
+			<element name="SASnote" minOccurs="1" maxOccurs="unbounded" />
+				<!-- SASnote is a free-form element.
+					Do not define any content for it or it will become restrictive.
+				-->
+		</sequence>
+		<attribute name="name" type="string" use="optional" default="" />
+	</complexType>
+
+	<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+	<complexType name="SASrootType">
+		<sequence>
+			<element name="SASentry" minOccurs="1" maxOccurs="unbounded" type="tns:SASentryType" />
+		</sequence>
+		<attribute name="version" type="string" fixed="1.1" use="required" />
+	</complexType>
+
+	<element name="SASroot" type="tns:SASrootType" />
+
+</schema>
Index: test/sansdataloader/test/cansas1d_units.xml
===================================================================
--- test/sansdataloader/test/cansas1d_units.xml	(revision eda89725afadff916f49a3a51d5823023263ff33)
+++ test/sansdataloader/test/cansas1d_units.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -11,5 +11,5 @@
 		<SASdata>
 			<Idata>
-				<Q unit="1/nm">0.002</Q>
+				<Q unit="1/nm">0.2</Q>
 				<I unit="1/nm">0.0001</I>
 				<Idev unit="1/nm">.0000003</Idev>
Index: test/sansdataloader/test/isis_1_1_write_test.xml
===================================================================
--- test/sansdataloader/test/isis_1_1_write_test.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ test/sansdataloader/test/isis_1_1_write_test.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -0,0 +1,3520 @@
+<?xml version="1.0" ?>
+<SASroot version="1.1" xmlns="urn:cansas1d:1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:cansas1d:1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd">
+	<SASentry>
+		<Title>
+			TK49 c10_SANS
+		</Title>
+		<Run>
+			79680
+		</Run>
+		<SASdata>
+			<Idata>
+				<Q unit="1/A">
+					0.009
+				</Q>
+				<I unit="1/cm">
+					85.3333
+				</I>
+				<Idev unit="1/cm">
+					0.852491
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.011
+				</Q>
+				<I unit="1/cm">
+					72.5398
+				</I>
+				<Idev unit="1/cm">
+					0.639548
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.013
+				</Q>
+				<I unit="1/cm">
+					63.3582
+				</I>
+				<Idev unit="1/cm">
+					0.494127
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.015
+				</Q>
+				<I unit="1/cm">
+					57.0952
+				</I>
+				<Idev unit="1/cm">
+					0.414116
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.017
+				</Q>
+				<I unit="1/cm">
+					51.0139
+				</I>
+				<Idev unit="1/cm">
+					0.35145
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.019
+				</Q>
+				<I unit="1/cm">
+					46.4746
+				</I>
+				<Idev unit="1/cm">
+					0.308755
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.021
+				</Q>
+				<I unit="1/cm">
+					41.7191
+				</I>
+				<Idev unit="1/cm">
+					0.271641
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.023
+				</Q>
+				<I unit="1/cm">
+					37.4208
+				</I>
+				<Idev unit="1/cm">
+					0.244658
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.025
+				</Q>
+				<I unit="1/cm">
+					33.7352
+				</I>
+				<Idev unit="1/cm">
+					0.219594
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.027
+				</Q>
+				<I unit="1/cm">
+					30.6073
+				</I>
+				<Idev unit="1/cm">
+					0.203138
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.029
+				</Q>
+				<I unit="1/cm">
+					27.7309
+				</I>
+				<Idev unit="1/cm">
+					0.185859
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.031
+				</Q>
+				<I unit="1/cm">
+					25.2579
+				</I>
+				<Idev unit="1/cm">
+					0.171356
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.033
+				</Q>
+				<I unit="1/cm">
+					22.7712
+				</I>
+				<Idev unit="1/cm">
+					0.159062
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.035
+				</Q>
+				<I unit="1/cm">
+					20.5323
+				</I>
+				<Idev unit="1/cm">
+					0.146135
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.037
+				</Q>
+				<I unit="1/cm">
+					19.0744
+				</I>
+				<Idev unit="1/cm">
+					0.136393
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.039
+				</Q>
+				<I unit="1/cm">
+					17.2832
+				</I>
+				<Idev unit="1/cm">
+					0.127623
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.041
+				</Q>
+				<I unit="1/cm">
+					15.7399
+				</I>
+				<Idev unit="1/cm">
+					0.118288
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.043
+				</Q>
+				<I unit="1/cm">
+					14.5598
+				</I>
+				<Idev unit="1/cm">
+					0.111759
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.045
+				</Q>
+				<I unit="1/cm">
+					13.5906
+				</I>
+				<Idev unit="1/cm">
+					0.105148
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.047
+				</Q>
+				<I unit="1/cm">
+					12.6707
+				</I>
+				<Idev unit="1/cm">
+					0.0996579
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.049
+				</Q>
+				<I unit="1/cm">
+					11.5247
+				</I>
+				<Idev unit="1/cm">
+					0.0929646
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.051
+				</Q>
+				<I unit="1/cm">
+					10.7089
+				</I>
+				<Idev unit="1/cm">
+					0.0888575
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.053
+				</Q>
+				<I unit="1/cm">
+					10.1436
+				</I>
+				<Idev unit="1/cm">
+					0.0849394
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.055
+				</Q>
+				<I unit="1/cm">
+					9.49446
+				</I>
+				<Idev unit="1/cm">
+					0.0811205
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.057
+				</Q>
+				<I unit="1/cm">
+					8.80775
+				</I>
+				<Idev unit="1/cm">
+					0.0773967
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.059
+				</Q>
+				<I unit="1/cm">
+					8.33366
+				</I>
+				<Idev unit="1/cm">
+					0.0748147
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.061
+				</Q>
+				<I unit="1/cm">
+					7.79157
+				</I>
+				<Idev unit="1/cm">
+					0.0720107
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.063
+				</Q>
+				<I unit="1/cm">
+					7.25902
+				</I>
+				<Idev unit="1/cm">
+					0.0693582
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.065
+				</Q>
+				<I unit="1/cm">
+					7.04789
+				</I>
+				<Idev unit="1/cm">
+					0.0677591
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.067
+				</Q>
+				<I unit="1/cm">
+					6.53311
+				</I>
+				<Idev unit="1/cm">
+					0.0652207
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.069
+				</Q>
+				<I unit="1/cm">
+					6.2453
+				</I>
+				<Idev unit="1/cm">
+					0.0642016
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.071
+				</Q>
+				<I unit="1/cm">
+					5.94152
+				</I>
+				<Idev unit="1/cm">
+					0.0625768
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.073
+				</Q>
+				<I unit="1/cm">
+					5.70816
+				</I>
+				<Idev unit="1/cm">
+					0.0612955
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.075
+				</Q>
+				<I unit="1/cm">
+					5.24449
+				</I>
+				<Idev unit="1/cm">
+					0.060141
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.077
+				</Q>
+				<I unit="1/cm">
+					5.08291
+				</I>
+				<Idev unit="1/cm">
+					0.0582239
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.079
+				</Q>
+				<I unit="1/cm">
+					4.88135
+				</I>
+				<Idev unit="1/cm">
+					0.057969
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.081
+				</Q>
+				<I unit="1/cm">
+					4.60942
+				</I>
+				<Idev unit="1/cm">
+					0.056813
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.083
+				</Q>
+				<I unit="1/cm">
+					4.46606
+				</I>
+				<Idev unit="1/cm">
+					0.0569381
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.085
+				</Q>
+				<I unit="1/cm">
+					4.32473
+				</I>
+				<Idev unit="1/cm">
+					0.0558766
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.087
+				</Q>
+				<I unit="1/cm">
+					4.14144
+				</I>
+				<Idev unit="1/cm">
+					0.0552525
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.089
+				</Q>
+				<I unit="1/cm">
+					3.86504
+				</I>
+				<Idev unit="1/cm">
+					0.0544569
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.091
+				</Q>
+				<I unit="1/cm">
+					3.74272
+				</I>
+				<Idev unit="1/cm">
+					0.0529596
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.093
+				</Q>
+				<I unit="1/cm">
+					3.68281
+				</I>
+				<Idev unit="1/cm">
+					0.052891
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.095
+				</Q>
+				<I unit="1/cm">
+					3.46991
+				</I>
+				<Idev unit="1/cm">
+					0.0517565
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.097
+				</Q>
+				<I unit="1/cm">
+					3.37244
+				</I>
+				<Idev unit="1/cm">
+					0.0509328
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.099
+				</Q>
+				<I unit="1/cm">
+					3.27074
+				</I>
+				<Idev unit="1/cm">
+					0.0505183
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.101
+				</Q>
+				<I unit="1/cm">
+					3.13326
+				</I>
+				<Idev unit="1/cm">
+					0.0490847
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.103
+				</Q>
+				<I unit="1/cm">
+					3.01387
+				</I>
+				<Idev unit="1/cm">
+					0.0487012
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.105
+				</Q>
+				<I unit="1/cm">
+					2.87628
+				</I>
+				<Idev unit="1/cm">
+					0.0484307
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.107
+				</Q>
+				<I unit="1/cm">
+					2.85043
+				</I>
+				<Idev unit="1/cm">
+					0.0476786
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.109
+				</Q>
+				<I unit="1/cm">
+					2.72799
+				</I>
+				<Idev unit="1/cm">
+					0.0475526
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.111
+				</Q>
+				<I unit="1/cm">
+					2.61206
+				</I>
+				<Idev unit="1/cm">
+					0.0467475
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.113
+				</Q>
+				<I unit="1/cm">
+					2.58895
+				</I>
+				<Idev unit="1/cm">
+					0.0469767
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.115
+				</Q>
+				<I unit="1/cm">
+					2.45987
+				</I>
+				<Idev unit="1/cm">
+					0.0460139
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.117
+				</Q>
+				<I unit="1/cm">
+					2.37723
+				</I>
+				<Idev unit="1/cm">
+					0.045272
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.119
+				</Q>
+				<I unit="1/cm">
+					2.34122
+				</I>
+				<Idev unit="1/cm">
+					0.0453741
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.121
+				</Q>
+				<I unit="1/cm">
+					2.21745
+				</I>
+				<Idev unit="1/cm">
+					0.0444485
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.123
+				</Q>
+				<I unit="1/cm">
+					2.12646
+				</I>
+				<Idev unit="1/cm">
+					0.0438385
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.125
+				</Q>
+				<I unit="1/cm">
+					2.11264
+				</I>
+				<Idev unit="1/cm">
+					0.0441662
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.127
+				</Q>
+				<I unit="1/cm">
+					2.07523
+				</I>
+				<Idev unit="1/cm">
+					0.0438979
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.129
+				</Q>
+				<I unit="1/cm">
+					2.03548
+				</I>
+				<Idev unit="1/cm">
+					0.0442422
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.131
+				</Q>
+				<I unit="1/cm">
+					1.92452
+				</I>
+				<Idev unit="1/cm">
+					0.0435959
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.133
+				</Q>
+				<I unit="1/cm">
+					1.90866
+				</I>
+				<Idev unit="1/cm">
+					0.0437401
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.135
+				</Q>
+				<I unit="1/cm">
+					1.91252
+				</I>
+				<Idev unit="1/cm">
+					0.0443163
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.137
+				</Q>
+				<I unit="1/cm">
+					1.80405
+				</I>
+				<Idev unit="1/cm">
+					0.043466
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.139
+				</Q>
+				<I unit="1/cm">
+					1.72166
+				</I>
+				<Idev unit="1/cm">
+					0.0429246
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.141
+				</Q>
+				<I unit="1/cm">
+					1.67199
+				</I>
+				<Idev unit="1/cm">
+					0.042469
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.143
+				</Q>
+				<I unit="1/cm">
+					1.63282
+				</I>
+				<Idev unit="1/cm">
+					0.0430074
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.145
+				</Q>
+				<I unit="1/cm">
+					1.63712
+				</I>
+				<Idev unit="1/cm">
+					0.0438557
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.147
+				</Q>
+				<I unit="1/cm">
+					1.5862
+				</I>
+				<Idev unit="1/cm">
+					0.0434135
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.149
+				</Q>
+				<I unit="1/cm">
+					1.56121
+				</I>
+				<Idev unit="1/cm">
+					0.0432591
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.151
+				</Q>
+				<I unit="1/cm">
+					1.49764
+				</I>
+				<Idev unit="1/cm">
+					0.0426577
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.153
+				</Q>
+				<I unit="1/cm">
+					1.53828
+				</I>
+				<Idev unit="1/cm">
+					0.0446481
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.155
+				</Q>
+				<I unit="1/cm">
+					1.47366
+				</I>
+				<Idev unit="1/cm">
+					0.0441973
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.157
+				</Q>
+				<I unit="1/cm">
+					1.40582
+				</I>
+				<Idev unit="1/cm">
+					0.0430461
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.159
+				</Q>
+				<I unit="1/cm">
+					1.40491
+				</I>
+				<Idev unit="1/cm">
+					0.0439883
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.161
+				</Q>
+				<I unit="1/cm">
+					1.34639
+				</I>
+				<Idev unit="1/cm">
+					0.044193
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.163
+				</Q>
+				<I unit="1/cm">
+					1.32238
+				</I>
+				<Idev unit="1/cm">
+					0.0438008
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.165
+				</Q>
+				<I unit="1/cm">
+					1.33885
+				</I>
+				<Idev unit="1/cm">
+					0.0445383
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.167
+				</Q>
+				<I unit="1/cm">
+					1.29608
+				</I>
+				<Idev unit="1/cm">
+					0.0451575
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.169
+				</Q>
+				<I unit="1/cm">
+					1.30562
+				</I>
+				<Idev unit="1/cm">
+					0.0460656
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.171
+				</Q>
+				<I unit="1/cm">
+					1.17147
+				</I>
+				<Idev unit="1/cm">
+					0.0435717
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.173
+				</Q>
+				<I unit="1/cm">
+					1.18565
+				</I>
+				<Idev unit="1/cm">
+					0.0449072
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.175
+				</Q>
+				<I unit="1/cm">
+					1.18944
+				</I>
+				<Idev unit="1/cm">
+					0.0465319
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.177
+				</Q>
+				<I unit="1/cm">
+					1.17055
+				</I>
+				<Idev unit="1/cm">
+					0.0456562
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.179
+				</Q>
+				<I unit="1/cm">
+					1.08571
+				</I>
+				<Idev unit="1/cm">
+					0.0453852
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.181
+				</Q>
+				<I unit="1/cm">
+					1.06208
+				</I>
+				<Idev unit="1/cm">
+					0.0463335
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.183
+				</Q>
+				<I unit="1/cm">
+					1.06187
+				</I>
+				<Idev unit="1/cm">
+					0.0458284
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.185
+				</Q>
+				<I unit="1/cm">
+					1.02727
+				</I>
+				<Idev unit="1/cm">
+					0.0472613
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.187
+				</Q>
+				<I unit="1/cm">
+					0.995169
+				</I>
+				<Idev unit="1/cm">
+					0.0465526
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.189
+				</Q>
+				<I unit="1/cm">
+					1.02569
+				</I>
+				<Idev unit="1/cm">
+					0.0483728
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.191
+				</Q>
+				<I unit="1/cm">
+					0.981154
+				</I>
+				<Idev unit="1/cm">
+					0.0490559
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.193
+				</Q>
+				<I unit="1/cm">
+					1.01831
+				</I>
+				<Idev unit="1/cm">
+					0.0502348
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.195
+				</Q>
+				<I unit="1/cm">
+					0.968102
+				</I>
+				<Idev unit="1/cm">
+					0.0504426
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.197
+				</Q>
+				<I unit="1/cm">
+					0.940656
+				</I>
+				<Idev unit="1/cm">
+					0.0512734
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.199
+				</Q>
+				<I unit="1/cm">
+					1.05762
+				</I>
+				<Idev unit="1/cm">
+					0.0547469
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.201
+				</Q>
+				<I unit="1/cm">
+					0.949872
+				</I>
+				<Idev unit="1/cm">
+					0.055229
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.203
+				</Q>
+				<I unit="1/cm">
+					0.891716
+				</I>
+				<Idev unit="1/cm">
+					0.0531346
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.205
+				</Q>
+				<I unit="1/cm">
+					0.876084
+				</I>
+				<Idev unit="1/cm">
+					0.0548681
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.207
+				</Q>
+				<I unit="1/cm">
+					0.932101
+				</I>
+				<Idev unit="1/cm">
+					0.0576812
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.209
+				</Q>
+				<I unit="1/cm">
+					0.927755
+				</I>
+				<Idev unit="1/cm">
+					0.0593404
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.211
+				</Q>
+				<I unit="1/cm">
+					0.87669
+				</I>
+				<Idev unit="1/cm">
+					0.0600369
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.213
+				</Q>
+				<I unit="1/cm">
+					0.809125
+				</I>
+				<Idev unit="1/cm">
+					0.0588107
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.215
+				</Q>
+				<I unit="1/cm">
+					0.941202
+				</I>
+				<Idev unit="1/cm">
+					0.0659121
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.217
+				</Q>
+				<I unit="1/cm">
+					0.946175
+				</I>
+				<Idev unit="1/cm">
+					0.0690784
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.219
+				</Q>
+				<I unit="1/cm">
+					0.859875
+				</I>
+				<Idev unit="1/cm">
+					0.0674435
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.221
+				</Q>
+				<I unit="1/cm">
+					0.959508
+				</I>
+				<Idev unit="1/cm">
+					0.0718856
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.223
+				</Q>
+				<I unit="1/cm">
+					0.763222
+				</I>
+				<Idev unit="1/cm">
+					0.0702866
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.225
+				</Q>
+				<I unit="1/cm">
+					0.785467
+				</I>
+				<Idev unit="1/cm">
+					0.0742144
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.227
+				</Q>
+				<I unit="1/cm">
+					0.81876
+				</I>
+				<Idev unit="1/cm">
+					0.074266
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.229
+				</Q>
+				<I unit="1/cm">
+					0.678311
+				</I>
+				<Idev unit="1/cm">
+					0.0722578
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.231
+				</Q>
+				<I unit="1/cm">
+					0.761442
+				</I>
+				<Idev unit="1/cm">
+					0.0814516
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.233
+				</Q>
+				<I unit="1/cm">
+					0.757076
+				</I>
+				<Idev unit="1/cm">
+					0.0825262
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.235
+				</Q>
+				<I unit="1/cm">
+					0.600636
+				</I>
+				<Idev unit="1/cm">
+					0.075041
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.237
+				</Q>
+				<I unit="1/cm">
+					0.685635
+				</I>
+				<Idev unit="1/cm">
+					0.0842392
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.239
+				</Q>
+				<I unit="1/cm">
+					0.799186
+				</I>
+				<Idev unit="1/cm">
+					0.0974365
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.241
+				</Q>
+				<I unit="1/cm">
+					0.737526
+				</I>
+				<Idev unit="1/cm">
+					0.0957286
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.243
+				</Q>
+				<I unit="1/cm">
+					0.716415
+				</I>
+				<Idev unit="1/cm">
+					0.0970448
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.245
+				</Q>
+				<I unit="1/cm">
+					0.720413
+				</I>
+				<Idev unit="1/cm">
+					0.0981996
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.247
+				</Q>
+				<I unit="1/cm">
+					0.604059
+				</I>
+				<Idev unit="1/cm">
+					0.100869
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.249
+				</Q>
+				<I unit="1/cm">
+					0.649073
+				</I>
+				<Idev unit="1/cm">
+					0.109281
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.251
+				</Q>
+				<I unit="1/cm">
+					0.700691
+				</I>
+				<Idev unit="1/cm">
+					0.114325
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.253
+				</Q>
+				<I unit="1/cm">
+					0.586789
+				</I>
+				<Idev unit="1/cm">
+					0.108324
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.255
+				</Q>
+				<I unit="1/cm">
+					0.765838
+				</I>
+				<Idev unit="1/cm">
+					0.139579
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.257
+				</Q>
+				<I unit="1/cm">
+					0.828968
+				</I>
+				<Idev unit="1/cm">
+					0.156723
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.259
+				</Q>
+				<I unit="1/cm">
+					0.616499
+				</I>
+				<Idev unit="1/cm">
+					0.137866
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.261
+				</Q>
+				<I unit="1/cm">
+					0.526011
+				</I>
+				<Idev unit="1/cm">
+					0.126209
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.263
+				</Q>
+				<I unit="1/cm">
+					0.51277
+				</I>
+				<Idev unit="1/cm">
+					0.126339
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.265
+				</Q>
+				<I unit="1/cm">
+					0.604189
+				</I>
+				<Idev unit="1/cm">
+					0.166393
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.267
+				</Q>
+				<I unit="1/cm">
+					0.738765
+				</I>
+				<Idev unit="1/cm">
+					0.194006
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.269
+				</Q>
+				<I unit="1/cm">
+					0.462803
+				</I>
+				<Idev unit="1/cm">
+					0.155354
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.271
+				</Q>
+				<I unit="1/cm">
+					0.478694
+				</I>
+				<Idev unit="1/cm">
+					0.171676
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.273
+				</Q>
+				<I unit="1/cm">
+					0.711983
+				</I>
+				<Idev unit="1/cm">
+					0.255539
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.275
+				</Q>
+				<I unit="1/cm">
+					0.473304
+				</I>
+				<Idev unit="1/cm">
+					0.230752
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.277
+				</Q>
+				<I unit="1/cm">
+					0.536817
+				</I>
+				<Idev unit="1/cm">
+					0.262627
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.279
+				</Q>
+				<I unit="1/cm">
+					0.660654
+				</I>
+				<Idev unit="1/cm">
+					0.297519
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.281
+				</Q>
+				<I unit="1/cm">
+					0.408902
+				</I>
+				<Idev unit="1/cm">
+					0.24585
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+			<Idata>
+				<Q unit="1/A">
+					0.283
+				</Q>
+				<I unit="1/cm">
+					0.0
+				</I>
+				<Idev unit="1/cm">
+					0.0
+				</Idev>
+				<Qdev unit="1/A">
+					0.0
+				</Qdev>
+			</Idata>
+		</SASdata>
+		<SAStransmission_spectrum>
+			<Tdata>
+				<Lambda unit="A">
+					2.2385
+				</Lambda>
+				<T unit="none">
+					0.81703
+				</T>
+				<Tdev unit="none">
+					0.0130497
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.31685
+				</Lambda>
+				<T unit="none">
+					0.801978
+				</T>
+				<Tdev unit="none">
+					0.0120051
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.39794
+				</Lambda>
+				<T unit="none">
+					0.782436
+				</T>
+				<Tdev unit="none">
+					0.0112577
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.48186
+				</Lambda>
+				<T unit="none">
+					0.795586
+				</T>
+				<Tdev unit="none">
+					0.01104
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.56873
+				</Lambda>
+				<T unit="none">
+					0.794175
+				</T>
+				<Tdev unit="none">
+					0.0107071
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.65864
+				</Lambda>
+				<T unit="none">
+					0.807059
+				</T>
+				<Tdev unit="none">
+					0.010757
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.75169
+				</Lambda>
+				<T unit="none">
+					0.797216
+				</T>
+				<Tdev unit="none">
+					0.0106204
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.848
+				</Lambda>
+				<T unit="none">
+					0.811763
+				</T>
+				<Tdev unit="none">
+					0.0107288
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.94768
+				</Lambda>
+				<T unit="none">
+					0.805778
+				</T>
+				<Tdev unit="none">
+					0.0105482
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.05085
+				</Lambda>
+				<T unit="none">
+					0.787672
+				</T>
+				<Tdev unit="none">
+					0.0103436
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.15763
+				</Lambda>
+				<T unit="none">
+					0.804061
+				</T>
+				<Tdev unit="none">
+					0.0105877
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.26814
+				</Lambda>
+				<T unit="none">
+					0.799089
+				</T>
+				<Tdev unit="none">
+					0.0105895
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.38253
+				</Lambda>
+				<T unit="none">
+					0.810401
+				</T>
+				<Tdev unit="none">
+					0.0109026
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.50092
+				</Lambda>
+				<T unit="none">
+					0.797859
+				</T>
+				<Tdev unit="none">
+					0.0108399
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.62345
+				</Lambda>
+				<T unit="none">
+					0.801003
+				</T>
+				<Tdev unit="none">
+					0.0110517
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.75027
+				</Lambda>
+				<T unit="none">
+					0.78509
+				</T>
+				<Tdev unit="none">
+					0.0110209
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.88153
+				</Lambda>
+				<T unit="none">
+					0.785537
+				</T>
+				<Tdev unit="none">
+					0.0111882
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.01738
+				</Lambda>
+				<T unit="none">
+					0.758743
+				</T>
+				<Tdev unit="none">
+					0.0110145
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.15799
+				</Lambda>
+				<T unit="none">
+					0.767664
+				</T>
+				<Tdev unit="none">
+					0.0110323
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.30352
+				</Lambda>
+				<T unit="none">
+					0.772965
+				</T>
+				<Tdev unit="none">
+					0.0110456
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.45414
+				</Lambda>
+				<T unit="none">
+					0.773616
+				</T>
+				<Tdev unit="none">
+					0.0109689
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.61004
+				</Lambda>
+				<T unit="none">
+					0.72275
+				</T>
+				<Tdev unit="none">
+					0.0106718
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.77139
+				</Lambda>
+				<T unit="none">
+					0.754627
+				</T>
+				<Tdev unit="none">
+					0.0107276
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.93839
+				</Lambda>
+				<T unit="none">
+					0.759325
+				</T>
+				<Tdev unit="none">
+					0.0105454
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.11123
+				</Lambda>
+				<T unit="none">
+					0.7544
+				</T>
+				<Tdev unit="none">
+					0.0106594
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.29012
+				</Lambda>
+				<T unit="none">
+					0.75748
+				</T>
+				<Tdev unit="none">
+					0.0107767
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.47528
+				</Lambda>
+				<T unit="none">
+					0.746847
+				</T>
+				<Tdev unit="none">
+					0.0107133
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.66691
+				</Lambda>
+				<T unit="none">
+					0.740591
+				</T>
+				<Tdev unit="none">
+					0.0109161
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.86525
+				</Lambda>
+				<T unit="none">
+					0.752582
+				</T>
+				<Tdev unit="none">
+					0.0113942
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.07054
+				</Lambda>
+				<T unit="none">
+					0.733384
+				</T>
+				<Tdev unit="none">
+					0.0114788
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.28301
+				</Lambda>
+				<T unit="none">
+					0.740944
+				</T>
+				<Tdev unit="none">
+					0.0120655
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.50291
+				</Lambda>
+				<T unit="none">
+					0.731187
+				</T>
+				<Tdev unit="none">
+					0.0119684
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.73051
+				</Lambda>
+				<T unit="none">
+					0.72167
+				</T>
+				<Tdev unit="none">
+					0.0125797
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.96608
+				</Lambda>
+				<T unit="none">
+					0.720803
+				</T>
+				<Tdev unit="none">
+					0.0135324
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					7.2099
+				</Lambda>
+				<T unit="none">
+					0.704751
+				</T>
+				<Tdev unit="none">
+					0.0140129
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					7.46224
+				</Lambda>
+				<T unit="none">
+					0.700147
+				</T>
+				<Tdev unit="none">
+					0.014837
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					7.72342
+				</Lambda>
+				<T unit="none">
+					0.707843
+				</T>
+				<Tdev unit="none">
+					0.015985
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					7.99374
+				</Lambda>
+				<T unit="none">
+					0.68084
+				</T>
+				<Tdev unit="none">
+					0.0167449
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.27352
+				</Lambda>
+				<T unit="none">
+					0.690755
+				</T>
+				<Tdev unit="none">
+					0.0181648
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.56309
+				</Lambda>
+				<T unit="none">
+					0.695218
+				</T>
+				<Tdev unit="none">
+					0.0197214
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.8628
+				</Lambda>
+				<T unit="none">
+					0.663369
+				</T>
+				<Tdev unit="none">
+					0.0205081
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					9.173
+				</Lambda>
+				<T unit="none">
+					0.656758
+				</T>
+				<Tdev unit="none">
+					0.0219522
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					9.49406
+				</Lambda>
+				<T unit="none">
+					0.668971
+				</T>
+				<Tdev unit="none">
+					0.0248015
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					9.82867
+				</Lambda>
+				<T unit="none">
+					0.643715
+				</T>
+				<Tdev unit="none">
+					0.0263197
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.0
+				</Lambda>
+				<T unit="none">
+					-3.78577e-270
+				</T>
+				<Tdev unit="none">
+					-8.61157999735e-315
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					-1.24052e-265
+				</Lambda>
+				<T unit="none">
+					0.0130497
+				</T>
+				<Tdev unit="none">
+					3919.89
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.22902e-151
+				</Lambda>
+				<T unit="none">
+					0.0120051
+				</T>
+				<Tdev unit="none">
+					4462.63
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.22902e-151
+				</Lambda>
+				<T unit="none">
+					0.0112577
+				</T>
+				<Tdev unit="none">
+					4830.61
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.18146e+15
+				</Lambda>
+				<T unit="none">
+					0.01104
+				</T>
+				<Tdev unit="none">
+					5193.21
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.18146e+15
+				</Lambda>
+				<T unit="none">
+					0.0107071
+				</T>
+				<Tdev unit="none">
+					5501.58
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.83244494916e-320
+				</Lambda>
+				<T unit="none">
+					0.010757
+				</T>
+				<Tdev unit="none">
+					5628.96
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.82009e-73
+				</Lambda>
+				<T unit="none">
+					0.0106204
+				</T>
+				<Tdev unit="none">
+					5634.75
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.86436e+126
+				</Lambda>
+				<T unit="none">
+					0.0107288
+				</T>
+				<Tdev unit="none">
+					5724.73
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.43127e+247
+				</Lambda>
+				<T unit="none">
+					0.0105482
+				</T>
+				<Tdev unit="none">
+					5835.49
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.43127e+247
+				</Lambda>
+				<T unit="none">
+					0.0103436
+				</T>
+				<Tdev unit="none">
+					5798.97
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					-2.37127e+226
+				</Lambda>
+				<T unit="none">
+					0.0105877
+				</T>
+				<Tdev unit="none">
+					5767.32
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.86442e+126
+				</Lambda>
+				<T unit="none">
+					0.0105895
+				</T>
+				<Tdev unit="none">
+					5694.24
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.52737e-309
+				</Lambda>
+				<T unit="none">
+					0.0109026
+				</T>
+				<Tdev unit="none">
+					5525.05
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.46672e-310
+				</Lambda>
+				<T unit="none">
+					0.0108399
+				</T>
+				<Tdev unit="none">
+					5417.49
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.66641e+178
+				</Lambda>
+				<T unit="none">
+					0.0110517
+				</T>
+				<Tdev unit="none">
+					5253.01
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.66641e+178
+				</Lambda>
+				<T unit="none">
+					0.0110209
+				</T>
+				<Tdev unit="none">
+					5074.68
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.62375e+211
+				</Lambda>
+				<T unit="none">
+					0.0111882
+				</T>
+				<Tdev unit="none">
+					4929.65
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.62375e+211
+				</Lambda>
+				<T unit="none">
+					0.0110145
+				</T>
+				<Tdev unit="none">
+					4745.3
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.03531e-87
+				</Lambda>
+				<T unit="none">
+					0.0110323
+				</T>
+				<Tdev unit="none">
+					4841.86
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.97389e-39
+				</Lambda>
+				<T unit="none">
+					0.0110456
+				</T>
+				<Tdev unit="none">
+					4897.12
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.97389e-39
+				</Lambda>
+				<T unit="none">
+					0.0109689
+				</T>
+				<Tdev unit="none">
+					4974.21
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.18818e-212
+				</Lambda>
+				<T unit="none">
+					0.0106718
+				</T>
+				<Tdev unit="none">
+					4586.67
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.38734e+245
+				</Lambda>
+				<T unit="none">
+					0.0107276
+				</T>
+				<Tdev unit="none">
+					4948.31
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.38734e+245
+				</Lambda>
+				<T unit="none">
+					0.0105454
+				</T>
+				<Tdev unit="none">
+					5184.8
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					-1.81729e+131
+				</Lambda>
+				<T unit="none">
+					0.0106594
+				</T>
+				<Tdev unit="none">
+					5008.83
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					-1.81729e+131
+				</Lambda>
+				<T unit="none">
+					0.0107767
+				</T>
+				<Tdev unit="none">
+					4940.5
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.44115e-232
+				</Lambda>
+				<T unit="none">
+					0.0107133
+				</T>
+				<Tdev unit="none">
+					4859.81
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					6.44115e-232
+				</Lambda>
+				<T unit="none">
+					0.0109161
+				</T>
+				<Tdev unit="none">
+					4602.81
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.36995e+245
+				</Lambda>
+				<T unit="none">
+					0.0113942
+				</T>
+				<Tdev unit="none">
+					4362.55
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.36995e+245
+				</Lambda>
+				<T unit="none">
+					0.0114788
+				</T>
+				<Tdev unit="none">
+					4081.97
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.9782e-39
+				</Lambda>
+				<T unit="none">
+					0.0120655
+				</T>
+				<Tdev unit="none">
+					3771.18
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.83667e-73
+				</Lambda>
+				<T unit="none">
+					0.0119684
+				</T>
+				<Tdev unit="none">
+					3732.39
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.74941e+64
+				</Lambda>
+				<T unit="none">
+					0.0125797
+				</T>
+				<Tdev unit="none">
+					3291.09
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.74941e+64
+				</Lambda>
+				<T unit="none">
+					0.0135324
+				</T>
+				<Tdev unit="none">
+					2837.17
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					-1.81729e+131
+				</Lambda>
+				<T unit="none">
+					0.0140129
+				</T>
+				<Tdev unit="none">
+					2529.37
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					-1.81729e+131
+				</Lambda>
+				<T unit="none">
+					0.014837
+				</T>
+				<Tdev unit="none">
+					2226.82
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.40721e-280
+				</Lambda>
+				<T unit="none">
+					0.015985
+				</T>
+				<Tdev unit="none">
+					1960.88
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.40721e-280
+				</Lambda>
+				<T unit="none">
+					0.0167449
+				</T>
+				<Tdev unit="none">
+					1653.2
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.84467e+19
+				</Lambda>
+				<T unit="none">
+					0.0181648
+				</T>
+				<Tdev unit="none">
+					1446.05
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					5.67321e+216
+				</Lambda>
+				<T unit="none">
+					0.0197214
+				</T>
+				<Tdev unit="none">
+					1242.7
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.49371e+245
+				</Lambda>
+				<T unit="none">
+					0.0205081
+				</T>
+				<Tdev unit="none">
+					1046.31
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.49371e+245
+				</Lambda>
+				<T unit="none">
+					0.0219522
+				</T>
+				<Tdev unit="none">
+					895.069
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.69054e+192
+				</Lambda>
+				<T unit="none">
+					0.0248015
+				</T>
+				<Tdev unit="none">
+					727.543
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.62169e+211
+				</Lambda>
+				<T unit="none">
+					0.0263197
+				</T>
+				<Tdev unit="none">
+					598.171
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.62169e+211
+				</Lambda>
+				<T unit="none">
+					-8.61157999735e-315
+				</T>
+				<Tdev unit="none">
+					-8.61157999735e-315
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.74996e-68
+				</Lambda>
+				<T unit="none">
+					3919.89
+				</T>
+				<Tdev unit="none">
+					2.2385
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.75213e-78
+				</Lambda>
+				<T unit="none">
+					4462.63
+				</T>
+				<Tdev unit="none">
+					2.31685
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					-3.14338999988e-315
+				</Lambda>
+				<T unit="none">
+					4830.61
+				</T>
+				<Tdev unit="none">
+					2.39794
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.08255e-226
+				</Lambda>
+				<T unit="none">
+					5193.21
+				</T>
+				<Tdev unit="none">
+					2.48186
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07499e+102
+				</Lambda>
+				<T unit="none">
+					5501.58
+				</T>
+				<Tdev unit="none">
+					2.56873
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07499e+102
+				</Lambda>
+				<T unit="none">
+					5628.96
+				</T>
+				<Tdev unit="none">
+					2.65864
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07508e+102
+				</Lambda>
+				<T unit="none">
+					5634.75
+				</T>
+				<Tdev unit="none">
+					2.75169
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07508e+102
+				</Lambda>
+				<T unit="none">
+					5724.73
+				</T>
+				<Tdev unit="none">
+					2.848
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.81253e-303
+				</Lambda>
+				<T unit="none">
+					5835.49
+				</T>
+				<Tdev unit="none">
+					2.94768
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.35808e-312
+				</Lambda>
+				<T unit="none">
+					5798.97
+				</T>
+				<Tdev unit="none">
+					3.05085
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07513e+102
+				</Lambda>
+				<T unit="none">
+					5767.32
+				</T>
+				<Tdev unit="none">
+					3.15763
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07513e+102
+				</Lambda>
+				<T unit="none">
+					5694.24
+				</T>
+				<Tdev unit="none">
+					3.26814
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.38310999756e-315
+				</Lambda>
+				<T unit="none">
+					5525.05
+				</T>
+				<Tdev unit="none">
+					3.38253
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.52703999979e-316
+				</Lambda>
+				<T unit="none">
+					5417.49
+				</T>
+				<Tdev unit="none">
+					3.50092
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					5253.01
+				</T>
+				<Tdev unit="none">
+					3.62345
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					5074.68
+				</T>
+				<Tdev unit="none">
+					3.75027
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					4929.65
+				</T>
+				<Tdev unit="none">
+					3.88153
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.54615999709e-315
+				</Lambda>
+				<T unit="none">
+					4745.3
+				</T>
+				<Tdev unit="none">
+					4.01738
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.54615999709e-315
+				</Lambda>
+				<T unit="none">
+					4841.86
+				</T>
+				<Tdev unit="none">
+					4.15799
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.71357e+104
+				</Lambda>
+				<T unit="none">
+					4897.12
+				</T>
+				<Tdev unit="none">
+					4.30352
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.72432e+104
+				</Lambda>
+				<T unit="none">
+					4974.21
+				</T>
+				<Tdev unit="none">
+					4.45414
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.15015e+102
+				</Lambda>
+				<T unit="none">
+					4586.67
+				</T>
+				<Tdev unit="none">
+					4.61004
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07508e+102
+				</Lambda>
+				<T unit="none">
+					4948.31
+				</T>
+				<Tdev unit="none">
+					4.77139
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.53040999951e-315
+				</Lambda>
+				<T unit="none">
+					5184.8
+				</T>
+				<Tdev unit="none">
+					4.93839
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					5008.83
+				</T>
+				<Tdev unit="none">
+					5.11123
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					4940.5
+				</T>
+				<Tdev unit="none">
+					5.29012
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.00379e-270
+				</Lambda>
+				<T unit="none">
+					4859.81
+				</T>
+				<Tdev unit="none">
+					5.47528
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					2.00379e-270
+				</Lambda>
+				<T unit="none">
+					4602.81
+				</T>
+				<Tdev unit="none">
+					5.66691
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.58351e-312
+				</Lambda>
+				<T unit="none">
+					4362.55
+				</T>
+				<Tdev unit="none">
+					5.86525
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.7472e-287
+				</Lambda>
+				<T unit="none">
+					4081.97
+				</T>
+				<Tdev unit="none">
+					6.07054
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.74845e-287
+				</Lambda>
+				<T unit="none">
+					3771.18
+				</T>
+				<Tdev unit="none">
+					6.28301
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.24882e-290
+				</Lambda>
+				<T unit="none">
+					3732.39
+				</T>
+				<Tdev unit="none">
+					6.50291
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					3291.09
+				</T>
+				<Tdev unit="none">
+					6.73051
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					2837.17
+				</T>
+				<Tdev unit="none">
+					6.96608
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					2529.37
+				</T>
+				<Tdev unit="none">
+					7.2099
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					2226.82
+				</T>
+				<Tdev unit="none">
+					7.46224
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					1.07499e+102
+				</Lambda>
+				<T unit="none">
+					1960.88
+				</T>
+				<Tdev unit="none">
+					7.72342
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.32977e-311
+				</Lambda>
+				<T unit="none">
+					1653.2
+				</T>
+				<Tdev unit="none">
+					7.99374
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					7.19961e-310
+				</Lambda>
+				<T unit="none">
+					1446.05
+				</T>
+				<Tdev unit="none">
+					8.27352
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					7.19962e-310
+				</Lambda>
+				<T unit="none">
+					1242.7
+				</T>
+				<Tdev unit="none">
+					8.56309
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					8.2010700122e-316
+				</Lambda>
+				<T unit="none">
+					1046.31
+				</T>
+				<Tdev unit="none">
+					8.8628
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.18298999973e-314
+				</Lambda>
+				<T unit="none">
+					895.069
+				</T>
+				<Tdev unit="none">
+					9.173
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					7.42699000005e-314
+				</Lambda>
+				<T unit="none">
+					727.543
+				</T>
+				<Tdev unit="none">
+					9.49406
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					4.24398999993e-314
+				</Lambda>
+				<T unit="none">
+					598.171
+				</T>
+				<Tdev unit="none">
+					9.82867
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.16202013338e-322
+				</Lambda>
+				<T unit="none">
+					-8.61157999735e-315
+				</T>
+				<Tdev unit="none">
+					-3.78577e-270
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					2.2385
+				</T>
+				<Tdev unit="none">
+					0.00307782
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					0.0
+				</Lambda>
+				<T unit="none">
+					2.31685
+				</T>
+				<Tdev unit="none">
+					0.00300224
+				</Tdev>
+			</Tdata>
+			<Tdata>
+				<Lambda unit="A">
+					3.53040999951e-315
+				</Lambda>
+				<T unit="none">
+					2.39794
+				</T>
+				<Tdev unit="none">
+					0.00292546
+				</Tdev>
+			</Tdata>
+		</SAStransmission_spectrum>
+		<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 name="svn">
+				2.5.3
+			</term>
+			<term name="user_file">
+				K:/masks/MASKLOQ_MAN_132E_Lu_Banjo_12mm.txt
+			</term>
+			<SASprocessnote>
+				
+			</SASprocessnote>
+		</SASprocess>
+		<SASnote>
+			
+		</SASnote>
+	</SASentry>
+</SASroot>
Index: test/sansdataloader/test/test_log.txt
===================================================================
--- test/sansdataloader/test/test_log.txt	(revision eda89725afadff916f49a3a51d5823023263ff33)
+++ test/sansdataloader/test/test_log.txt	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -1,5 +1,5 @@
-2013-12-13 14:02:18,947 DEBUG Inside testLoad module
-2013-12-13 14:02:19,323 INFO Danse_reader Reading MP_New.sans 
+2013-12-20 15:51:09,931 DEBUG Inside testLoad module
+2013-12-20 15:51:10,296 INFO Danse_reader Reading MP_New.sans 
 
-2013-12-13 14:02:19,381 INFO Danse_reader Reading P_New.sans 
+2013-12-20 15:51:10,348 INFO Danse_reader Reading P_New.sans 
 
Index: test/sansdataloader/test/utest_abs_reader.py
===================================================================
--- test/sansdataloader/test/utest_abs_reader.py	(revision eda89725afadff916f49a3a51d5823023263ff33)
+++ test/sansdataloader/test/utest_abs_reader.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -159,10 +159,8 @@
     
     def setUp(self):
-        self.data = Loader().load("cansas1d.xml")
-        if isinstance(self.data, list):
-            self.data = self.data[0]
+        data = Loader().load("cansas1d.xml")
+        self.data = data[0]
  
     def test_cansas_checkdata(self):
-        print "\rtest_cansas_checkdata"
         self.assertEqual(self.data.filename, "cansas1d.xml")
         self._checkdata()
@@ -212,6 +210,6 @@
 
         self.assertEqual(self.data.sample.orientation_unit, 'degree')
-        self.assertEqual(self.data.sample.orientation.x, 22.5)
-        self.assertEqual(self.data.sample.orientation.y, 0.02)
+        self.assertAlmostEqual(self.data.sample.orientation.x, 22.5, 6)
+        self.assertAlmostEqual(self.data.sample.orientation.y, 0.02, 6)
 
         self.assertEqual(self.data.sample.details[0], "http://chemtools.chem.soton.ac.uk/projects/blog/blogs.php/bit_id/2720") 
@@ -250,8 +248,4 @@
             self.assertEqual(item.size_unit,'mm')
             self.assertEqual(item.distance_unit,'mm')
-            print "size.x = {0}".format(item.size.x)
-            print "distance = {0}".format(item.distance)
-            print "name = {0}".format(item.name)
-            print "type = {0}".format(item.type)
             
             if item.size.x==50 \
@@ -266,5 +260,4 @@
                 
         if _found1==False or _found2==False:
-            print item.distance
             raise RuntimeError, "Could not find all data %s %s" % (_found1, _found2) 
             
@@ -275,5 +268,5 @@
         
         self.assertEqual(self.data.detector[0].orientation_unit, "degree")
-        self.assertEqual(self.data.detector[0].orientation.x, 1.0)
+        self.assertAlmostEqual(self.data.detector[0].orientation.x, 1.0, 6)
         self.assertEqual(self.data.detector[0].orientation.y, 0.0)
         self.assertEqual(self.data.detector[0].orientation.z, 0.0)
@@ -318,5 +311,4 @@
         
     def test_writer(self):
-        print "\rtest_writer"
         from sans.dataloader.readers.cansas_reader import Reader
         r = Reader()
@@ -327,5 +319,6 @@
         filename = "write_test.xml"
         r.write(filename, self.data)
-        self.data = Loader().load(filename)[0]
+        data = Loader().load(filename)
+        self.data = data[0]
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
@@ -336,9 +329,7 @@
             Note that not all units are available.
         """
-        print "\rtest_units"
         filename = "cansas1d_units.xml"
-        self.data = Loader().load(filename)
-        if isinstance(self.data, list):
-            self.data = self.data[0]
+        data = Loader().load(filename)
+        self.data = data[0]
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
@@ -349,9 +340,7 @@
             Note that not all units are available.
         """
-        print "\rtest_badunits"
         filename = "cansas1d_badunits.xml"
-        self.data = Loader().load(filename)
-        if isinstance(self.data, list):
-            self.data = self.data[0]
+        data = Loader().load(filename)
+        self.data = data[0]
         self.assertEqual(self.data.filename, filename)
         # The followed should not have been loaded
@@ -368,9 +357,7 @@
             Check slit data
         """
-        print "\rtest_slits"
         filename = "cansas1d_slit.xml"
-        self.data = Loader().load(filename)
-        if isinstance(self.data, list):
-            self.data = self.data[0]
+        data = Loader().load(filename)
+        self.data = data[0]
         self.assertEqual(self.data.filename, filename)
         self.assertEqual(self.data.run[0], "1234")
@@ -378,5 +365,4 @@
         # Data
         self.assertEqual(len(self.data.x), 2)
-        print self.data.x
         self.assertEqual(self.data.x_unit, '1/A')
         self.assertEqual(self.data.y_unit, '1/cm')
@@ -392,7 +378,7 @@
         self.assertEqual(self.data.dxw[1], 0.001)
         self.assertEqual(self.data.dy[1], 4)
-        # self.assertEqual(self.data.run_name['1234'], 'run name')
+        self.assertEqual(self.data.run_name['1234'], 'run name')
         self.assertEqual(self.data.title, "Test title")
-
+        
             
 
Index: test/sansdataloader/test/utest_cansas.py
===================================================================
--- test/sansdataloader/test/utest_cansas.py	(revision eda89725afadff916f49a3a51d5823023263ff33)
+++ test/sansdataloader/test/utest_cansas.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -21,14 +21,7 @@
 from lxml import etree
 import xml.dom.minidom
-_ZERO = 1e-16
-HAS_CONVERTER = True
-try:
-    from data_util.nxsunit import Converter
-except:
-    HAS_CONVERTER = False
  
 CANSAS_FORMAT = cansasConstants.CANSAS_FORMAT
 CANSAS_NS = cansasConstants.CANSAS_NS
-ALLOW_ALL = True
     
 class cansas_reader(unittest.TestCase):
@@ -48,4 +41,5 @@
         self.schema_1_0 = "cansas1d_v1_0.xsd"
         self.schema_1_1 = "cansas1d_v1_1.xsd"
+        
     
     def get_number_of_entries(self, dictionary, name, i):
@@ -56,4 +50,5 @@
             name = self.get_number_of_entries(dictionary, name, i)
         return name
+    
 
     def test_xml_validate(self):
@@ -74,4 +69,5 @@
         self.assertFalse(xmlschema.validate(invalid))
         
+        
     def test_real_xml(self):
         reader = XMLreader(self.xml_valid, self.schema_1_0)
@@ -81,6 +77,8 @@
         else:
             self.assertFalse(valid)
+            
         
     def test_cansas_xml(self):
+        filename = "isis_1_1_write_test.xml"
         xmlreader = XMLreader(self.isis_1_1, self.schema_1_1)
         valid = xmlreader.validateXML()
@@ -91,6 +89,15 @@
             self.assertTrue(data.title == "TK49 c10_SANS")
             self.assertTrue(data.x.size == 138)
-            self.assertTrue(len(data.meta_data) == 417)
+            self.assertTrue(len(data.meta_data) == 2)
             self.assertTrue(data.detector[0].distance_unit == "mm")
+            reader.write(filename, data)
+            reader2 = Reader()
+            return_data = reader2.read(filename)
+            data_new = return_data
+            self.data = return_data[0]
+            self.assertTrue(self.data.x.size == 138)
+            self.assertTrue(len(self.data.meta_data) == 2)
+            self.assertTrue(self.data.detector[0].distance_unit == "mm")
+            self.assertTrue(self.data.title == "TK49 c10_SANS")
                     
     def test_entry_name_recurse(self):
@@ -102,4 +109,5 @@
             d[new_key] = value
         self.assertTrue(len(d) == 6)
+        
     
     def test_load_cansas_file(self):
@@ -119,4 +127,5 @@
         reader7 = XMLreader(self.isis_1_1, self.schema_1_0)
         self.assertFalse(reader7.validateXML())
+        
     
     def test_old_cansas_files(self):
Index: test/sansdataloader/test/write_test.xml
===================================================================
--- test/sansdataloader/test/write_test.xml	(revision eda89725afadff916f49a3a51d5823023263ff33)
+++ test/sansdataloader/test/write_test.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -16,7 +16,7 @@
 					1000.0
 				</I>
-                <Idev unit="1/cm">
-                    3.0
-                </Idev>
+				<Idev unit="1/cm">
+					3.0
+				</Idev>
 				<Qdev unit="1/A">
 					0.01
@@ -30,7 +30,7 @@
 					1001.0
 				</I>
-                <Idev unit="1/cm">
-                    4.0
-                </Idev>
+				<Idev unit="1/cm">
+					4.0
+				</Idev>
 				<Qdev unit="1/A">
 					0.02
@@ -51,20 +51,20 @@
 				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>
+			<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
@@ -82,12 +82,12 @@
 					neutron
 				</radiation>
-                <beam_size name="bm">
-                    <x unit="mm">
-                        12.0
-                    </x>
-                    <y unit="mm">
-                        13.0
-                    </y>
-                </beam_size>
+				<beam_size name="bm">
+					<x unit="mm">
+						12.0
+					</x>
+					<y unit="mm">
+						13.0
+					</y>
+				</beam_size>
 				<beam_shape>
 					disc
@@ -117,9 +117,9 @@
 					</size>
 					<distance unit="mm">
-                        11000
-                    </distance>
+						11000.0
+					</distance>
 				</aperture>
 				<aperture name="sample" type="radius">
-					<size name="size name">
+					<size>
 						<x unit="mm">
 							1.0
@@ -133,5 +133,5 @@
 				</name>
 				<SDD unit="mm">
-					4150
+					4150.0
 				</SDD>
 				<offset>
@@ -143,15 +143,15 @@
 					</y>
 				</offset>
-                <orientation>
-                    <roll unit="degree">
-                        1.0
-                    </roll>
-                    <pitch unit="degree">
-                        0.0
-                    </pitch>
-                    <yaw unit="degree">
-                        0.0
-                    </yaw>
-                </orientation>
+				<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">
@@ -195,13 +195,5 @@
 			</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>
@@ -246,7 +238,9 @@
 				1
 			</term>
-			<SASProcessnote />
+			<SASprocessnote>
+				
+			</SASprocessnote>
 		</SASprocess>
-		<SASnote />
+		<SASnote/>
 	</SASentry>
 </SASroot>
Index: test/sansdataloader/test_log.txt
===================================================================
--- test/sansdataloader/test_log.txt	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
+++ test/sansdataloader/test_log.txt	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -0,0 +1,3 @@
+2013-12-09 16:37:01,908 DEBUG Inside testLoad module
+2013-12-09 16:37:01,947 WARNING DataLoader couldn't locate DataLoader plugin folder. "C:\Users\jkrzywon\Desktop\eclipse\plugins\org.python.pydev_2.7.1.2012100913\../plugins" does not exist
+2013-12-09 16:37:01,950 WARNING DataLoader couldn't locate DataLoader plugin folder. "C:\Users\jkrzywon\Desktop\eclipse\plugins\org.python.pydev_2.7.1.2012100913\../plugins" does not exist
Index: test/sansguiframe/test/cansas1d.xml
===================================================================
--- test/sansguiframe/test/cansas1d.xml	(revision 5777106e8a4a0a62fe2ee0fbaf7c0aa19c0bb92b)
+++ test/sansguiframe/test/cansas1d.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -49,5 +49,5 @@
 			
 		</SASsample>
-		<SASinstrument name="TEST instrument">
+		<SASinstrument>
 			<name>canSAS instrument</name>
 			<SASsource name="source name">
@@ -85,13 +85,13 @@
 					4.150
 				</SDD>
-				<orientation>
+				<offset>
+                    <x unit="mm">1</x>
+                    <y unit="mm">2</y>
+                </offset>
+                <orientation>
 					<roll unit="degree">1.00</roll>
 					<pitch unit="degree">0.00</pitch>
 					<yaw unit="degree">0.00</yaw>
 				</orientation>
-				<offset>
-					<x unit="mm">1</x>
-					<y unit="mm">2</y>
-				</offset>
 				<beam_center>
 					<x unit="mm">322.64</x>
@@ -135,5 +135,5 @@
 			<term name="ABS:IZERO">230.09</term>
 			<term name="ABS:XSECT" unit="mm">1</term>
-			<SASprocessnote/>
+			<SASprocessnote>No Information</SASprocessnote>
 		</SASprocess>
 		<SASnote />
Index: test/sansguiframe/test/utest_manipulations.py
===================================================================
--- test/sansguiframe/test/utest_manipulations.py	(revision 5777106e8a4a0a62fe2ee0fbaf7c0aa19c0bb92b)
+++ test/sansguiframe/test/utest_manipulations.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -15,5 +15,6 @@
     
     def setUp(self):
-        self.data = Loader().load("cansas1d.xml")
+        data = Loader().load("cansas1d.xml")
+        self.data = data[0]
         
     def test_clone1D(self):
@@ -29,5 +30,6 @@
     
     def setUp(self):
-        self.data = Loader().load("cansas1d.xml")
+        data = Loader().load("cansas1d.xml")
+        self.data = data[0]
         
     def test_clone_theory1D(self):
Index: test/sansinvariant/test/utest_data_handling.py
===================================================================
--- test/sansinvariant/test/utest_data_handling.py	(revision 5777106e8a4a0a62fe2ee0fbaf7c0aa19c0bb92b)
+++ test/sansinvariant/test/utest_data_handling.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -92,5 +92,6 @@
     """
     def setUp(self):
-        self.data = Loader().load("latex_smeared_slit.xml")
+        data = Loader().load("latex_smeared_slit.xml")
+        self.data = data[0]
         self.data.dxl = None
         
Index: test/sansmodels/test/cansas1d_slit.xml
===================================================================
--- test/sansmodels/test/cansas1d_slit.xml	(revision 5777106e8a4a0a62fe2ee0fbaf7c0aa19c0bb92b)
+++ test/sansmodels/test/cansas1d_slit.xml	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -14,7 +14,7 @@
 				<I unit="1/cm">1000</I>
 				<Idev unit="1/cm">3</Idev>
+				<dQw unit="1/A">0.001</dQw>
 				<dQl unit="1/A">0.005</dQl>
-				<dQw unit="1/A">0.001</dQw>
-				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+                <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
 			</Idata>
 			<Idata>
@@ -22,7 +22,7 @@
 				<I unit="1/cm">1001</I>
 				<Idev unit="1/cm">4</Idev>
+				<dQw unit="1/A">0.001</dQw>
 				<dQl unit="1/A">0.005</dQl>
-				<dQw unit="1/A">0.001</dQw>
-				<Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
+                <Shadowfactor><!-- Shadowfactor is optional --></Shadowfactor>
 			</Idata>
 		</SASdata>
@@ -49,5 +49,5 @@
 			
 		</SASsample>
-		<SASinstrument name="TEST instrument">
+		<SASinstrument>
 			<name>canSAS instrument</name>
 			<SASsource name="source name">
@@ -85,13 +85,13 @@
 					4.150
 				</SDD>
-				<orientation>
+				<offset>
+                    <x unit="mm">1</x>
+                    <y unit="mm">2</y>
+                </offset>
+                <orientation>
 					<roll unit="degree">1.00</roll>
 					<pitch unit="degree">0.00</pitch>
 					<yaw unit="degree">0.00</yaw>
 				</orientation>
-				<offset>
-					<x unit="mm">1</x>
-					<y unit="mm">2</y>
-				</offset>
 				<beam_center>
 					<x unit="mm">322.64</x>
Index: test/sansmodels/test/utest_smearing.py
===================================================================
--- test/sansmodels/test/utest_smearing.py	(revision 5777106e8a4a0a62fe2ee0fbaf7c0aa19c0bb92b)
+++ test/sansmodels/test/utest_smearing.py	(revision 75eeb4259b6c50a745eb6eec9691323e3c4f077f)
@@ -16,5 +16,6 @@
     
     def setUp(self):
-        self.data = Loader().load("cansas1d_slit.xml")
+        data = Loader().load("cansas1d_slit.xml")
+        self.data = data[0]
         
         x = 0.001*numpy.arange(1,11)
