Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 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
14 changes: 7 additions & 7 deletions docs/user-guide/isis/sans2d.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
"metadata": {},
"source": [
"The workflow can be visualized as a graph.\n",
"For readability we show only sub-workflow for computing `IofQ[Sample]`.\n",
"The workflow can actually compute the full `BackgroundSubtractedIofQ`, which applies and equivalent workflow to the background run, before a subtraction step:"
"For readability we show only sub-workflow for computing `IntensityQ[Sample]`.\n",
"The workflow can actually compute the full `BackgroundSubtractedIntensityQ`, which applies and equivalent workflow to the background run, before a subtraction step:"
]
},
{
Expand All @@ -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 @@ -224,7 +224,7 @@
"metadata": {},
"outputs": [],
"source": [
"result = workflow.compute(BackgroundSubtractedIofQ)\n",
"result = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"result.hist().plot(scale={'Q': 'log'}, norm='log')"
]
},
Expand Down Expand Up @@ -264,7 +264,7 @@
"outputs": [],
"source": [
"workflow[UncertaintyBroadcastMode] = UncertaintyBroadcastMode.drop\n",
"result_drop = workflow.compute(BackgroundSubtractedIofQ)\n",
"result_drop = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"# Reset the UnsertaintyBroadcastMode to the old value\n",
"workflow[UncertaintyBroadcastMode] = UncertaintyBroadcastMode.upper_bound\n",
"sc.DataGroup(upper_bound=result, dropped=result_drop).hist().plot(norm='log')"
Expand Down Expand Up @@ -323,7 +323,7 @@
" WavelengthScaledQ[SampleRun, Numerator],\n",
" WavelengthScaledQ[SampleRun, Denominator],\n",
")\n",
"iofqs = (IofQ[SampleRun], IofQ[BackgroundRun], BackgroundSubtractedIofQ)\n",
"iofqs = (IntensityQ[SampleRun], IntensityQ[BackgroundRun], BackgroundSubtractedIntensityQ)\n",
"keys = (*monitors, MaskedData[SampleRun], *parts, *iofqs)\n",
"\n",
"results = workflow.compute(keys)\n",
Expand Down Expand Up @@ -393,7 +393,7 @@
"metadata": {},
"outputs": [],
"source": [
"result = workflow.compute(BackgroundSubtractedIofQ)\n",
"result = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"result"
]
},
Expand Down
10 changes: 5 additions & 5 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 @@ -237,7 +237,7 @@
" WavelengthScaledQ[SampleRun, Numerator],\n",
" WavelengthScaledQ[SampleRun, Denominator],\n",
")\n",
"iofqs = (IofQ[SampleRun],)\n",
"iofqs = (IntensityQ[SampleRun],)\n",
"keys = (*monitors, MaskedData[SampleRun], *parts, *iofqs)\n",
"\n",
"results = workflow.compute(keys)\n",
Expand Down Expand Up @@ -277,7 +277,7 @@
"source": [
"## Computing Qx/Qy\n",
"\n",
"To compute $I(Q_{x}, Q_{y})$ instead of the one-dimensional $I(Q)$, we can compute `IofQxy` instead of `IofQ`.\n",
"To compute $I(Q_{x}, Q_{y})$ instead of the one-dimensional $I(Q)$, we can compute `IntensityQxy` instead of `IntensityQ`.\n",
"For this to work, we need to define `QxBins` and `QyBins` in our parameters:"
]
},
Expand All @@ -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(IntensityQxy[SampleRun])\n",
"iqxqy.plot(norm='log', aspect='equal')"
]
}
Expand Down
8 changes: 4 additions & 4 deletions docs/user-guide/loki/loki-direct-beam.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
"metadata": {},
"source": [
"The workflow can be visualized as a graph.\n",
"For readability we show only sub-workflow for computing `IofQ[Sample]`.\n",
"The workflow can actually compute the full `BackgroundSubtractedIofQ`, which applies and equivalent workflow to the background run, before a subtraction step:"
"For readability we show only sub-workflow for computing `IntensityQ[Sample]`.\n",
"The workflow can actually compute the full `BackgroundSubtractedIntensityQ`, which applies and equivalent workflow to the background run, before a subtraction step:"
]
},
{
Expand All @@ -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 Expand Up @@ -546,7 +546,7 @@
"metadata": {},
"outputs": [],
"source": [
"workflow.visualize(BackgroundSubtractedIofQ, compact=True, graph_attr={'rankdir': 'LR'})"
"workflow.visualize(BackgroundSubtractedIntensityQ, compact=True, graph_attr={'rankdir': 'LR'})"
]
},
{
Expand Down
12 changes: 6 additions & 6 deletions docs/user-guide/loki/loki-iofq.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"metadata": {},
"outputs": [],
"source": [
"workflow.visualize(BackgroundSubtractedIofQ, compact=True, graph_attr={\"rankdir\": \"LR\"})"
"workflow.visualize(BackgroundSubtractedIntensityQ, compact=True, graph_attr={\"rankdir\": \"LR\"})"
]
},
{
Expand Down Expand Up @@ -210,7 +210,7 @@
"metadata": {},
"outputs": [],
"source": [
"da = workflow.compute(BackgroundSubtractedIofQ)\n",
"da = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"da.plot(norm=\"log\", title=\"ISIS polymer\")"
]
},
Expand All @@ -230,7 +230,7 @@
"outputs": [],
"source": [
"workflow[WavelengthBands] = sc.linspace(\"wavelength\", 1.0, 13.0, 11, unit=\"angstrom\")\n",
"da_bands = workflow.compute(BackgroundSubtractedIofQ)\n",
"da_bands = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"da_bands"
]
},
Expand Down Expand Up @@ -287,7 +287,7 @@
"outputs": [],
"source": [
"# I(Q)\n",
"da = workflow.compute(BackgroundSubtractedIofQ)\n",
"da = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"da.plot(norm=\"log\", title=\"AgBeh sample\")"
]
},
Expand Down Expand Up @@ -315,7 +315,7 @@
"workflow[BeamCenter] = sans.beam_center_from_center_of_mass(workflow)\n",
"\n",
"# I(Q)\n",
"da = workflow.compute(BackgroundSubtractedIofQ)\n",
"da = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"da.plot(norm=\"log\", title=\"Porous silica\")"
]
},
Expand Down Expand Up @@ -343,7 +343,7 @@
"workflow[BeamCenter] = sans.beam_center_from_center_of_mass(workflow)\n",
"\n",
"# I(Q)\n",
"da = workflow.compute(BackgroundSubtractedIofQ)\n",
"da = workflow.compute(BackgroundSubtractedIntensityQ)\n",
"da.plot(norm=\"log\", title=\"deut-SDS\")"
]
}
Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/loki/workflow-widget-loki.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"keys, values = zip(*select.options, strict=True)\n",
"ind = keys.index(\"LokiAtLarmorTutorialWorkflow\")\n",
"select.value = values[ind]\n",
"# Select IofQ[SampleRun] output\n",
"# Select IntensityQ[SampleRun] output\n",
"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
19 changes: 9 additions & 10 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:4070c98e9bfb765d14716fce509312b2102adb65
# SHA1:00b9bcd18f145ced32ae50ff97e174fb9fc96093
#
# 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,11 +138,11 @@ pytz==2025.2
# via pandas
pyyaml==6.0.3
# via dask
sciline==25.8.0
sciline==25.11.1
# via
# -r base.in
# essreduce
scipp==25.8.0
scipp==25.11.0
# 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