Changes in / [2ab812d:ed28d8c] in sasview

Location:

src/sas/sascalc/dataloader/readers

Files:

• cansas_reader.py (modified) (5 diffs)
• xml_reader.py (modified) (1 diff)

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -156 +156 @@
                     # If the file does not match the schema, raise this error
                     invalid_xml = self.find_invalid_xml()
-                    if invalid_xml != "":
-                        invalid_xml = INVALID_XML.format(basename + extension) + invalid_xml
-                        self.errors.add(invalid_xml)
+                    invalid_xml = INVALID_XML.format(basename + extension) + invalid_xml
+                    self.errors.add(invalid_xml)
                     # Try again with an invalid CanSAS schema, that requires only a data set in each
                     base_name = xml_reader.__file__
@@ -262 +261 @@
                 # I and Q - 1D data
                 elif tagname == 'I' and isinstance(self.current_dataset, plottable_1D):
-                    self.current_dataset.yaxis("Intensity", unit)
+                    unit_list = unit.split("|")
+                    if len(unit_list) > 1:
+                        self.current_dataset.yaxis(unit_list[0].strip(),
+                                                   unit_list[1].strip())
+                    else:
+                        self.current_dataset.yaxis("Intensity", unit)
                     self.current_dataset.y = np.append(self.current_dataset.y, data_point)
                 elif tagname == 'Idev' and isinstance(self.current_dataset, plottable_1D):
                     self.current_dataset.dy = np.append(self.current_dataset.dy, data_point)
                 elif tagname == 'Q':
-                    self.current_dataset.xaxis("Q", unit)
+                    unit_list = unit.split("|")
+                    if len(unit_list) > 1:
+                        self.current_dataset.xaxis(unit_list[0].strip(),
+                                                   unit_list[1].strip())
+                    else:
+                        self.current_dataset.xaxis("Q", unit)
                     self.current_dataset.x = np.append(self.current_dataset.x, data_point)
                 elif tagname == 'Qdev':
@@ -281 +290 @@
                 elif tagname == 'Sesans':
                     self.current_datainfo.isSesans = bool(data_point)
-                    self.current_dataset.xaxis(attr.get('x_axis'),
-                                                attr.get('x_unit'))
-                    self.current_dataset.yaxis(attr.get('y_axis'),
-                                                attr.get('y_unit'))
                 elif tagname == 'zacceptance':
                     self.current_datainfo.sample.zacceptance = (data_point, unit)
@@ -776 +781 @@
                     value_unit = local_unit
             except KeyError:
-                # Do not throw an error for loading Sesans data in cansas xml
-                # This is a temporary fix.
-                if local_unit != "A" and local_unit != 'pol':
-                    err_msg = "CanSAS reader: unexpected "
-                    err_msg += "\"{0}\" unit [{1}]; "
-                    err_msg = err_msg.format(tagname, local_unit)
-                    err_msg += "expecting [{0}]".format(default_unit)
+                err_msg = "CanSAS reader: unexpected "
+                err_msg += "\"{0}\" unit [{1}]; "
+                err_msg = err_msg.format(tagname, local_unit)
+                err_msg += "expecting [{0}]".format(default_unit)
                 value_unit = local_unit
             except:
@@ -1033 +1035 @@
             node.append(point)
             self.write_node(point, "Q", datainfo.x[i],
-                            {'unit': datainfo.x_unit})
+                            {'unit': datainfo._xaxis + " | " + datainfo._xunit})
             if len(datainfo.y) >= i:
                 self.write_node(point, "I", datainfo.y[i],
-                                {'unit': datainfo.y_unit})
+                                {'unit': datainfo._yaxis + " | " + datainfo._yunit})
             if datainfo.dy is not None and len(datainfo.dy) > i:
                 self.write_node(point, "Idev", datainfo.dy[i],
-                                {'unit': datainfo.y_unit})
+                                {'unit': datainfo._yaxis + " | " + datainfo._yunit})
             if datainfo.dx is not None and len(datainfo.dx) > i:
                 self.write_node(point, "Qdev", datainfo.dx[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xaxis + " | " + datainfo._xunit})
             if datainfo.dxw is not None and len(datainfo.dxw) > i:
                 self.write_node(point, "dQw", datainfo.dxw[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xaxis + " | " + datainfo._xunit})
             if datainfo.dxl is not None and len(datainfo.dxl) > i:
                 self.write_node(point, "dQl", datainfo.dxl[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xaxis + " | " + datainfo._xunit})
         if datainfo.isSesans:
-            sesans_attrib = {'x_axis': datainfo._xaxis,
-                             'y_axis': datainfo._yaxis,
-                             'x_unit': datainfo.x_unit,
-                             'y_unit': datainfo.y_unit}
-            sesans = self.create_element("Sesans", attrib=sesans_attrib)
+            sesans = self.create_element("Sesans")
             sesans.text = str(datainfo.isSesans)
-            entry_node.append(sesans)
-            self.write_node(entry_node, "zacceptance", datainfo.sample.zacceptance[0],
+            node.append(sesans)
+            self.write_node(node, "zacceptance", datainfo.sample.zacceptance[0],
                              {'unit': datainfo.sample.zacceptance[1]})
 

src/sas/sascalc/dataloader/readers/xml_reader.py

@@ -128 +128 @@
             first_error = schema.assertValid(self.xmldoc)
         except etree.DocumentInvalid as err:
-            # Suppress errors for <'any'> elements
-            if "##other" in str(err):
-                return first_error
             first_error = str(err)
         return first_error