Skip to content

Fix pinhole offset corrections #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Fix pinhole offset corrections #727

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d867c
fix pinhole corrections for edge cases. All variables for PXRDIP and …
saransh13 Nov 7, 2024
f093910
Update hexrd/xrdutil/phutil.py
saransh13 Nov 13, 2024
d96f41f
Update hexrd/xrdutil/phutil.py
saransh13 Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions hexrd/xrdutil/phutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,12 @@ def calc_phi_x(bvec, eHat_l):
"""
bv = np.array(bvec)
bv[2] = 0.
bv = bv/np.linalg.norm(bv)
return np.arccos(np.dot(bv, -eHat_l)).item()
bv_norm = np.linalg.norm(bv)
if np.isclose(bv_norm, 0):
return 0.
else:
bv = bv/np.linalg.norm(bv)
return np.arccos(np.dot(bv, -eHat_l)).item()


def azimuth(vv, v0, v1):
Expand Down Expand Up @@ -449,7 +453,7 @@ def _infer_eHat_l(panel):

eHat_l_dict = {
'TARDIS': -ct.lab_x.reshape((3, 1)),
'PXRDIP': ct.lab_y.reshape((3, 1))
'PXRDIP': -ct.lab_x.reshape((3, 1))
}

return eHat_l_dict[instr_type]
Expand All @@ -460,7 +464,7 @@ def _infer_eta_shift(panel):

eta_shift_dict = {
'TARDIS': -np.radians(180),
'PXRDIP': -np.radians(90),
'PXRDIP': -np.radians(180),
}

return eta_shift_dict[instr_type]
Expand Down Expand Up @@ -525,8 +529,8 @@ def calc_tth_rygg_pinhole(panels, absorption_length, tth, eta,

v0 = np.array([0, 0, 1])
v1 = np.squeeze(eHat_l)
phi_d = azimuth(dvectors, v0, v1).reshape(tth.shape)
beta = np.arccos(np.dot(dvectors, [0, 0, -1])).reshape(tth.shape)
phi_d = azimuth(dvectors, -v0, v1).reshape(tth.shape)
beta = np.arccos(-dvectors[:, 2]).reshape(tth.shape)

# Compute r_d
# We will first convert to Cartesian, then clip to the panel, add the
Expand Down
Loading