Changeset 0f65169 in sasmodels

Timestamp:

Nov 1, 2017 3:00:39 AM (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:

bc386f0

Parents:

d73a5ac

git-author:

Paul Kienzle <pkienzle@…> (11/01/17 02:36:57)

git-committer:

Paul Kienzle <pkienzle@…> (11/01/17 03:00:39)

Message:

Add Guyou projection to jitter options

Location:

explore

Files:

• guyou.py (added)
• jitter.py (modified) (3 diffs)

explore/jitter.py

@@ -162 +162 @@
 
 PROJECTIONS = [
-    'equirectangular', 'azimuthal_equidistance', 'sinusoidal',
+    'equirectangular', 'azimuthal_equidistance', 'sinusoidal', 'guyou',
 ]
 def draw_mesh(ax, view, jitter, radius=1.2, n=11, dist='gaussian',
@@ -204 +204 @@
         from theta at 90+dt winding backwards around the pole, overlapping
         the circle from theta at 90-dt.
-    Guyour (hemisphere-in-a-square)  **not implemented**
+    Guyou (hemisphere-in-a-square) **not weighted**
         <https://en.wikipedia.org/wiki/Guyou_hemisphere-in-a-square_projection>
-        Promising.  With tiling should allow rotation in phi or theta
-        through +/- 180, preserving almost disk-like behaviour in either
-        direction (phi rotation will not be as uniform as it is in
-        equirectangular; not sure about theta).  Unfortunately, distortion
-        is not restricted to the corners of the theta-phi mesh, so this will
-        not be as good as the azimuthal equidistance project for gaussian
-        distributions.
+        With tiling, allows rotation in phi or theta through +/- 180, with
+        uniform spacing.  Both theta and phi allow free rotation, with wobble
+        in the orthogonal direction reasonably well behaved (though not as
+        good as equirectangular phi). The forward/reverse transformations
+        relies on elliptic integrals that are somewhat expensive, so the
+        behaviour has to be very good to justify the cost and complexity.
+        The weighting function for each point has not yet been computed.
+        Note: run the module *guyou.py* directly and it will show the forward
+        and reverse mappings.
     azimuthal_equal_area  **incomplete**
         <https://en.wikipedia.org/wiki/Lambert_azimuthal_equal-area_projection>
@@ -303 +305 @@
             w = sin(radians(latitude))/latitude if latitude != 0 else 1
             return w*wi*wj if latitude < 180 else 0
+    elif projection == 'guyou':
+        def rotate(theta_i, phi_j):
+            from guyou import guyou_invert
+            #latitude, longitude = guyou_invert([theta_i], [phi_j])
+            longitude, latitude = guyou_invert([phi_j], [theta_i])
+            return Rx(longitude[0])*Ry(latitude[0])
+        def weight(theta_i, phi_j, wi, wj):
+            return wi*wj
     else:
         raise ValueError("unknown projection %r"%projection)