Changeset 1167
- Timestamp:
- Dec 16, 2013 9:50:27 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimage.py
r1166 r1167 329 329 stth = sind(tth) 330 330 ctth = cosd(tth) 331 sinb = sind(tilt)332 331 cosb = cosd(tilt) 333 tanb = tand(tilt)334 332 if radii[0] > 0.: 333 sinb = sind(tilt) 334 tanb = tand(tilt) 335 335 fplus = dist*tanb*stth/(cosb+stth) 336 336 fminus = dist*tanb*stth/(cosb-stth) … … 345 345 xy += cent 346 346 else: #hyperbola - both branches (one is way off screen!) 347 sinb = abs(sind(tilt)) 348 tanb = abs(tand(tilt)) 347 349 f = dist*tanb*stth/(cosb+stth) 348 350 v = dist*(tanb+tand(tth-abs(tilt))) … … 356 358 offset = -f 357 359 xy = [-R*cosd(azm)-offset,-R*sind(azm)] 358 xy = -np.array([xy[0]*cosd(phi) -xy[1]*sind(phi),xy[0]*sind(phi)+xy[1]*cosd(phi)])360 xy = -np.array([xy[0]*cosd(phi)+xy[1]*sind(phi),xy[0]*sind(phi)-xy[1]*cosd(phi)]) 359 361 xy += cent 360 362 return xy
Note: See TracChangeset
for help on using the changeset viewer.