Changeset a99a4045 in sasview for src/sas

Timestamp:

Feb 10, 2017 3:58:33 PM (8 years ago)

Author:

krzywon

Children:

62acdd5

Parents:

2510b9b

Message:

Linearize 1D data in save states to improve save state loading times.

File:

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

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

@@ -209 +209 @@
             name = attr.get("name", "")
             type = attr.get("type", "")
+            unit = attr.get("unit", "")
             # Get the element name and set the current names level
             tagname = node.tag.replace(self.base_ns, "")
@@ -244 +245 @@
                 self.add_intermediate()
             else:
-                if isinstance(self.current_dataset, plottable_2D):
+                # 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.dql = np.append(
+                            self.current_dataset.dql, data_point)
+                elif tagname == 'Qmean':
+                    pass
+                elif tagname == 'Shadowfactor':
+                    pass
+                elif isinstance(self.current_dataset, plottable_2D):
                     data_point = node.text
                     unit = attr.get('unit', '')
                 else:
-                    data_point, unit = self._get_node_value(node, tagname)
+                    data_point, unit = self._get_node_value(node)
 
                 # If this is a dataset, store the data appropriately
@@ -258 +309 @@
                 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):
-                    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)
-                    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
 
                 # I and Qx, Qy - 2D data
@@ -677 +708 @@
         return name
 
-    def _get_node_value(self, node, tagname):
+    def _get_node_value_from_text(self, node, node_text):
+        """
+        Get the value of a node and any applicable units
+
+        :param node: The XML node to get the value of
+        :param tagname: The tagname of the node
+        """
+        units = ""
+        # If the value is a float, compile with units.
+        if self.ns_list.ns_datatype == "float":
+            # If an empty value is given, set as zero.
+            if node_text is None or node_text.isspace() \
+                    or node_text.lower() == "nan":
+                node_text = "0.0"
+            # Convert the value to the base units
+            tag = node.tag.replace(self.base_ns, "")
+            node_text, units = self._unit_conversion(node, tag, node_text)
+
+        # If the value is a timestamp, convert to a datetime object
+        elif self.ns_list.ns_datatype == "timestamp":
+            if node_text is None or node_text.isspace():
+                pass
+            else:
+                try:
+                    node_text = \
+                        datetime.datetime.fromtimestamp(node_text)
+                except ValueError:
+                    node_text = None
+        return node_text, units
+
+    def _get_node_value(self, node):
         """
         Get the value of a node and any applicable units
@@ -691 +752 @@
         else:
             node_value = ""
-
-        # If the value is a float, compile with units.
-        if self.ns_list.ns_datatype == "float":
-            # If an empty value is given, set as zero.
-            if node_value is None or node_value.isspace() \
-                                    or node_value.lower() == "nan":
-                node_value = "0.0"
-            #Convert the value to the base units
-            node_value, units = self._unit_conversion(node, tagname, node_value)
-
-        # If the value is a timestamp, convert to a datetime object
-        elif self.ns_list.ns_datatype == "timestamp":
-            if node_value is None or node_value.isspace():
-                pass
-            else:
-                try:
-                    node_value = \
-                        datetime.datetime.fromtimestamp(node_value)
-                except ValueError:
-                    node_value = None
+        node_value, units = self._get_node_value_from_text(node, node_value)
         return node_value, units
 
@@ -914 +956 @@
             self._write_data_2d(datainfo, entry_node)
         else:
-            self._write_data(datainfo, entry_node)
+            if self._check_root():
+                self._write_data(datainfo, entry_node)
+            else:
+                self._write_data_linearized(datainfo, entry_node)
         # Transmission Spectrum Info
         self._write_trans_spectrum(datainfo, entry_node)
@@ -1036 +1081 @@
                 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})
 
     def _write_data_2d(self, datainfo, entry_node):
@@ -1330 +1408 @@
                 {"unit": item.slit_length_unit})
 
-
     def _write_process_notes(self, datainfo, entry_node):
         """
@@ -1378 +1455 @@
                 self.append(node, entry_node)
 
-    def _check_origin(self, entry_node, doc):
+    def _check_root(self):
         """
         Return the document, and the SASentry node associated with
@@ -1394 +1471 @@
         mod = mod_name.split("sas/")
         mod_name = mod[1]
-        if mod_name != "sascalc/dataloader/readers/cansas_reader":
+        return mod_name == "sascalc/dataloader/readers/cansas_reader"
+
+    def _check_origin(self, entry_node, doc):
+        """
+        Return the document, and the SASentry node associated with
+        the data we just wrote.
+        If the calling function was not the cansas reader, return a minidom
+        object rather than an lxml object.
+
+        :param entry_node: lxml node ElementTree object to be appended to
+        :param doc: entire xml tree
+        """
+        if not self._check_root():
             string = self.to_string(doc, pretty_print=False)
             doc = parseString(string)