Changeset cb62bd5 in sasview for src/sas/sasgui/perspectives/pr/inversion_panel.py

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

File:

• src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) (7 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)