Skip to content

Variadic scope #151

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
Apr 10, 2025
Merged

Variadic scope #151

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
048ca62
Require sciline>=25.4.1
jl-wynen Apr 10, 2025
32d9b6b
Use variadic Scope
jl-wynen Apr 10, 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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies = [
"numpy",
"plopp>=25.03.0",
"pythreejs",
"sciline>=24.06.0",
"sciline>=25.04.1",
"scipp>=24.09.1",
"scippneutron>=25.02.0",
"scippnexus>=23.12.0",
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
essreduce>=25.04.0
essreduce>=25.02.4
graphviz
numpy
plopp>=25.03.0
pythreejs
sciline>=24.06.0
sciline>=25.04.1
scipp>=24.09.1
scippneutron>=25.02.0
scippnexus>=23.12.0
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:b690e6a12ac4cde710521c39719a0c2f61f44602
# SHA1:4c637dd9c91e42089ff8f729de2279bb8611bf83
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand Down Expand Up @@ -29,7 +29,7 @@ dnspython==2.7.0
# via email-validator
email-validator==2.2.0
# via scippneutron
essreduce==25.4.0
essreduce==25.4.1
# via -r base.in
exceptiongroup==1.2.2
# via ipython
Expand Down
2 changes: 0 additions & 2 deletions requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ accessible-pygments==0.0.5
# via pydata-sphinx-theme
alabaster==1.0.0
# via sphinx
appnope==0.1.4
# via ipykernel
attrs==25.3.0
# via
# jsonschema
Expand Down
10 changes: 3 additions & 7 deletions src/ess/powder/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class MonitorFilename(sciline.Scope[RunType, Path], Path):


class WavelengthMonitor(
sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray
):
"""Monitor histogram in wavelength."""

Expand Down Expand Up @@ -216,15 +216,11 @@ class DetectorLtotal(sciline.Scope[RunType, sc.Variable], sc.Variable):
"""Total path length of neutrons from source to detector (L1 + L2)."""


class MonitorLtotal(
sciline.ScopeTwoParams[RunType, MonitorType, sc.Variable], sc.Variable
):
class MonitorLtotal(sciline.Scope[RunType, MonitorType, sc.Variable], sc.Variable):
"""Total path length of neutrons from source to monitor."""


class TofMonitorData(
sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
):
class TofMonitorData(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray):
"""Monitor data with time-of-flight coordinate."""


Expand Down