Changeset 6cefbc9 in sasmodels

Timestamp:

Sep 27, 2016 9:52:00 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

9acade6

Parents:

9c1a59c

Message:

preserve order of distribution list; fix array distribution handling

File:

• sasmodels/weights.py (modified) (7 diffs)

sasmodels/weights.py

@@ -3 +3 @@
 """
 # TODO: include dispersion docs with the disperser models
+from __future__ import division, print_function
+
 from math import sqrt  # type: ignore
+from collections import OrderedDict
+
 import numpy as np  # type: ignore
 from scipy.special import gammaln  # type: ignore
@@ -54 +58 @@
             else:
                 return np.array([], 'd'), np.array([], 'd')
-        return self._weights(center, sigma, lb, ub)
+        x, px = self._weights(center, sigma, lb, ub)
+        return x, px
 
     def _weights(self, center, sigma, lb, ub):
@@ -79 +84 @@
     default = dict(npts=35, width=0, nsigmas=3)
     def _weights(self, center, sigma, lb, ub):
+        # TODO: sample high probability regions more densely
+        # i.e., step uniformly in cumulative density rather than x value
+        # so weight = 1/Npts for all weights, but values are unevenly spaced
         x = self._linspace(center, sigma, lb, ub)
         px = np.exp((x-center)**2 / (-2.0 * sigma * sigma))
@@ -165 +173 @@
 
     def _weights(self, center, sigma, lb, ub):
-        # TODO: interpolate into the array dispersion using npts
-        x = center + self.values*sigma
+        # TODO: rebin the array dispersion using npts
+        # TODO: use a distribution that can be recentered and scaled
+        x = self.values
+        #x = center + self.values*sigma
         idx = (x >= lb) & (x <= ub)
         x = x[idx]
@@ -174 +184 @@
 
 # dispersion name -> disperser lookup table.
-MODELS = dict((d.type, d) for d in (
-    GaussianDispersion, RectangleDispersion,
-    ArrayDispersion, SchulzDispersion, LogNormalDispersion
+# Maintain order since this is used by sasview GUI to order the options in
+# the dispersion type combobox.
+MODELS = OrderedDict((d.type, d) for d in (
+    RectangleDispersion,
+    ArrayDispersion,
+    LogNormalDispersion,
+    GaussianDispersion,
+    SchulzDispersion,
 ))
 
@@ -194 +209 @@
     *value* is the value of the parameter in the model.
 
-    *limits* is [lb, ub], the lower and upper bound of the weight value.
+    *limits* is [lb, ub], the lower and upper bound on the possible values.
 
     *relative* is true if *width* is defined in proportion to the value
@@ -201 +216 @@
     Returns *(value, weight)*, where *value* and *weight* are vectors.
     """
+    if disperser == "array":
+        raise NotImplementedError("Don't handle arrays through get_weights; use values and weights directly")
     cls = MODELS[disperser]
     obj = cls(n, width, nsigmas)
     v, w = obj.get_weights(value, limits[0], limits[1], relative)
     return v, w
+
+
+def plot_weights(model_info, pairs):
+    # type: (ModelInfo, List[Tuple[np.ndarray, np.ndarray]]) -> None
+    """
+    Plot the weights returned by :func:`get_weights`.
+
+    *model_info* is
+    :param model_info:
+    :param pairs:
+    :return:
+    """
+    import pylab
+
+    if any(len(values)>1 for values, weights in pairs):
+        labels = [p.name for p in model_info.parameters.call_parameters]
+        pylab.interactive(True)
+        pylab.figure()
+        for (v,w), s in zip(pairs, labels):
+            if len(v) > 1:
+                #print("weights for", s, v, w)
+                pylab.plot(v, w, '-o', label=s)
+        pylab.grid(True)
+        pylab.legend()