Changeset 81b35396 in sasview

Timestamp:

Jun 21, 2017 11:35:00 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

ba8d326

Parents:

00f7ff1

Message:

remove unused smearer/smear_type from saved state

Location:

src/sas

Files:

• sascalc/fit/pagestate.py (modified) (5 diffs)
• sasgui/perspectives/fitting/basepage.py (modified) (2 diffs)

src/sas/sascalc/fit/pagestate.py

@@ -74 +74 @@
                             ["cb1", "cb1", "bool"],
                             ["tcChi", "tcChi", "float"],
-                            ["smearer", "smearer", "float"],
-                            ["smear_type", "smear_type", "string"],
                             ["dq_l", "dq_l", "float"],
                             ["dq_r", "dq_r", "float"],
@@ -210 +208 @@
         # orientation parameters for gaussian dispersity
         self.orientation_params_disp = []
-        # smearer info
-        self.smearer = None
-        self.smear_type = None
         self.dq_l = None
         self.dq_r = None
@@ -336 +331 @@
         obj.pinhole_smearer = copy.deepcopy(self.pinhole_smearer)
         obj.slit_smearer = copy.deepcopy(self.slit_smearer)
-        obj.smear_type = copy.deepcopy(self.smear_type)
         obj.dI_noweight = copy.deepcopy(self.dI_noweight)
         obj.dI_didata = copy.deepcopy(self.dI_didata)
@@ -354 +348 @@
         obj.npts = copy.deepcopy(self.npts)
         obj.cb1 = copy.deepcopy(self.cb1)
-        obj.smearer = copy.deepcopy(self.smearer)
         obj.version = copy.deepcopy(self.version)
 
@@ -558 +551 @@
         rep += "All parameters checkbox selected: %s\n" % self.cb1
         rep += "Value of Chisqr : %s\n" % str(self.tcChi)
-        rep += "Smear object : %s\n" % self.smearer
-        rep += "Smear type : %s\n" % self.smear_type
         rep += "dq_l  : %s\n" % self.dq_l
         rep += "dq_r  : %s\n" % self.dq_r

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

@@ -889 +889 @@
             self.state.disable_disp = self.disable_disp.GetValue()
 
-        self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self, "enable_smearer"):
             self.state.enable_smearer = \
@@ -954 +953 @@
             self.state.disable_disp = self.disable_disp.GetValue()
 
-        self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self, "enable_smearer"):
             self.state.enable_smearer = \