Merge branch 'main' into add-lower-pins

Author: nvaytet

.copier-answers.yml

@@ -3,7 +3,7 @@ _commit: 3561fcd
 _src_path: gh:scipp/copier_template
 description: Diffraction data reduction for the European Spallation Source
 max_python: '3.13'
-min_python: '3.10'
+min_python: '3.11'
 namespace_package: ess
 nightly_deps: scipp,scippnexus,sciline,plopp,scippneutron,essreduce,tof
 orgname: scipp

.github/workflows/python-version-ci

@@ -1 +1 @@
-3.10
+3.11

.python-version

@@ -1 +1 @@
-3.10
+3.11

docs/developer/getting-started.md

@@ -40,7 +40,7 @@ Alternatively, if you want a different workflow, take a look at ``tox.ini`` or `
 Run the tests using
 
 ```sh
-tox -e py310
+tox -e py311
 ```
 
 (or just `tox` if you want to run all environments).

docs/user-guide/dream/dream-instrument-view.ipynb

@@ -140,27 +140,9 @@
     "full_view"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "9",
-   "metadata": {
-    "editable": true,
-    "nbsphinx": "hidden",
-    "slideshow": {
-     "slide_type": ""
-    },
-    "tags": []
-   },
-   "outputs": [],
-   "source": [
-    "full_view[2].controls[\"tof\"][\"slider\"].value = 35\n",
-    "full_view[1].toolbar.tools[\"autoscale\"].click()"
-   ]
-  },
   {
    "cell_type": "markdown",
-   "id": "10",
+   "id": "9",
    "metadata": {
     "editable": true,
     "slideshow": {
@@ -179,7 +161,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "11",
+   "id": "10",
    "metadata": {
     "editable": true,
     "slideshow": {
@@ -193,27 +175,9 @@
     "mantle_view"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "12",
-   "metadata": {
-    "editable": true,
-    "nbsphinx": "hidden",
-    "slideshow": {
-     "slide_type": ""
-    },
-    "tags": []
-   },
-   "outputs": [],
-   "source": [
-    "mantle_view[1].controls[\"tof\"][\"slider\"].value = 43\n",
-    "mantle_view[0].toolbar.tools[\"autoscale\"].click()"
-   ]
-  },
   {
    "cell_type": "markdown",
-   "id": "13",
+   "id": "11",
    "metadata": {},
    "source": [
     "The instrument view is designed to be flexible in terms of what it accepts as input.\n",
@@ -225,7 +189,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "14",
+   "id": "12",
    "metadata": {},
    "outputs": [],
    "source": [

tools/dream-make-tof-lookup-table.ipynb renamed to docs/user-guide/dream/dream-make-tof-lookup-table.ipynb

@@ -5,7 +5,9 @@
    "id": "0",
    "metadata": {},
    "source": [
-    "# Create a time-of-flight lookup table for DREAM"
+    "# Create a time-of-flight lookup table for DREAM\n",
+    "\n",
+    "This notebook shows how to create a time-of-flight lookup table for the DREAM instrument."
    ]
   },
   {
@@ -16,7 +18,6 @@
    "outputs": [],
    "source": [
     "import scipp as sc\n",
-    "import sciline as sl\n",
     "from ess.reduce import time_of_flight\n",
     "from ess.dream.beamline import InstrumentConfiguration, choppers"
    ]
@@ -26,7 +27,9 @@
    "id": "2",
    "metadata": {},
    "source": [
-    "## Select the choppers"
+    "## Select the choppers\n",
+    "\n",
+    "We select the choppers for the 'high-flux' configuration."
    ]
   },
   {
@@ -54,15 +57,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "wf = sl.Pipeline(\n",
-    "    time_of_flight.providers(), params=time_of_flight.default_parameters()\n",
-    ")\n",
+    "wf = time_of_flight.TofLookupTableWorkflow()\n",
     "\n",
     "wf[time_of_flight.LtotalRange] = sc.scalar(60.0, unit=\"m\"), sc.scalar(80.0, unit=\"m\")\n",
-    "wf[time_of_flight.SimulationResults] = time_of_flight.simulate_beamline(\n",
-    "    choppers=disk_choppers, neutrons=5_000_000, source_position=sc.vector([0, 0, 0], unit='m'),\n",
-    ")\n",
-    "\n",
+    "wf[time_of_flight.NumberOfSimulatedNeutrons] = 200_000  # Increase this number for more reliable results\n",
+    "wf[time_of_flight.SourcePosition] = sc.vector([0, 0, 0], unit='m')\n",
+    "wf[time_of_flight.DiskChoppers] = disk_choppers\n",
     "wf[time_of_flight.DistanceResolution] = sc.scalar(0.1, unit=\"m\")\n",
     "wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')\n",
     "wf[time_of_flight.LookupTableRelativeErrorThreshold] = 0.02\n",

docs/user-guide/dream/index.md

@@ -54,4 +54,5 @@ dream-instrument-view
 workflow-widget-dream
 dream-detector-diagnostics
 dream-visualize-absorption
+dream-make-tof-lookup-table
 ```

