Changeset d85f1d8a in sasview for src/sas

Timestamp:

Mar 7, 2017 3:15:13 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:

096181d

Parents:

7e98655

Message:

Saving and then loading in same save state working with custom pinhole dQ as a percentage. #850

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)
• pagestate.py (modified) (5 diffs)

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

@@ -1245 +1245 @@
         # we have two more options for smearing
         if self.pinhole_smearer.GetValue():
-            self.dx_percent = state.dx_max
+            self.dx_percent = state.dx_percent
             if self.dx_percent is not None:
-                self.smear_pinhole_max.SetValue(str(self.dx_percent))
+                self.smear_pinhole_percent.SetValue(str(self.dx_percent))
             self.onPinholeSmear(event=None)
         elif self.slit_smearer.GetValue():

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

@@ -2309 +2309 @@
             if len_data < 2:
                 len_data = 2
-            self.dx_percent = float(get_pin_percent.GetValue()) / 100
+            self.dx_percent = float(get_pin_percent.GetValue())
             if self.dx_percent < 0:
                 get_pin_percent.SetBackgroundColour("pink")
                 msg = "Model Error:This value can not be negative!!!"
             elif self.dx_percent is not None:
+                percent = self.dx_percent/100
                 if self._is_2D():
-                    data.dqx_data[data.dqx_data == 0] = \
-                        self.dx_percent * data.qx_data
-                    data.dqy_data[data.dqy_data == 0] = \
-                        self.dx_percent * data.qy_data
+                    data.dqx_data[data.dqx_data == 0] = percent * data.qx_data
+                    data.dqy_data[data.dqy_data == 0] = percent * data.qy_data
                 else:
-                    data.dx = self.dx_percent * data.x
+                    data.dx = percent * data.x
             self.current_smearer = smear_selection(data, self.model)
             # 2D need to set accuracy

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

@@ -74 +74 @@
                             ["dq_l", "dq_l", "float"],
                             ["dq_r", "dq_r", "float"],
-                            ["dx_max", "dx_max", "float"],
-                            ["dx_min", "dx_min", "float"],
+                            ["dx_percent", "dx_percent", "float"],
                             ["dxl", "dxl", "float"],
                             ["dxw", "dxw", "float"]]
@@ -215 +214 @@
         self.dq_l = None
         self.dq_r = None
-        self.dx_max = None
-        self.dx_min = None
+        self.dx_percent = None
         self.dxl = None
         self.dxw = None
@@ -343 +341 @@
         obj.dq_l = copy.deepcopy(self.dq_l)
         obj.dq_r = copy.deepcopy(self.dq_r)
-        obj.dx_max = copy.deepcopy(self.dx_max)
-        obj.dx_min = copy.deepcopy(self.dx_min)
+        obj.dx_percent = copy.deepcopy(self.dx_percent)
         obj.dxl = copy.deepcopy(self.dxl)
         obj.dxw = copy.deepcopy(self.dxw)
@@ -562 +559 @@
         rep += "dq_l  : %s\n" % self.dq_l
         rep += "dq_r  : %s\n" % self.dq_r
-        rep += "dx_max  : %s\n" % str(self.dx_max)
-        rep += "dx_min : %s\n" % str(self.dx_min)
+        rep += "dx_percent  : %s\n" % str(self.dx_percent)
         rep += "dxl  : %s\n" % str(self.dxl)
         rep += "dxw : %s\n" % str(self.dxw)
@@ -1049 +1045 @@
 
                 for item in LIST_OF_STATE_ATTRIBUTES:
-                    node = get_content('ns:%s' % item[0], entry)
+                    try:
+                        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))