Changeset 3c44c34 in sasmodels for sasmodels/weights.py

Timestamp:

Jan 12, 2018 9:46:11 AM (6 years ago)

Author:

dirk

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3d58247

Parents:

1ceb951 (diff), 4c08e69 (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.

Message:

Merge branch 'boltzmann' of ​https://github.com/SasView/sasmodels into boltzmann

File:

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

sasmodels/weights.py

@@ -81 +81 @@
 class GaussianDispersion(Dispersion):
     r"""
-    Gaussian dispersion, with 1-\ $\sigma$ width.
+    Gaussian dispersion, with 1-$\sigma$ width.
 
     .. math::
@@ -130 +130 @@
 class LogNormalDispersion(Dispersion):
     r"""
-    log Gaussian dispersion, with 1-\ $\sigma$ width.
+    log Gaussian dispersion, with 1-$\sigma$ width.
 
     .. math::
@@ -148 +148 @@
 class SchulzDispersion(Dispersion):
     r"""
-    Schultz dispersion, with 1-\ $\sigma$ width.
+    Schultz dispersion, with 1-$\sigma$ width.
 
     .. math::
@@ -255 +255 @@
     """
     if disperser == "array":
-        raise NotImplementedError("Don't handle arrays through get_weights; use values and weights directly")
+        raise NotImplementedError("Don't handle arrays through get_weights;"
+                                  " use values and weights directly")
     cls = MODELS[disperser]
     obj = cls(n, width, nsigmas)
@@ -275 +276 @@
     import pylab
 
-    if any(len(dispersity)>1 for value, dispersity, weights in mesh):
+    if any(len(dispersity) > 1 for value, dispersity, weights in mesh):
         labels = [p.name for p in model_info.parameters.call_parameters]
         #pylab.interactive(True)
         pylab.figure()
-        for (v,x,w), s in zip(mesh, labels):
+        for (v, x, w), s in zip(mesh, labels):
             if len(x) > 1:
                 pylab.plot(x, w, '-o', label=s)