Changeset cb62bd5 in sasview for src/sas/sasgui

Timestamp:

Aug 4, 2017 4:22:51 AM (7 years ago)

Author:

lewis

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1abd19c

Parents:

a0e6b1b

Message:

Use manually inputted background level in Pr calculation

Location:

src/sas/sasgui/perspectives/pr

Files:

• inversion_panel.py (modified) (7 diffs)
• pr.py (modified) (10 diffs)

src/sas/sasgui/perspectives/pr/inversion_panel.py

@@ -73 +73 @@
         self.bck_est_ctl = None
         self.bck_man_ctl = None
-        self.has_bck = True
+        self.est_bck = True
         self.bck_input = None
         self.bck_ctl = None
@@ -330 +330 @@
 
         # Background evaluation checkbox
-        state.estimate_bck = self.has_bck
+        state.estimate_bck = self.est_bck
         state.bck_value = bck
 
@@ -382 +382 @@
             self.bck_input.Enable()
             self.bck_input.SetValue(str(state.bck_value))
-        self.has_bck = state.estimate_bck
+        self.est_bck = state.estimate_bck
         self.bck_value = state.bck_value
 
@@ -804 +804 @@
 
     def _on_bck_changed(self, evt=None):
-        self.has_bck = self.bck_est_ctl.GetValue()
-        if self.has_bck:
+        self.est_bck = self.bck_est_ctl.GetValue()
+        if self.est_bck:
             self.bck_input.Disable()
         else:
@@ -828 +828 @@
                                                       d_max=dmax,
                                                       q_min=qmin, q_max=qmax,
-                                                      bck=self.has_bck,
+                                                      est_bck=self.est_bck,
+                                                      bck_val=bck,
                                                       height=height,
                                                       width=width)
@@ -937 +938 @@
 
         # Read background
-        if not self.has_bck:
+        if not self.est_bck:
             try:
                 bck_str = self.bck_input.GetValue()
@@ -987 +988 @@
                                                    d_max=dmax,
                                                    q_min=qmin, q_max=qmax,
-                                                   bck=self.has_bck,
+                                                   est_bck=self.est_bck,
+                                                   bck_val = bck,
                                                    height=height,
                                                    width=width)

src/sas/sasgui/perspectives/pr/pr.py

@@ -68 +68 @@
         self.q_min = None
         self.q_max = None
-        self.has_bck = False
+        self.est_bck = False
+        self.bck_val = 0
         self.slit_height = 0
         self.slit_width = 0
@@ -828 +829 @@
         self.control_panel.iq0 = pr.iq0(out)
         self.control_panel.bck = pr.background
+        self.control_panel.bck_input.SetValue("{:.2g}".format(pr.background))
 
         # Show I(q) fit
@@ -907 +909 @@
 
     def setup_plot_inversion(self, alpha, nfunc, d_max, q_min=None, q_max=None,
-                             bck=False, height=0, width=0):
+                             est_bck=False, bck_val=0, height=0, width=0):
         """
             Set up inversion from plotted data
@@ -916 +918 @@
         self.q_min = q_min
         self.q_max = q_max
-        self.has_bck = bck
+        self.est_bck = est_bck
+        self.bck_val = bck_val
         self.slit_height = height
         self.slit_width = width
@@ -930 +933 @@
     def estimate_plot_inversion(self, alpha, nfunc, d_max,
                                 q_min=None, q_max=None,
-                                bck=False, height=0, width=0):
+                                est_bck=False, bck_val=0, height=0, width=0):
         """
             Estimate parameters from plotted data
@@ -939 +942 @@
         self.q_min = q_min
         self.q_max = q_max
-        self.has_bck = bck
+        self.est_bck = est_bck
+        self.bck_val = bck_val
         self.slit_height = height
         self.slit_width = width
@@ -973 +977 @@
         pr.x = self.current_plottable.x
         pr.y = self.current_plottable.y
-        pr.has_bck = self.has_bck
+        pr.est_bck = self.est_bck
         pr.slit_height = self.slit_height
         pr.slit_width = self.slit_width
+        pr.background = self.bck_val
 
         # Keep track of the plot window title to ensure that
@@ -1019 +1024 @@
         self.q_min = q_min
         self.q_max = q_max
-        self.has_bck = bck
+        self.est_bck = bck
         self.slit_height = height
         self.slit_width = width
@@ -1042 +1047 @@
         self.q_min = q_min
         self.q_max = q_max
-        self.has_bck = bck
+        self.est_bck = bck
         self.slit_height = height
         self.slit_width = width
@@ -1115 +1120 @@
             pr.y = y
             pr.err = err
-            pr.has_bck = self.has_bck
+            pr.est_bck = self.est_bck
             pr.slit_height = self.slit_height
             pr.slit_width = self.slit_width