Changeset 0db85af in sasmodels

Timestamp:

Oct 28, 2017 9:33:21 PM (7 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:

dd4d95d

Parents:

3d40839

git-author:

Paul Kienzle <pkienzle@…> (10/28/17 21:33:05)

git-committer:

Paul Kienzle <pkienzle@…> (10/28/17 21:33:21)

Message:

Now allowed '-' before and after '$', such as 1-$\sigma$ or $x$-$y$-$z$

Files:

• doc/guide/resolution.rst (modified) (3 diffs)
• explore/jitter.py (modified) (2 diffs)
• sasmodels/rst2html.py (modified) (2 diffs)
• sasmodels/weights.py (modified) (3 diffs)

doc/guide/resolution.rst

@@ -209 +209 @@
 $x'_0 = x_0 \cos(\theta) + y_0 \sin(\theta)$ and
 $y'_0 = -x_0 \sin(\theta) + y_0 \cos(\theta)$.
-Note that the rotation angle is zero for a $x$\ -\ $y$ symmetric
+Note that the rotation angle is zero for a $x$-$y$ symmetric
 elliptical Gaussian distribution. The $A$ is a normalization factor.
 
@@ -233 +233 @@
 
 Since the weighting factor on each of the bins is known, it is convenient to
-transform $x'$\ -\ $y'$ back to $x$\ -\ $y$ coordinates (by rotating it
+transform $x'$-$y'$ back to $x$-$y$ coordinates (by rotating it
 by $-\theta$ around the $z$\ -axis).
 
@@ -254 +254 @@
     y'_0 &= 0
 
-while for a $x$\ -\ $y$ symmetric smear
+while for a $x$-$y$ symmetric smear
 
 .. math::

explore/jitter.py

@@ -496 +496 @@
     # the maximum width to 90.
     dlimit = 30 if dist == 'gaussian' else 90/sqrt(3)
-    sdtheta = Slider(axdtheta, 'dTheta', 0, dlimit, valinit=dtheta)
+    sdtheta = Slider(axdtheta, 'dTheta', 0, 2*dlimit, valinit=dtheta)
     sdphi = Slider(axdphi, 'dPhi', 0, 2*dlimit, valinit=dphi)
     sdpsi = Slider(axdpsi, 'dPsi', 0, 2*dlimit, valinit=dpsi)
@@ -512 +512 @@
         draw_jitter(ax, view, jitter, dist=dist, size=size)
         #draw_jitter(ax, view, (0,0,0))
-        draw_mesh(ax, view, jitter, dist=dist)
+        draw_mesh(ax, view, jitter, dist=dist, n=30)
         draw_scattering(calculator, ax, view, jitter, dist=dist)
         plt.gcf().canvas.draw()

sasmodels/rst2html.py

@@ -104 +104 @@
 
 
-_dollar = re.compile(r"(?:^|(?<=\s|[(]))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[.,;)\\]))")
+_dollar = re.compile(r"(?:^|(?<=\s|[-(]))[$]([^\n]*?)(?<![\\])[$](?:$|(?=\s|[-.,;)\\]))")
 _notdollar = re.compile(r"\\[$]")
 def replace_dollar(content):
@@ -248 +248 @@
 if __name__ == "__main__":
     import sys
-    view_help(sys.argv[1], qt=True)
-
+    view_help(sys.argv[1], qt=False)
+

sasmodels/weights.py

@@ -81 +81 @@
 class GaussianDispersion(Dispersion):
     r"""
-    Gaussian dispersion, with 1-\ $\sigma$ width.
+    Gaussian dispersion, with 1-$\sigma$ width.
 
     .. math::
@@ -116 +116 @@
 class LogNormalDispersion(Dispersion):
     r"""
-    log Gaussian dispersion, with 1-\ $\sigma$ width.
+    log Gaussian dispersion, with 1-$\sigma$ width.
 
     .. math::
@@ -134 +134 @@
 class SchulzDispersion(Dispersion):
     r"""
-    Schultz dispersion, with 1-\ $\sigma$ width.
+    Schultz dispersion, with 1-$\sigma$ width.
 
     .. math::