Skip to content

Minor fixes needed for ESSdiffraction #81

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 2 commits into from
Aug 26, 2024
Merged

Minor fixes needed for ESSdiffraction #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48054ec
Add VanadiumRun
SimonHeybrock Aug 26, 2024
3e78391
Be more flexible for position coord unit
SimonHeybrock Aug 26, 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
6 changes: 5 additions & 1 deletion src/ess/reduce/nexus/generic_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@
"""
SampleRun = NewType('SampleRun', int)
"""Sample run."""
VanadiumRun = NewType('VanadiumRun', int)
"""Vanadium run."""

ScatteringRunType = TypeVar(
'ScatteringRunType',
SampleRun,
BackgroundRun,
SampleRun,
VanadiumRun,
)


Expand All @@ -48,6 +51,7 @@ class TransmissionRun(Generic[ScatteringRunType]):
# Note that mypy does not seem to like this nesting, may need to find a workaround
TransmissionRun[SampleRun],
TransmissionRun[BackgroundRun],
VanadiumRun,
)
"""TypeVar used for specifying BackgroundRun, EmptyBeamRun or SampleRun"""

Expand Down
4 changes: 2 additions & 2 deletions src/ess/reduce/nexus/workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def get_calibrated_detector(
# the detector array from the raw loader NeXus group, to prevent a source of bugs.
return AnyRunCalibratedDetector(
da.assign_coords(
position=da.coords['position'] + offset,
position=da.coords['position'] + offset.to(unit=da.coords['position'].unit),
source_position=source_position,
sample_position=sample_position,
gravity=gravity,
Expand Down Expand Up @@ -389,7 +389,7 @@ def get_calibrated_monitor(
"""
return AnyRunAnyCalibratedMonitor(
nexus.extract_monitor_data(monitor).assign_coords(
position=monitor['position'] + offset,
position=monitor['position'] + offset.to(unit=monitor['position'].unit),
source_position=source_position,
)
)
Expand Down