Changeset 096181d in sasview

Timestamp:

Mar 7, 2017 3:47:21 PM (8 years ago)

Author:

krzywon

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

Children:

d5aff7f

Parents:

d85f1d8a

Message:

Coerce old custom pinhole smeared loaded from save states to q_min/dq_min. #850

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• pagestate.py (modified) (3 diffs)

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

@@ -1247 +1247 @@
             self.dx_percent = state.dx_percent
             if self.dx_percent is not None:
-                self.smear_pinhole_percent.SetValue(str(self.dx_percent))
+                if state.dx_old:
+                    self.dx_percent = self.data.x[0] / self.dx_percent
+                self.smear_pinhole_percent.SetValue("%.2f" % self.dx_percent)
             self.onPinholeSmear(event=None)
         elif self.slit_smearer.GetValue():

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

@@ -215 +215 @@
         self.dq_r = None
         self.dx_percent = None
+        self.dx_old = False
         self.dxl = None
         self.dxw = None
@@ -342 +343 @@
         obj.dq_r = copy.deepcopy(self.dq_r)
         obj.dx_percent = copy.deepcopy(self.dx_percent)
+        obj.dx_old = copy.deepcopy(self.dx_old)
         obj.dxl = copy.deepcopy(self.dxl)
         obj.dxw = copy.deepcopy(self.dxw)
@@ -1045 +1047 @@
 
                 for item in LIST_OF_STATE_ATTRIBUTES:
-                    try:
+                    node = get_content('ns:%s' % 'dx_min', entry)
+                    if item[0] == "dx_percent" and node is not None:
+                        dxmin = ["dx_min", "dx_percent", "float"]
+                        setattr(self, item[0], parse_entry_helper(node, dxmin))
+                        self.dx_old = True
+                    else:
                         node = get_content('ns:%s' % item[0], entry)
-                    except Exception as e:
-                        if item[0] == "dx_percent":
-                            msg = "Custom pinhole smearing has changed "
-                            msg += "as of v4.1.0. dx_min will be used to "
-                            msg += "calculate %Q for smearing purposes."
-                            logging.warning(msg)
-                            node = get_content('ns:%s' % 'dx_min', entry)
-                        else:
-                            msg = "Could not find node %s.\n" % item[0]
-                            msg += e.message
-                            logging.error(msg)
-                    setattr(self, item[0], parse_entry_helper(node, item))
+                        setattr(self, item[0], parse_entry_helper(node, item))
 
                 for item in LIST_OF_STATE_PARAMETERS: