Changeset a66b004 in sasmodels for sasmodels/weights.py

Timestamp:

Nov 30, 2017 12:30:08 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

34bbb9c

Parents:

26a6608 (diff), b669b49 (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 'master' into boltzmann

File:

• sasmodels/weights.py (modified) (6 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
 
+<<<<<<< HEAD
     if any(len(dispersity)>1 for value, dispersity, weights in mesh):
         labels = [p.name for p in model_info.parameters.call_parameters]
@@ -280 +282 @@
         pylab.figure()
         for (v,x,w), s in zip(mesh, labels):
+=======
+    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):
+>>>>>>> master
             if len(x) > 1:
                 pylab.plot(x, w, '-o', label=s)