Changeset eccbf14 in sasview

Timestamp:

Jul 5, 2016 9:56:31 AM (8 years ago)

Author:

wojciech

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57, 3409a90

Parents:

6fb559d (diff), 7c1d04a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

wpotrzebowski <Wojciech.Potrzebowski@…> (07/05/16 04:03:13)

git-committer:

wpotrzebowski <Wojciech.Potrzebowski@…> (07/05/16 09:56:31)

Message:

Adding exception for reading the old custom models from plugin_models dir

Location:

src/sas/sasgui

Files:

• plottools/fitDialog.py (modified) (2 diffs)
• perspectives/fitting/models.py (modified) (2 diffs)

src/sas/sasgui/plottools/fitDialog.py

@@ -516 +516 @@
             if self.Rgerr_tctr.IsShown():
                 if rg != None and rg != 0:
-                    value = format_number(3 * float(cstA) / (2 * rg))
+                    value = format_number(3 * float(errA) / (2 * rg))
                 else:
                     value = ''
                 self.Rgerr_tctr.SetValue(value)
                 if self.I0err_tctr.IsShown():
-                    val = numpy.abs(numpy.exp(cstB) - numpy.exp(cstB + errB))
+                    val = numpy.abs(numpy.exp(cstB) * errB)
                     self.I0err_tctr.SetValue(format_number(val))
             if self.Diameter_tctr.IsShown():
@@ -534 +534 @@
                 self.Diametererr_tctr.SetValue(value)
             if self.RgQmin_tctr.IsShown():
-                value = format_number(rg * self.mini)
+                value = format_number(rg * self.floatInvTransform(self.mini))
                 self.RgQmin_tctr.SetValue(value)
             if self.RgQmax_tctr.IsShown():
-                value = format_number(rg * self.maxi)
+                value = format_number(rg * self.floatInvTransform(self.maxi))
                 self.RgQmax_tctr.SetValue(value)
 

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

@@ -181 +181 @@
             try:
                 model = load_custom_model(path)
+                plugins[model.name] = model
             except Exception:
                 msg = traceback.format_exc()
@@ -187 +188 @@
                 logging.warning("Failed to load plugin %r. See %s for details"
                                 % (path, PLUGIN_LOG))
-            plugins[model.name] = model
-
+            
     return plugins