Changeset 3d6c010 in sasview for src/sas/sascalc/dataloader/readers/cansas_reader.py

Timestamp:

Apr 5, 2017 5:40:56 AM (8 years ago)

Author:

Tim Snow <tim.snow@…>

Children:

a2573fc

Parents:

d619341 (diff), a2e980b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master into branch

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (4 diffs)

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

@@ -245 +245 @@
                 self.add_intermediate()
             else:
-                # I and Q - 1D data
-                if tagname == 'I' and isinstance(self.current_dataset,
-                                                   plottable_1D):
-                    self.current_dataset.yaxis("Intensity", unit)
-                    data_list = node.text.split(',')
-                    for item in data_list:
-                        data_point, unit = self._get_node_value_from_text(node,
-                                                                          item)
-                        self.current_dataset.y = np.append(
-                            self.current_dataset.y, data_point)
-                elif tagname == 'Idev' and isinstance(self.current_dataset,
-                                                      plottable_1D):
-                    data_list = node.text.split(',')
-                    for item in data_list:
-                        data_point, unit = self._get_node_value_from_text(node,
-                                                                          item)
-                        self.current_dataset.dy = np.append(
-                            self.current_dataset.dy, data_point)
-                elif tagname == 'Q':
-                    data_list = node.text.split(',')
-                    for item in data_list:
-                        data_point, unit = self._get_node_value_from_text(node,
-                                                                          item)
-                        self.current_dataset.x = np.append(
-                            self.current_dataset.x, data_point)
-                elif tagname == 'Qdev':
-                    data_list = node.text.split(',')
-                    for item in data_list:
-                        data_point, unit = self._get_node_value_from_text(node,
-                                                                          item)
-                        self.current_dataset.dx = np.append(
-                            self.current_dataset.dx, data_point)
-                elif tagname == 'dQw':
-                    data_list = node.text.split(',')
-                    for item in data_list:
-                        data_point, unit = self._get_node_value_from_text(node,
-                                                                          item)
-                        self.current_dataset.dqw = np.append(
-                            self.current_dataset.dqw, data_point)
-                elif tagname == 'dQl':
-                    data_list = node.text.split(',')
-                    for item in data_list:
-                        data_point, unit = self._get_node_value_from_text(node,
-                                                                          item)
-                        self.current_dataset.dxl = np.append(
-                            self.current_dataset.dxl, data_point)
-                elif tagname == 'Qmean':
-                    pass
-                elif tagname == 'Shadowfactor':
-                    pass
-                elif isinstance(self.current_dataset, plottable_2D):
+                if isinstance(self.current_dataset, plottable_2D):
                     data_point = node.text
                     unit = attr.get('unit', '')
@@ -309 +259 @@
                 elif tagname == 'SASnote':
                     self.current_datainfo.notes.append(data_point)
+
+                # I and Q - 1D data
+                elif tagname == 'I' and isinstance(self.current_dataset, plottable_1D):
+                    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':
+                    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':
+                    self.current_dataset.dx = np.append(self.current_dataset.dx, data_point)
+                elif tagname == 'dQw':
+                    self.current_dataset.dxw = np.append(self.current_dataset.dxw, data_point)
+                elif tagname == 'dQl':
+                    self.current_dataset.dxl = np.append(self.current_dataset.dxl, data_point)
+                elif tagname == 'Qmean':
+                    pass
+                elif tagname == 'Shadowfactor':
+                    pass
+                elif tagname == 'Sesans':
+                    self.current_datainfo.isSesans = bool(data_point)
+                elif tagname == 'zacceptance':
+                    self.current_datainfo.sample.zacceptance = (data_point, unit)
 
                 # I and Qx, Qy - 2D data
@@ -961 +945 @@
                 self._write_data_linearized(datainfo, entry_node)
         # Transmission Spectrum Info
-        self._write_trans_spectrum(datainfo, entry_node)
+        # TODO: fix the writer to linearize all data, including T_spectrum
+        # self._write_trans_spectrum(datainfo, entry_node)
         # Sample info
         self._write_sample_info(datainfo, entry_node)
@@ -1065 +1050 @@
             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})
-
-    def _write_data_linearized(self, datainfo, entry_node):
-        """
-        Writes 1D I and Q data to an XML file is a single Idata element
-
-        :param datainfo: The Data1D object the information is coming from
-        :param entry_node: lxml node ElementTree object to be appended to
-        """
-        node = self.create_element("SASdata")
-        self.append(node, entry_node)
-
-        point = self.create_element("Idata")
-        node.append(point)
-        x = ','.join([str(datainfo.x[i]) for i in xrange(len(datainfo.x))])
-        self.write_node(point, "Q", x, {'unit': datainfo.x_unit})
-        y = ','.join([str(datainfo.y[i]) for i in xrange(len(datainfo.y))])
-        self.write_node(point, "I", y, {'unit': datainfo.y_unit})
-        if datainfo.dy is not None:
-            dy = ','.join(
-                [str(datainfo.dy[i]) for i in xrange(len(datainfo.dy))])
-            self.write_node(point, "Idev", dy, {'unit': datainfo.y_unit})
-        if datainfo.dx is not None:
-            dx = ','.join(
-                [str(datainfo.dx[i]) for i in xrange(len(datainfo.dx))])
-            self.write_node(point, "Qdev", dx, {'unit': datainfo.x_unit})
-        if datainfo.dxw is not None:
-            dxw = ','.join(
-                [str(datainfo.dxw[i]) for i in xrange(len(datainfo.dxw))])
-            self.write_node(point, "dQw", dxw, {'unit': datainfo.x_unit})
-        if datainfo.dxl is not None:
-            dxl = ','.join(
-                [str(datainfo.dxl[i]) for i in xrange(len(datainfo.dxl))])
-            self.write_node(point, "dQl", dxl, {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xaxis + " | " + datainfo._xunit})
+        if datainfo.isSesans:
+            sesans = self.create_element("Sesans")
+            sesans.text = str(datainfo.isSesans)
+            node.append(sesans)
+            self.write_node(node, "zacceptance", datainfo.sample.zacceptance[0],
+                             {'unit': datainfo.sample.zacceptance[1]})
+
 
     def _write_data_2d(self, datainfo, entry_node):