Changeset b1c49601 in sasmodels

Timestamp:

Feb 4, 2019 11:22:40 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:

9ec9c67

Parents:

1511a60c

Message:

fix python 2.7 utf-8 encoding and fix line endings

File:

• sasmodels/jitter.py (modified) (19 diffs)

sasmodels/jitter.py

@@ -1 +1 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 Jitter Explorer
@@ -82 +83 @@
     #x_cap, y_cap = x[:, 0], y[:, 0]
     #for z_cap in z[:, 0], z[:, -1]:
-    #    axes.plot_trisurf(x_cap, y_cap, z_cap, triangles, 
+    #    axes.plot_trisurf(x_cap, y_cap, z_cap, triangles,
     #                      color='yellow', alpha=alpha)
 
@@ -180 +181 @@
     draw(7, 6)
 
-def draw_parallelepiped(axes, size, view, jitter, steps=None, 
+def draw_parallelepiped(axes, size, view, jitter, steps=None,
                         color=(0.6, 1.0, 0.6), alpha=1):
     """Draw a parallelepiped."""
@@ -285 +286 @@
     axes.set_axis_off()
 
-def draw_jitter(axes, view, jitter, dist='gaussian', 
+def draw_jitter(axes, view, jitter, dist='gaussian',
                 size=(0.1, 0.4, 1.0),
-                draw_shape=draw_parallelepiped, 
+                draw_shape=draw_parallelepiped,
                 projection='equirectangular',
                 alpha=0.8,
@@ -420 +421 @@
         def _weight(theta_i, phi_j, w_i, w_j):
             return w_i*w_j
-    elif projection == 'azimuthal_equidistance': 
+    elif projection == 'azimuthal_equidistance':
         # Note that calculates angles for Rz Ry rather than Rx Ry
         def _project(theta_i, phi_j, psi):
@@ -489 +490 @@
     Mike Day, Insomniac Games
     https://d3cw3dd2w32x2b.cloudfront.net/wp-content/uploads/2012/07/euler-angles1.pdf
-    Based on: Shoemake’s “Euler Angle Conversion”, Graphics Gems IV, pp.  222-229
+    Based on: Shoemake’s "Euler Angle Conversion", Graphics Gems IV, pp.  222-229
     """
     phi = np.arctan2(R[1, 2], R[2, 2])
@@ -636 +637 @@
 
     This variant uses quaternions rather than rotation matrices for the
-    computation.  It works but it is not used because it doesn't solve 
-    any problems.  The challenge of mapping theta/phi/psi to SO(3) does 
+    computation.  It works but it is not used because it doesn't solve
+    any problems.  The challenge of mapping theta/phi/psi to SO(3) does
     not disappear by calculating the transform differently.
     """
@@ -660 +661 @@
     return q.rot(points)
 #orient_relative_to_beam = orient_relative_to_beam_quaternion
- 
+
 # Simple stand-alone quaternion class
 import numpy as np
@@ -705 +706 @@
     target = [(10+4*np.sqrt(3))/8, (1+2*np.sqrt(3))/8, (14-3*np.sqrt(3))/8]
     #print(q, q.rot(p) - target)
-    assert max(abs(q.rot(p) - target)) < 1e-14 
+    assert max(abs(q.rot(p) - target)) < 1e-14
 #test_qrot()
 #import sys; sys.exit()
@@ -922 +923 @@
 
 
-def run(model_name='parallelepiped', size=(10, 40, 100), 
+def run(model_name='parallelepiped', size=(10, 40, 100),
         view=(0, 0, 0), jitter=(0, 0, 0),
         dist='gaussian', mesh=30,
@@ -954 +955 @@
 
     # set up calculator
-    calculator, size = select_calculator(model_name, n=150, size=size)
+    calculator, size = select_calculator(model_name, n=100, size=size)
     draw_shape = DRAW_SHAPES.get(model_name, draw_parallelepiped)
     #draw_shape = draw_fcc
@@ -989 +990 @@
     axes_phi = plt.axes([0.1, 0.1, 0.45, 0.04], facecolor=axcolor)
     axes_psi = plt.axes([0.1, 0.05, 0.45, 0.04], facecolor=axcolor)
-    stheta = Slider(axes_theta, 'Theta', -90, 90, valinit=0)
-    sphi = Slider(axes_phi, 'Phi', -180, 180, valinit=0)
-    spsi = Slider(axes_psi, 'Psi', -180, 180, valinit=0)
+    stheta = Slider(axes_theta, u'Ξ', -90, 90, valinit=0)
+    sphi = Slider(axes_phi, u'φ', -180, 180, valinit=0)
+    spsi = Slider(axes_psi, u'ψ', -180, 180, valinit=0)
 
     axes_dtheta = plt.axes([0.75, 0.15, 0.15, 0.04], facecolor=axcolor)
@@ -1000 +1001 @@
     # the maximum width to 90.
     dlimit = DIST_LIMITS[dist]
-    sdtheta = Slider(axes_dtheta, 'dTheta', 0, 2*dlimit, valinit=0)
-    sdphi = Slider(axes_dphi, 'dPhi', 0, 2*dlimit, valinit=0)
-    sdpsi = Slider(axes_dpsi, 'dPsi', 0, 2*dlimit, valinit=0)
+    sdtheta = Slider(axes_dtheta, u'Δξ', 0, 2*dlimit, valinit=0)
+    sdphi = Slider(axes_dphi, u'Δφ', 0, 2*dlimit, valinit=0)
+    sdpsi = Slider(axes_dpsi, u'Δψ', 0, 2*dlimit, valinit=0)
 
     ## initial view and jitter
@@ -1034 +1035 @@
         ## Move shape and draw scattering
         draw_beam(axes, (0, 0))
-        draw_jitter(axes, view, jitter, dist=dist, size=size, 
+        draw_jitter(axes, view, jitter, dist=dist, size=size,
                     draw_shape=draw_shape, projection=projection, views=3)
         draw_mesh(axes, view, jitter, dist=dist, n=mesh, projection=projection)
@@ -1077 +1078 @@
     kw['color'] = color
 
-def make_vec(*args, flat=False):
-    if flat:
-        return [np.asarray(v, 'd').flatten() for v in args]
-    else:
-        return [np.asarray(v, 'd') for v in args]
+def make_vec(*args):
+    #return [np.asarray(v, 'd').flatten() for v in args]
+    return [np.asarray(v, 'd') for v in args]
 
 def make_image(z, kw):
@@ -1128 +1127 @@
             facecolors = kw.pop('facecolors', None)
             if facecolors is not None:
-                kw['color'] = facecolors 
+                kw['color'] = facecolors
             ipv_fix_color(kw)
             x, y, z = make_vec(x, y, z)
@@ -1157 +1156 @@
             u = np.array([[0., 1], [0, 1]])
             v = np.array([[0., 0], [1, 1]])
-            ipv.plot_mesh(x, y, z, u=u, v=v, texture=image, wireframe=False)    
+            ipv.plot_mesh(x, y, z, u=u, v=v, texture=image, wireframe=False)
         def text(self, *args, **kw):
             pass
@@ -1200 +1199 @@
         ## Move shape and draw scattering
         draw_beam(axes, (0, 0))
-        draw_jitter(axes, view, jitter, dist=dist, size=size, 
+        draw_jitter(axes, view, jitter, dist=dist, size=size,
                     draw_shape=draw_shape, projection=projection)
         draw_mesh(axes, view, jitter, dist=dist, n=mesh, radius=0.95, projection=projection)
         draw_scattering(calculator, axes, view, jitter, dist=dist)
-    
+
         draw_axes(axes, origin=(-1, -1, -1.1))
         ipv.style.box_off()
@@ -1241 +1240 @@
             readout_format='.1f',
             )
-    theta = slider('Ξ', trange, view[0])
-    phi = slider('φ', prange, view[1])
-    psi = slider('ψ', prange, view[2])
-    dtheta = slider('Δξ', dtrange, jitter[0])
-    dphi = slider('Δφ', dprange, jitter[1])
-    dpsi = slider('Δψ', dprange, jitter[2])
+    theta = slider(u'Ξ', trange, view[0])
+    phi = slider(u'φ', prange, view[1])
+    psi = slider(u'ψ', prange, view[2])
+    dtheta = slider(u'Δξ', dtrange, jitter[0])
+    dphi = slider(u'Δφ', dprange, jitter[1])
+    dpsi = slider(u'Δψ', dprange, jitter[2])
     fields = {
         'theta': theta, 'phi': phi, 'psi': psi,