Changeset 02c1608e in sasview

Timestamp:

Jul 9, 2018 4:02:07 PM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

369ed11d

Parents:

f5483ef

Message:

Allow for multiple Q resolutions/uncertainties for USANS data. refs #976

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (4 diffs)
• sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (1 diff)

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

@@ -105 +105 @@
         self.i_name = u''
         self.i_node = u''
-        self.q_uncertainties = u''
-        self.q_resolutions = u''
+        self.q_uncertainties = []
+        self.q_resolutions = []
         self.i_uncertainties = u''
         self.parent_class = u''
@@ -246 +246 @@
             else:
                 self.current_dataset.x = data_set.flatten()
-        elif key in self.q_resolutions:
-            if key == u'dQw':
+        elif key in self.q_uncertainties or key in self.q_resolutions:
+            if (len(self.q_resolutions) > 1
+                    and np.where(self.q_resolutions == key)[0] == 0):
                 self.current_dataset.dxw = data_set.flatten()
-            elif key == u'dQl':
+            elif (len(self.q_resolutions) > 1
+                  and np.where(self.q_resolutions == key)[0] == 1):
                 self.current_dataset.dxl = data_set.flatten()
             else:
@@ -553 +555 @@
         self.i_node = ""
         self.q_name = []
-        self.q_uncertainties = ""
-        self.q_resolutions = ""
+        self.q_uncertainties = []
+        self.q_resolutions = []
         self.i_uncertainties = ""
 
@@ -582 +584 @@
             if item in keys:
                 q_vals = value.get(item)
-                self.q_uncertainties = q_vals.attrs.get("uncertainties")
-                if self.q_uncertainties is None:
+                if q_vals.attrs.get("uncertainties"):
+                    self.q_uncertainties = q_vals.attrs.get("uncertainties")
+                elif q_vals.attrs.get("uncertainty"):
                     self.q_uncertainties = q_vals.attrs.get("uncertainty")
-                self.q_resolutions = q_vals.attrs.get("resolutions")
+                if isinstance(self.q_uncertainties, str):
+                    self.q_uncertainties = [self.q_uncertainties]
+                if q_vals.attrs.get("resolutions"):
+                    self.q_resolutions = q_vals.attrs.get("resolutions")
+                if isinstance(self.q_resolutions, str):
+                    self.q_resolutions = [self.q_resolutions]
         if self.i_name in keys:
             i_vals = value.get(self.i_name)

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -239 +239 @@
             self.load_complete(output=output, message="Loading data complete!",
                                info="info")
-        else:
-            self.load_complete(output=None, message=error_message, info="error")
 
     def load_update(self, message="", info="warning"):