Changeset f0c569d in sasview for src/sas/sasgui

Timestamp:

Jan 8, 2019 4:48:15 PM (6 years ago)

Author:

butler

Branches:

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

Children:

722c425

Parents:

aa9928e

Message:

clean up dispaly of smearing value

2D smearing data was already presented in formatted form though with
only 3 sig figures. Added formatting to slit and pinhole 1D but with 5
sig figs. We should decide which looks better and make all the same.

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (3 diffs)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -1651 +1651 @@
         #If so check for pinhole vs slit by veryfing whehter dx or dxl or dxw
         #have data (currently sasview only supports either dx or dxl/dxw but
-        #not both simultaneously) and as, for 2D, are non zero .
+        #not both simultaneously) and, as for 2D, are non zero .
         #Otherwise no smearing can be applied using smear from data (a Gaussian
         #width of zero will cause a divide by zero error)
@@ -1660 +1660 @@
                 #report in % for display makes more sense than absolute value
                 #for pinhole smearing .. but keep old names of dq_l
-                self.dq_l = data.dx[0] / data.x[0] * 100
-                self.dq_r = data.dx[-1] / data.x[-1] * 100
+                self.dq_l = format_number(data.dx[0] / data.x[0] * 100,1)
+                self.dq_r = format_number(data.dx[-1] / data.x[-1] * 100,1)
             #If not, is it valid 1D slit resolution data?
             elif (data.dxl is not None or data.dxw is not None) \
@@ -1668 +1668 @@
                 #for slit units of 1/A make most sense
                 if data.dxl is not None and np.all(data.dxl, 0):
-                    self.dq_l = data.dxl[0]
+                    self.dq_l = format_number(data.dxl[0],1)
                 if data.dxw is not None and np.all(data.dxw, 0):
-                    self.dq_r = data.dxw[0]
+                    self.dq_r = format_number(data.dxw[0],1)
             #otherwise log that the data did not conatain resolution info
             else: