Changeset 1686a333 in sasview

Timestamp:

Aug 18, 2016 3:33:37 PM (8 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57, 55bbe0b2

Parents:

250fec92

git-author:

Jeff Krzywon <krzywon@…> (08/18/16 15:33:37)

git-committer:

Jeff KRzywon <krzywon@…> (08/18/16 15:33:37)

Message:

Added compatibility with save/load projects and analysis.

Files:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (4 diffs)
• test/sasdataloader/test/utest_cansas.py (modified) (1 diff)

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

@@ -192 +192 @@
         """
 
+        frm = inspect.stack()[1]
+        if not self._is_call_local(frm):
+            self.reset_state()
+            self.add_data_set()
+            self.names.append("SASentry")
+            self.parent_class = "SASentry"
         self._check_for_empty_data()
         self.base_ns = "{0}{1}{2}".format("{", \
@@ -244 +250 @@
                 elif tagname == 'dQl':
                     self.current_dataset.dxl = np.append(self.current_dataset.dxl, data_point)
+                elif tagname == 'Qmean':
+                    pass
+                elif tagname == 'Shadowfactor':
+                    pass
 
                 ## Sample Information
@@ -409 +419 @@
                 length = len(self.names) - 1
             self.parent_class = self.names[length]
-
+        if not self._is_call_local(frm):
+            self.add_data_set()
+            empty = None
+            if self.output[0].dx is not None:
+                self.output[0].dxl = np.empty(0)
+                self.output[0].dxw = np.empty(0)
+            else:
+                self.output[0].dx = np.empty(0)
+            return self.output[0], empty
+
+
+    def _is_call_local(self, frm=""):
+        """
+
+        :return:
+        """
+        if frm == "":
+            frm = inspect.stack()[1]
+        mod_name = frm[1].replace("\\", "/").replace(".pyc", "")
+        mod_name = mod_name.replace(".py", "")
+        mod = mod_name.split("sas/")
+        mod_name = mod[1]
+        if mod_name != "sascalc/dataloader/readers/cansas_reader":
+            return False
+        return True
 
     def is_cansas(self, ext="xml"):
@@ -1148 +1182 @@
             self.write_node(node, "description", item.description)
             for term in item.term:
-                value = term['value']
-                del term['value']
+                if isinstance(term, list):
+                    value = term['value']
+                    del term['value']
+                else:
+                    value = term
                 self.write_node(node, "term", value, term)
             for note in item.notes:

test/sasdataloader/test/utest_cansas.py

@@ -176 +176 @@
         data = list[0]
         self.assertTrue(data.x.size == 2)
-        self.assertTrue(len(data.meta_data) == 3)
+        self.assertTrue(len(data.meta_data) == 2)
         self.assertTrue(len(data.errors) == 1)
         self.assertTrue(data.detector[0].distance_unit == "mm")