Skip to content

Work around missing dependencies in FormatNXmxEigerFilewriter #866

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
graeme-winter wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Work around missing dependencies in FormatNXmxEigerFilewriter #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5206136
Work around missing dependencies in FormatNXmxEigerFilewriter
graeme-winter Nov 21, 2025
1abd8e7
Rename newsfragments/XXX.bugfix to newsfragments/866.bugfix
DiamondLightSource-build-server Nov 21, 2025
fe2098c
Merge branch 'main' into dectris-missing-depends-on
graeme-winter Nov 21, 2025
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
1 change: 1 addition & 0 deletions newsfragments/866.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
``FormatNXmxEigerFilewriter``: if dependencies missing, make some (prpbably valid) assumptions about dependencies between fast, slow pixel directions and module offset
12 changes: 7 additions & 5 deletions src/dxtbx/nexus/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def equipment_component_key(dependency):
# Flat detector model

# Apply any rotation components of the dependency chain to the fast axis
assert module.fast_pixel_direction.depends_on is not None
# assert module.fast_pixel_direction.depends_on is not None
fast_axis_depends_on = [
t
for t in nxmx.get_dependency_chain(
Expand All @@ -372,7 +372,7 @@ def equipment_component_key(dependency):
fast_axis = MCSTAS_TO_IMGCIF @ R @ module.fast_pixel_direction.vector

# Apply any rotation components of the dependency chain to the slow axis
assert module.slow_pixel_direction.depends_on is not None
# assert module.slow_pixel_direction.depends_on is not None
slow_axis_depends_on = [
t
for t in nxmx.get_dependency_chain(
Expand All @@ -388,9 +388,11 @@ def equipment_component_key(dependency):

# Apply all components of the dependency chain to the module offset to get the
# dxtbx panel origin
dependency_chain = nxmx.get_dependency_chain(
module.fast_pixel_direction.depends_on
)
if module.fast_pixel_direction.depends_on is not None:
top = module.fast_pixel_direction.depends_on
else:
top = module.module_offset.depends_on
dependency_chain = nxmx.get_dependency_chain(top)
A = nxmx.get_cumulative_transformation(dependency_chain)

origin = MCSTAS_TO_IMGCIF @ (
Expand Down