Skip to content

Take detector orientation in account when converting from PONI to ImageD11 #2868

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

Open
loichuder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Take detector orientation in account when converting from PONI to ImageD11 #2868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions src/pyFAI/geometry/imaged11.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,18 @@ def convert_to_ImageD11(poni, distance_unit="µm", wavelength_unit="nm"):
distance_unit = to_unit(distance_unit, LENGTH_UNITS)
wavelength_unit = to_unit(wavelength_unit, LENGTH_UNITS)
f2d = convert_to_Fit2d(poni)
# TODO: manage orientation here
id11 = {"o11": 1,
"o12": 0,
"o21": 0,
"o22": -1}
orientation = detector.orientation
if orientation == 3:
(o11, o12, o21, o22) = (1, 0, 0, -1)
elif orientation == 1:
(o11, o12, o21, o22) = (1, 0, 0, +1)
elif orientation == 4:
(o11, o12, o21, o22) = (-1, 0, 0, -1)
elif orientation == 2:
(o11, o12, o21, o22) = (-1, 0, 0, +1)
else:
raise ValueError("Invalid orientation")
id11 = {"o11": o11, "o12": o12, "o21": o21, "o22": o22}
id11["distance"] = (f2d.directDist or 0) * 1e-3 * distance_unit.scale
id11["y_center"] = (f2d.centerX or 0) # in pixel
id11["z_center"] = (f2d.centerY or 0) # in pixel
Expand Down
Loading