Changeset aa82f54 in sasview for src/sas

Timestamp:

Sep 18, 2018 2:33:43 AM (6 years ago)

Author:

ibressler

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

16287f3

Parents:

db500cb

git-author:

Ingo Breßler <dev@…> (09/18/18 02:33:38)

git-committer:

Ingo Breßler <dev@…> (09/18/18 02:33:43)

Message:

plotPolydispersities(): use precalc. weights from SasviewModel?

• as suggested in #181
• injected SasviewModel?.get_weights()

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff)
• FittingWidget.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

@@ -577 +577 @@
     # test for model being a sasmodels.sasview_model.SasviewModel?
     for name, pars in model.dispersion.items():
-        if 0 == pars['width']:
-            continue # no actual polydispersity
-        disp_args = pars.copy()
-        disp_type = disp_args.pop('type', None)
-        if disp_type is None:
-            continue # show an error? "poly type ... not found"
-        disp_func = disp_models[disp_type](**disp_args)
-        center = model.params[name]
-        # same as in sasmodels.weights.Dispersion
-        lb = center - disp_args['nsigmas']*disp_args['width']*center
-        ub = center + disp_args['nsigmas']*disp_args['width']*center
-        arr = disp_func.get_weights(center, lb, ub, relative = True)
+        if 0 == pars['width']: # no actual polydispersity
+            continue
+        _, xarr, yarr = model.get_weights(name)
+        if xarr is None or yarr is None: # param name not found
+            continue
         # create Data1D as in residualsData1D() and fill x/y members
         # similar to FittingLogic._create1DPlot() but different data/axes
-        data1d = Data1D(x = arr[0], y = arr[1])
+        data1d = Data1D(x = xarr, y = yarr)
         xunit = ""
         if name in model.details and len(model.details[name]):

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -58 +58 @@
 DEFAULT_POLYDISP_FUNCTION = 'gaussian'
 
+# CRUFT: remove when new release of sasmodels is available
+# https://github.com/SasView/sasview/pull/181#discussion_r218135162
+from sasmodels.sasview_model import SasviewModel
+if not hasattr(SasviewModel, 'get_weights'):
+    def get_weights(self, name):
+        """Returns model weights by parameter name.
+        type: (str) -> Tuple(float, np.ndarray, np.ndarray)
+        Supposed to be a member of SasviewModel."""
+        p = [p for p in self._model_info.parameters.call_parameters
+                        if name is p.name]
+        if not len(p):
+            return None, None, None
+        return self._get_weights(p[0])
+
+    SasviewModel.get_weights = get_weights
 
 logger = logging.getLogger(__name__)