zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify matrix mult

Browse Source
This commit is contained in:
usov_i 2020-03-31 16:45:41 +02:00
parent e398f0718a
commit d22e2db89f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyzebra/xtal.py
View File

@ -333,9 +333,6 @@ def ang2hkl(wave, ddist, gammad, om, ch, ph, nud, ub, x, y):
ga, nu = det2pol(ddist, gammad, nud, x, y) ga, nu = det2pol(ddist, gammad, nud, x, y)
z1 = z1frmd(wave, ga, om, ch, ph, nu) z1 = z1frmd(wave, ga, om, ch, ph, nu)
ubinv = np.linalg.inv(ub) ubinv = np.linalg.inv(ub)
hkl = ubinv @ z1
h = ubinv[0, 0] * z1[0] + ubinv[0, 1] * z1[1] + ubinv[0, 2] * z1[2] return hkl
k = ubinv[1, 0] * z1[0] + ubinv[1, 1] * z1[1] + ubinv[1, 2] * z1[2]
l = ubinv[2, 0] * z1[0] + ubinv[2, 1] * z1[1] + ubinv[2, 2] * z1[2]
return h, k, l