Changeset feec1cb in sasview for src/sas

Timestamp:

Sep 13, 2018 1:54:54 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:

9a0fc50

Parents:

2ca5d57b

Message:

Differentiate between scalars and arrays.

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (1 diff)
• sasgui/guiframe/gui_manager.py (modified) (2 diffs)

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

@@ -633 +633 @@
                 elif q_vals.attrs.get("uncertainty") is not None:
                     self.q_uncertainties = q_vals.attrs.get("uncertainty")
-                if isinstance(self.q_uncertainties, str) is not None:
-                    self.q_uncertainties = [self.q_uncertainties]
+                if isinstance(self.q_uncertainties, str):
+                    self.q_uncertainties = self.q_uncertainties.split(",")
                 if q_vals.attrs.get("resolutions") is not None:
                     self.q_resolutions = q_vals.attrs.get("resolutions")
-                if isinstance(self.q_resolutions, str):
+                if isinstance(self.q_resolutions, (str, unicode)):
                     self.q_resolutions = self.q_resolutions.split(",")
         if self.i_name in keys:

src/sas/sasgui/guiframe/gui_manager.py

@@ -2530 +2530 @@
             text += 'dY_min = %s:  dY_max = %s\n' % (min(data.dy), max(data.dy))
         text += '\nData Points:\n'
-        x_st = "X"
+        text += "<index> \t<X> \t<Y> \t<dY> \t<dX"
+        if data.dxl is not None and data.dxw is not None:
+                text += "l> \t<dxw"
+        text += ">\n"
         for index in range(len(data.x)):
             if data.dy is not None and len(data.dy) > index:
@@ -2541 +2544 @@
                 dx_val = 0.0
             if data.dxl is not None and len(data.dxl) > index:
-                if index == 0:
-                    x_st = "Xl"
                 dx_val = data.dxl[index]
-            elif data.dxw is not None and len(data.dxw) > index:
-                if index == 0:
-                    x_st = "Xw"
-                dx_val = data.dxw[index]
-
-            if index == 0:
-                text += "<index> \t<X> \t<Y> \t<dY> \t<d%s>\n" % x_st
+                if data.dxw is not None and len(data.dxw) > index:
+                    dx_val = "%s \t%s" % (data.dxl[index], data.dxw[index])
+
             text += "%s \t%s \t%s \t%s \t%s\n" % (index,
                                                   data.x[index],