Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1a150fd
CalibratedDetector -> EmptyDetector
nvaytet Oct 28, 2025
b8f0223
CalibratedMonitor -> EmptyMonitor
nvaytet Oct 28, 2025
eb5008d
DetectorData -> RawDetector
nvaytet Oct 28, 2025
ecdcdb5
MonitorData -> RawMonitor
nvaytet Oct 28, 2025
d5b5199
TofData -> TofDetector
nvaytet Oct 28, 2025
98f139c
CleanMonitor -> CorrectedMonitor
nvaytet Oct 28, 2025
4a2531a
Require essreduce>=25.11.0
jl-wynen Nov 3, 2025
ea89524
Use standardized type names
jl-wynen Nov 3, 2025
35cda96
Use parametrized types
jl-wynen Nov 3, 2025
62eb456
Use upstream RunType
jl-wynen Nov 3, 2025
34642fe
Rename Intensity types
jl-wynen Nov 3, 2025
9244869
Run pre-commit hooks
jl-wynen Nov 3, 2025
d08f7a2
Apply automatic formatting
pre-commit-ci-lite[bot] Nov 3, 2025
5d876de
Fix type in docs
jl-wynen Nov 3, 2025
7221380
Use new type name
jl-wynen Nov 3, 2025
06b3e0b
Apply automatic formatting
pre-commit-ci-lite[bot] Nov 3, 2025
69db436
CleanWavelength -> WavelengthDetector
nvaytet Nov 4, 2025
13e3ac2
CleanQxy -> QxyDetector
nvaytet Nov 4, 2025
9792f4c
CleanQ -> QDetector
nvaytet Nov 4, 2025
d5538f0
MaskedSolidAngle -> CorrectedDetector[ScatteringRunType, Denominator]…
nvaytet Nov 4, 2025
2239e29
CleanSummedQxy -> BinnedQxQy
nvaytet Nov 4, 2025
9a6bacd
CleanSummedQ -> BinnedQ
nvaytet Nov 4, 2025
cd71ce5
WavelengthScaledQxy -> NormalizedQxQy
nvaytet Nov 4, 2025
d6e1882
WavelengthScaledQ -> NormalizedQ
nvaytet Nov 4, 2025
24b2935
ReducedQxy -> ReducedQxQy
nvaytet Nov 4, 2025
3ca6f3f
formatting
nvaytet Nov 4, 2025
84cf914
fix some tests
nvaytet Nov 4, 2025
863952c
fix docs
nvaytet Nov 4, 2025
2b5b5c4
remove commented code
nvaytet Nov 4, 2025
7783fc1
Merge pull request #231 from scipp/standard-domain-types3
nvaytet Nov 4, 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
8 changes: 4 additions & 4 deletions docs/user-guide/common/beam-center-finder.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"outputs": [],
"source": [
"workflow[BeamCenter] = sc.vector([0, 0, 0], unit='m')\n",
"raw = workflow.compute(DetectorData[SampleRun])['spectrum', :61440]\n",
"raw = workflow.compute(RawDetector[SampleRun])['spectrum', :61440]\n",
"\n",
"p = isis.plot_flat_detector_xy(raw.hist(), norm='log')\n",
"p.ax.plot(0, 0, '+', color='k', ms=10)\n",
Expand Down Expand Up @@ -132,7 +132,7 @@
"outputs": [],
"source": [
"workflow[BeamCenter] = sc.vector(value=[0, 0, 0], unit='m')\n",
"masked = workflow.compute(MaskedData[SampleRun])['spectrum', :61440].copy()\n",
"masked = workflow.compute(CorrectedDetector[SampleRun, Numerator])['spectrum', :61440].copy()\n",
"masked.masks['low_counts'] = masked.hist().data < sc.scalar(80.0, unit='counts')\n",
"\n",
"p = isis.plot_flat_detector_xy(masked.hist(), norm='log')\n",
Expand Down Expand Up @@ -160,8 +160,8 @@
"metadata": {},
"outputs": [],
"source": [
"# The center-of-mass approach is based on the MaskedData\n",
"workflow.visualize(MaskedData[SampleRun])"
"# The center-of-mass approach is based on the masked data (CorrectedDetector)\n",
"workflow.visualize(CorrectedDetector[SampleRun, Numerator])"
]
},
{
Expand Down
16 changes: 8 additions & 8 deletions docs/user-guide/isis/sans2d.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"outputs": [],
"source": [
"# left-right layout works better for this graph\n",
"workflow.visualize(IofQ[SampleRun], graph_attr={\"rankdir\": \"LR\"})"
"workflow.visualize(IntensityQ[SampleRun], graph_attr={\"rankdir\": \"LR\"})"
]
},
{
Expand Down Expand Up @@ -320,30 +320,30 @@
" WavelengthMonitor[BackgroundRun, Transmission],\n",
")\n",
"parts = (\n",
" WavelengthScaledQ[SampleRun, Numerator],\n",
" WavelengthScaledQ[SampleRun, Denominator],\n",
" NormalizedQ[SampleRun, Numerator],\n",
" NormalizedQ[SampleRun, Denominator],\n",
")\n",
"iofqs = (IofQ[SampleRun], IofQ[BackgroundRun], BackgroundSubtractedIofQ)\n",
"keys = (*monitors, MaskedData[SampleRun], *parts, *iofqs)\n",
"iofqs = (IntensityQ[SampleRun], IntensityQ[BackgroundRun], BackgroundSubtractedIofQ)\n",
"keys = (*monitors, CorrectedDetector[SampleRun, Numerator], *parts, *iofqs)\n",
"\n",
"results = workflow.compute(keys)\n",
"\n",
"display(sc.plot({str(key): results[key] for key in monitors}, norm='log'))\n",
"\n",
"display(\n",
" isis.plot_flat_detector_xy(\n",
" results[MaskedData[SampleRun]]['spectrum', :61440].hist(), norm='log'\n",
" results[CorrectedDetector[SampleRun, Numerator]]['spectrum', :61440].hist(), norm='log'\n",
" )\n",
")\n",
"\n",
"wavelength = workflow.compute(WavelengthBins)\n",
"display(\n",
" results[WavelengthScaledQ[SampleRun, Numerator]]\n",
" results[NormalizedQ[SampleRun, Numerator]]\n",
" .hist(wavelength=wavelength)\n",
" .transpose()\n",
" .plot(norm='log')\n",
")\n",
"display(results[WavelengthScaledQ[SampleRun, Denominator]].plot(norm='log'))\n",
"display(results[NormalizedQ[SampleRun, Denominator]].plot(norm='log'))\n",
"parts = {str(key): results[key].sum('wavelength') for key in parts}\n",
"display(sc.plot(parts, norm='log'))\n",
"\n",
Expand Down
20 changes: 10 additions & 10 deletions docs/user-guide/isis/zoom.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"outputs": [],
"source": [
"# left-right layout works better for this graph\n",
"workflow.visualize(IofQ[SampleRun], graph_attr={'rankdir': 'LR'})"
"workflow.visualize(IntensityQ[SampleRun], graph_attr={'rankdir': 'LR'})"
]
},
{
Expand Down Expand Up @@ -210,7 +210,7 @@
"metadata": {},
"outputs": [],
"source": [
"da = workflow.compute(IofQ[SampleRun])\n",
"da = workflow.compute(IntensityQ[SampleRun])\n",
"da.plot(norm='log', scale={'Q': 'log'})"
]
},
Expand All @@ -234,30 +234,30 @@
" WavelengthMonitor[SampleRun, Transmission],\n",
")\n",
"parts = (\n",
" WavelengthScaledQ[SampleRun, Numerator],\n",
" WavelengthScaledQ[SampleRun, Denominator],\n",
" NormalizedQ[SampleRun, Numerator],\n",
" NormalizedQ[SampleRun, Denominator],\n",
")\n",
"iofqs = (IofQ[SampleRun],)\n",
"keys = (*monitors, MaskedData[SampleRun], *parts, *iofqs)\n",
"iofqs = (IntensityQ[SampleRun],)\n",
"keys = (*monitors, CorrectedDetector[SampleRun, Numerator], *parts, *iofqs)\n",
"\n",
"results = workflow.compute(keys)\n",
"\n",
"display(sc.plot({str(key): results[key] for key in monitors}, norm='log'))\n",
"\n",
"display(\n",
" isis.plot_flat_detector_xy(\n",
" results[MaskedData[SampleRun]], norm='log', figsize=(6, 10)\n",
" results[CorrectedDetector[SampleRun, Numerator]], norm='log', figsize=(6, 10)\n",
" )\n",
")\n",
"\n",
"wavelength = workflow.compute(WavelengthBins)\n",
"display(\n",
" results[WavelengthScaledQ[SampleRun, Numerator]]\n",
" results[NormalizedQ[SampleRun, Numerator]]\n",
" .hist(wavelength=wavelength)\n",
" .transpose()\n",
" .plot(norm='log')\n",
")\n",
"display(results[WavelengthScaledQ[SampleRun, Denominator]].plot(norm='log'))\n",
"display(results[NormalizedQ[SampleRun, Denominator]].plot(norm='log'))\n",
"parts = {str(key): results[key] for key in parts}\n",
"parts = {\n",
" key: val.sum('wavelength') if val.bins is None else val.hist()\n",
Expand Down Expand Up @@ -291,7 +291,7 @@
"workflow[QxBins] = sc.linspace('Qx', start=-0.5, stop=0.5, num=101, unit='1/angstrom')\n",
"workflow[QyBins] = sc.linspace('Qy', start=-0.8, stop=0.8, num=101, unit='1/angstrom')\n",
"\n",
"iqxqy = workflow.compute(IofQxy[SampleRun])\n",
"iqxqy = workflow.compute(IntensityQxQy[SampleRun])\n",
"iqxqy.plot(norm='log', aspect='equal')"
]
}
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/loki/loki-direct-beam.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"metadata": {},
"outputs": [],
"source": [
"workflow.visualize(IofQ[SampleRun], compact=True, graph_attr={'rankdir': 'LR'})"
"workflow.visualize(IntensityQ[SampleRun], compact=True, graph_attr={'rankdir': 'LR'})"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/loki/workflow-widget-loki.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"wfw = widget.children[1].children[0]\n",
"outputs = wfw.output_selection_box.typical_outputs_widget\n",
"keys, values = zip(*outputs.options, strict=True)\n",
"ind = keys.index(\"IofQ[SampleRun]\")\n",
"ind = keys.index(\"IntensityQ[SampleRun]\")\n",
"outputs.value = (values[ind],)\n",
"# Refresh parameters\n",
"pbox = wfw.parameter_box\n",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ requires-python = ">=3.11"
dependencies = [
"dask>=2022.1.0",
"graphviz>=0.20",
"essreduce>=25.10.1",
"essreduce>=25.11.0",
"numpy>=1.26.4",
"pandas>=2.1.2",
"plopp>=25.03.0",
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask>=2022.1.0
graphviz>=0.20
essreduce>=25.10.1
essreduce>=25.11.0
numpy>=1.26.4
pandas>=2.1.2
plopp>=25.03.0
Expand Down
17 changes: 8 additions & 9 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:4070c98e9bfb765d14716fce509312b2102adb65
# SHA1:6adb8082982c7c5bb1806abc8670bfd2cb6375cd
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand All @@ -11,7 +11,7 @@ asttokens==3.0.0
# via stack-data
click==8.3.0
# via dask
cloudpickle==3.1.1
cloudpickle==3.1.2
# via dask
comm==0.2.3
# via ipywidgets
Expand All @@ -29,13 +29,13 @@ dnspython==2.8.0
# via email-validator
email-validator==2.3.0
# via scippneutron
essreduce==25.10.1
essreduce==25.11.0
# via -r base.in
executing==2.2.1
# via stack-data
fonttools==4.60.1
# via matplotlib
fsspec==2025.9.0
fsspec==2025.10.0
# via dask
graphviz==0.21
# via -r base.in
Expand All @@ -53,13 +53,13 @@ ipython==9.6.0
# via ipywidgets
ipython-pygments-lexers==1.1.1
# via ipython
ipywidgets==8.1.7
ipywidgets==8.1.8
# via
# ipydatawidgets
# pythreejs
jedi==0.19.2
# via ipython
jupyterlab-widgets==3.0.15
jupyterlab-widgets==3.0.16
# via ipywidgets
kiwisolver==1.4.9
# via matplotlib
Expand Down Expand Up @@ -138,7 +138,7 @@ pytz==2025.2
# via pandas
pyyaml==6.0.3
# via dask
sciline==25.8.0
sciline==25.11.1
# via
# -r base.in
# essreduce
Expand Down Expand Up @@ -183,15 +183,14 @@ typing-extensions==4.15.0
# ipython
# pydantic
# pydantic-core
# sciline
# typing-inspection
typing-inspection==0.4.2
# via pydantic
tzdata==2025.2
# via pandas
wcwidth==0.2.14
# via prompt-toolkit
widgetsnbextension==4.0.14
widgetsnbextension==4.0.15
# via ipywidgets
zipp==3.23.0
# via importlib-metadata
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pip-compile-multi==3.2.2
# via -r dev.in
pip-tools==7.5.1
# via pip-compile-multi
plumbum==1.9.0
plumbum==1.10.0
# via copier
prometheus-client==0.23.1
# via jupyter-server
Expand Down Expand Up @@ -111,7 +111,7 @@ toposort==1.10
# via pip-compile-multi
uri-template==1.3.0
# via jsonschema
webcolors==24.11.1
webcolors==25.10.0
# via jsonschema
websocket-client==1.9.0
# via jupyter-server
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ platformdirs==4.5.0
# pooch
pooch==1.8.2
# via -r docs.in
psutil==7.1.2
psutil==7.1.3
# via ipykernel
pydantic-settings==2.11.0
# via autodoc-pydantic
Expand Down
11 changes: 5 additions & 6 deletions requirements/nightly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ charset-normalizer==3.4.4
# via requests
click==8.3.0
# via dask
cloudpickle==3.1.1
cloudpickle==3.1.2
# via dask
comm==0.2.3
# via ipywidgets
Expand All @@ -42,7 +42,7 @@ executing==2.2.1
# via stack-data
fonttools==4.60.1
# via matplotlib
fsspec==2025.9.0
fsspec==2025.10.0
# via dask
graphviz==0.21
# via -r nightly.in
Expand All @@ -64,13 +64,13 @@ ipython==9.6.0
# via ipywidgets
ipython-pygments-lexers==1.1.1
# via ipython
ipywidgets==8.1.7
ipywidgets==8.1.8
# via
# ipydatawidgets
# pythreejs
jedi==0.19.2
# via ipython
jupyterlab-widgets==3.0.15
jupyterlab-widgets==3.0.16
# via ipywidgets
kiwisolver==1.4.10rc0
# via matplotlib
Expand Down Expand Up @@ -207,7 +207,6 @@ typing-extensions==4.15.0
# ipython
# pydantic
# pydantic-core
# sciline
# typing-inspection
typing-inspection==0.4.2
# via pydantic
Expand All @@ -217,7 +216,7 @@ urllib3==2.5.0
# via requests
wcwidth==0.2.14
# via prompt-toolkit
widgetsnbextension==4.0.14
widgetsnbextension==4.0.15
# via ipywidgets
zipp==3.23.0
# via importlib-metadata
Loading
Loading