pyproject.toml

@@ -18,24 +18,23 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering",
     "Typing :: Typed",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 # IMPORTANT:
 # Run 'tox -e deps' after making changes here. This will update requirement files.
 # Make sure to list one dependency per line.
 dependencies = [
   "dask>=2022.1.0",
-  "essreduce>=25.05.3",
+  "essreduce>=25.07.0",
   "graphviz",
   "numpy>=1.25",
-  "plopp>=25.03.0",
+  "plopp>=25.07.0",
   "pythreejs>=2.4.1",
   "sciline>=25.04.1",
   "scipp>=25.05.1",

requirements/base.in

@@ -3,10 +3,10 @@
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask>=2022.1.0
-essreduce>=25.05.3
+essreduce>=25.07.0
 graphviz
 numpy>=1.25
-plopp>=25.03.0
+plopp>=25.07.0
 pythreejs>=2.4.1
 sciline>=25.04.1
 scipp>=25.05.1

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:8cd11f24389497f17c533713cf71285ce2961028
+# SHA1:14c6bcb4e6d6485d81209545674ad66d2bd9f82f
 #
 # This file was generated by pip-compile-multi.
 # To update, run:
@@ -13,9 +13,9 @@ click==8.2.1
     # via dask
 cloudpickle==3.1.1
     # via dask
-comm==0.2.2
+comm==0.2.3
     # via ipywidgets
-contourpy==1.3.2
+contourpy==1.3.3
     # via matplotlib
 cyclebane==24.10.0
     # via sciline
@@ -31,11 +31,9 @@ email-validator==2.2.0
     # via scippneutron
 essreduce==25.7.1
     # via -r base.in
-exceptiongroup==1.3.0
-    # via ipython
 executing==2.2.0
     # via stack-data
-fonttools==4.58.5
+fonttools==4.59.0
     # via matplotlib
 fsspec==2025.7.0
     # via dask
@@ -51,8 +49,10 @@ importlib-metadata==8.7.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.37.0
+ipython==9.4.0
     # via ipywidgets
+ipython-pygments-lexers==1.1.1
+    # via ipython
 ipywidgets==8.1.7
     # via
     #   ipydatawidgets
@@ -70,17 +70,17 @@ lazy-loader==0.4
     #   tof
 locket==1.0.0
     # via partd
-matplotlib==3.10.3
+matplotlib==3.10.5
     # via
     #   mpltoolbox
     #   plopp
 matplotlib-inline==0.1.7
     # via ipython
 mpltoolbox==25.5.0
     # via scippneutron
-networkx==3.4.2
+networkx==3.5
     # via cyclebane
-numpy==2.2.6
+numpy==2.3.2
     # via
     #   -r base.in
     #   contourpy
@@ -104,7 +104,7 @@ pexpect==4.9.0
     # via ipython
 pillow==11.3.0
     # via matplotlib
-plopp==25.7.0
+plopp==25.7.1
     # via
     #   -r base.in
     #   scippneutron
@@ -120,7 +120,9 @@ pydantic==2.11.7
 pydantic-core==2.33.2
     # via pydantic
 pygments==2.19.2
-    # via ipython
+    # via
+    #   ipython
+    #   ipython-pygments-lexers
 pyparsing==3.2.3
     # via matplotlib
 python-dateutil==2.9.0.post0
@@ -152,7 +154,7 @@ scippnexus==25.6.0
     #   -r base.in
     #   essreduce
     #   scippneutron
-scipy==1.15.3
+scipy==1.16.1
     # via
     #   scippneutron
     #   scippnexus
@@ -169,7 +171,6 @@ toolz==1.0.0
     #   partd
 traitlets==5.14.3
     # via
-    #   comm
     #   ipython
     #   ipywidgets
     #   matplotlib-inline
@@ -179,7 +180,6 @@ traittypes==0.2.1
     # via ipydatawidgets
 typing-extensions==4.14.1
     # via
-    #   exceptiongroup
     #   ipython
     #   pydantic
     #   pydantic-core