Changeset 1167

Timestamp:

Dec 16, 2013 9:50:27 AM (9 years ago)

Author:

vondreele

Message:

hyperbola fixes; still problem with azm not correctly referenced to cone axis

File:

• trunk/GSASIIimage.py (modified) (3 diffs)

trunk/GSASIIimage.py

@@ -329 +329 @@
     stth = sind(tth)
     ctth = cosd(tth)
-    sinb = sind(tilt)
     cosb = cosd(tilt)
-    tanb = tand(tilt)
     if radii[0] > 0.:
+        sinb = sind(tilt)
+        tanb = tand(tilt)
         fplus = dist*tanb*stth/(cosb+stth)
         fminus = dist*tanb*stth/(cosb-stth)
@@ -345 +345 @@
         xy += cent
     else:   #hyperbola - both branches (one is way off screen!)
+        sinb = abs(sind(tilt))
+        tanb = abs(tand(tilt))
         f = dist*tanb*stth/(cosb+stth)
         v = dist*(tanb+tand(tth-abs(tilt)))
@@ -356 +358 @@
             offset = -f
             xy = [-R*cosd(azm)-offset,-R*sind(azm)]
-        xy = -np.array([xy[0]*cosd(phi)-xy[1]*sind(phi),xy[0]*sind(phi)+xy[1]*cosd(phi)])
+        xy = -np.array([xy[0]*cosd(phi)+xy[1]*sind(phi),xy[0]*sind(phi)-xy[1]*cosd(phi)])
         xy += cent
     return xy