Changeset d85f1d8a in sasview for src/sas/sasgui/perspectives/fitting/fitpage.py

Timestamp:

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

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (1 diff)

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