essreduce 25.1.1__tar.gz → 25.2.1__tar.gz

{essreduce-25.1.1 → essreduce-25.2.1}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: aa5dc5e
+_commit: 5c4fd02
 _src_path: gh:scipp/copier_template
 description: Common data reduction tools for the ESS facility
 max_python: '3.13'

{essreduce-25.1.1 → essreduce-25.2.1}/.github/workflows/docs.yml

@@ -69,7 +69,7 @@ jobs:
           name: docs_html
           path: html/
 
-      - uses: JamesIves/github-pages-deploy-action@v4.6.9
+      - uses: JamesIves/github-pages-deploy-action@v4.7.2
         if: ${{ inputs.publish }}
         with:
           branch: gh-pages

essreduce-25.2.1/.github/workflows/weekly_windows_macos.yml

@@ -0,0 +1,42 @@
+name: Windows and MacOS weekly tests
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * 1'
+
+jobs:
+  pytox:
+    name: Python and Tox env
+    runs-on: 'ubuntu-24.04'
+    outputs:
+      min_python: ${{ steps.vars.outputs.min_python }}
+      min_tox_env: ${{ steps.vars.outputs.min_tox_env }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get Python version for other CI jobs
+        id: vars
+        run: |
+          echo "min_python=$(cat .github/workflows/python-version-ci)" >> $GITHUB_OUTPUT
+          echo "min_tox_env=py$(cat .github/workflows/python-version-ci | sed 's/\.//g')" >> $GITHUB_OUTPUT
+  tests:
+    name: Tests
+    needs: pytox
+    strategy:
+      matrix:
+        os: ['macos-latest', 'windows-latest']
+        python:
+          - version: '${{needs.pytox.outputs.min_python}}'
+            tox-env: '${{needs.pytox.outputs.min_tox_env}}'
+    uses: ./.github/workflows/test.yml
+    with:
+      os-variant: ${{ matrix.os }}
+      python-version: ${{ matrix.python.version }}
+      tox-env: ${{ matrix.python.tox-env }}
+
+  docs:
+    needs: tests
+    uses: ./.github/workflows/docs.yml
+    with:
+      publish: false
+      branch: ${{ github.head_ref == '' && github.ref_name || github.head_ref }}

{essreduce-25.1.1 → essreduce-25.2.1}/.gitignore

@@ -4,7 +4,8 @@ dist
 html
 .tox
 *.egg-info
-uv.lock  # we lock dependencies with pip-compile, not uv
+# we lock dependencies with pip-compile, not uv
+uv.lock
 
 *.sw?
 

{essreduce-25.1.1 → essreduce-25.2.1}/.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
         args: [ "--drop-empty-cells",
                 "--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.9
+    rev: v0.8.0
     hooks:
       - id: ruff
         args: [ --fix ]

{essreduce-25.1.1/src/essreduce.egg-info → essreduce-25.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: essreduce
-Version: 25.1.1
+Version: 25.2.1
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License: BSD 3-Clause License

{essreduce-25.1.1 → essreduce-25.2.1}/docs/user-guide/tof/dream.ipynb

@@ -239,7 +239,7 @@
     "raw_data = ess_beamline.get_monitor(\"detector\")[0]\n",
     "\n",
     "# Visualize\n",
-    "raw_data.hist(event_time_offset=300).sum(\"pulse\").plot()"
+    "raw_data.hist(event_time_offset=300).squeeze().plot()"
    ]
   },
   {
@@ -290,8 +290,10 @@
     "    time_of_flight.providers(), params=time_of_flight.default_parameters()\n",
     ")\n",
     "workflow[time_of_flight.RawData] = raw_data\n",
-    "workflow[time_of_flight.LtotalRange] = (sc.scalar(75.5, unit='m'),\n",
-    "                                        sc.scalar(78.0, unit='m'))\n",
+    "workflow[time_of_flight.LtotalRange] = (\n",
+    "    sc.scalar(75.5, unit=\"m\"),\n",
+    "    sc.scalar(78.0, unit=\"m\"),\n",
+    ")\n",
     "\n",
     "workflow.visualize(time_of_flight.TofData)"
    ]
@@ -314,8 +316,7 @@
    "outputs": [],
    "source": [
     "workflow[time_of_flight.SimulationResults] = time_of_flight.simulate_beamline(\n",
-    "    choppers=disk_choppers,\n",
-    "    neutrons=2_000_000\n",
+    "    choppers=disk_choppers, neutrons=2_000_000\n",
     ")"
    ]
   },
@@ -343,17 +344,24 @@
    "outputs": [],
    "source": [
     "sim = workflow.compute(time_of_flight.SimulationResults)\n",
-    "# Compute time-of-arrival at the detector\n",
-    "tarrival = sim.time_of_arrival + ((Ltotal - sim.distance) / sim.speed).to(unit=\"us\")\n",
-    "# Compute time-of-flight at the detector\n",
-    "tflight = (Ltotal / sim.speed).to(unit=\"us\")\n",
-    "\n",
-    "events = sc.DataArray(\n",
-    "    data=sim.weight,\n",
-    "    coords={\"wavelength\": sim.wavelength, \"toa\": tarrival, \"tof\": tflight},\n",
-    ")\n",
-    "fig1 = events.hist(wavelength=300, toa=300).plot(norm=\"log\")\n",
-    "fig2 = events.hist(tof=300, toa=300).plot(norm=\"log\")\n",
+    "\n",
+    "\n",
+    "def to_event_time_offset(sim):\n",
+    "    # Compute event_time_offset at the detector\n",
+    "    eto = (\n",
+    "        sim.time_of_arrival + ((Ltotal - sim.distance) / sim.speed).to(unit=\"us\")\n",
+    "    ) % sc.scalar(1e6 / 14.0, unit=\"us\")\n",
+    "    # Compute time-of-flight at the detector\n",
+    "    tof = (Ltotal / sim.speed).to(unit=\"us\")\n",
+    "    return sc.DataArray(\n",
+    "        data=sim.weight,\n",
+    "        coords={\"wavelength\": sim.wavelength, \"event_time_offset\": eto, \"tof\": tof},\n",
+    "    )\n",
+    "\n",
+    "\n",
+    "events = to_event_time_offset(sim)\n",
+    "fig1 = events.hist(wavelength=300, event_time_offset=300).plot(norm=\"log\")\n",
+    "fig2 = events.hist(tof=300, event_time_offset=300).plot(norm=\"log\")\n",
     "fig1 + fig2"
    ]
   },
@@ -374,10 +382,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable)\n",
+    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable).squeeze()\n",
     "\n",
     "# Overlay mean on the figure above\n",
-    "table[\"distance\", 13].plot(ax=fig2.ax, color=\"C1\", ls='-', marker=None)"
+    "table[\"distance\", 13].plot(ax=fig2.ax, color=\"C1\", ls=\"-\", marker=None)"
    ]
   },
   {
@@ -447,7 +455,8 @@
     "# Define wavelength bin edges\n",
     "wavs = sc.linspace(\"wavelength\", 0.8, 4.6, 201, unit=\"angstrom\")\n",
     "\n",
-    "wav_wfm.hist(wavelength=wavs).sum(\"pulse\").plot()"
+    "histogrammed = wav_wfm.hist(wavelength=wavs).squeeze()\n",
+    "histogrammed.plot()"
    ]
   },
   {
@@ -473,7 +482,7 @@
     "\n",
     "pp.plot(\n",
     "    {\n",
-    "        \"wfm\": wav_wfm.hist(wavelength=wavs).sum(\"pulse\"),\n",
+    "        \"wfm\": histogrammed,\n",
     "        \"ground_truth\": ground_truth.hist(wavelength=wavs),\n",
     "    }\n",
     ")"
@@ -530,16 +539,12 @@
    "outputs": [],
    "source": [
     "raw_data = sc.concat(\n",
-    "    [ess_beamline.get_monitor(key)[0] for key in monitors.keys()],\n",
+    "    [ess_beamline.get_monitor(key)[0].squeeze() for key in monitors.keys()],\n",
     "    dim=\"detector_number\",\n",
     ")\n",
     "\n",
     "# Visualize\n",
-    "pp.plot(\n",
-    "    sc.collapse(\n",
-    "        raw_data.hist(event_time_offset=300).sum(\"pulse\"), keep=\"event_time_offset\"\n",
-    "    )\n",
-    ")"
+    "pp.plot(sc.collapse(raw_data.hist(event_time_offset=300), keep=\"event_time_offset\"))"
    ]
   },
   {
@@ -655,22 +660,14 @@
    "source": [
     "# Update workflow\n",
     "workflow[time_of_flight.SimulationResults] = time_of_flight.simulate_beamline(\n",
-    "    choppers=disk_choppers,\n",
-    "    neutrons=2_000_000\n",
+    "    choppers=disk_choppers, neutrons=2_000_000\n",
     ")\n",
     "workflow[time_of_flight.RawData] = ess_beamline.get_monitor(\"detector\")[0]\n",
     "\n",
     "sim = workflow.compute(time_of_flight.SimulationResults)\n",
-    "# Compute time-of-arrival at the detector\n",
-    "tarrival = sim.time_of_arrival + ((Ltotal - sim.distance) / sim.speed).to(unit=\"us\")\n",
-    "# Compute time-of-flight at the detector\n",
-    "tflight = (Ltotal / sim.speed).to(unit=\"us\")\n",
-    "\n",
-    "events = sc.DataArray(\n",
-    "    data=sim.weight,\n",
-    "    coords={\"wavelength\": sim.wavelength, \"toa\": tarrival, \"tof\": tflight},\n",
-    ")\n",
-    "events.hist(wavelength=300, toa=300).plot(norm=\"log\")"
+    "\n",
+    "events = to_event_time_offset(sim)\n",
+    "events.hist(wavelength=300, event_time_offset=300).plot(norm=\"log\")"
    ]
   },
   {
@@ -696,7 +693,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable)\n",
+    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable).squeeze()\n",
     "table.plot() / (sc.stddevs(table) / sc.values(table)).plot(norm=\"log\")"
    ]
   },
@@ -720,9 +717,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow[time_of_flight.LookupTableRelativeErrorThreshold] = 1.0e-2\n",
+    "workflow[time_of_flight.LookupTableRelativeErrorThreshold] = 0.01\n",
     "\n",
-    "workflow.compute(time_of_flight.MaskedTimeOfFlightLookupTable).plot()"
+    "workflow.compute(time_of_flight.TimeOfFlightLookupTable).squeeze().plot()"
    ]
   },
   {
@@ -757,7 +754,7 @@
     "\n",
     "pp.plot(\n",
     "    {\n",
-    "        \"wfm\": wav_wfm.hist(wavelength=wavs).sum(\"pulse\"),\n",
+    "        \"wfm\": wav_wfm.hist(wavelength=wavs).squeeze(),\n",
     "        \"ground_truth\": ground_truth.hist(wavelength=wavs),\n",
     "    }\n",
     ")"

{essreduce-25.1.1 → essreduce-25.2.1}/docs/user-guide/tof/frame-unwrapping.ipynb

@@ -88,22 +88,12 @@
     "\n",
     "model = tof.Model(source=source, choppers=[chopper], detectors=detectors)\n",
     "results = model.run()\n",
-    "pl = results.plot(cmap=\"viridis_r\")\n",
+    "pl = results.plot()\n",
     "\n",
-    "for i in range(source.pulses):\n",
+    "for i in range(2 * source.pulses):\n",
     "    pl.ax.axvline(\n",
     "        i * (1.0 / source.frequency).to(unit=\"us\").value, color=\"k\", ls=\"dotted\"\n",
-    "    )\n",
-    "    x = [\n",
-    "        results[det.name].toas.data[\"visible\"][f\"pulse:{i}\"].coords[\"toa\"].min().value\n",
-    "        for det in detectors\n",
-    "    ]\n",
-    "    y = [det.distance.value for det in detectors]\n",
-    "    pl.ax.plot(x, y, \"--o\", color=\"magenta\", lw=3)\n",
-    "    if i == 0:\n",
-    "        pl.ax.text(\n",
-    "            x[2], y[2] * 1.05, \"pivot time\", va=\"bottom\", ha=\"right\", color=\"magenta\"\n",
-    "        )"
+    "    )"
    ]
   },
   {
@@ -142,14 +132,6 @@
     "        .hist(event_time_offset=200)\n",
     "        .plot(title=f\"{det.name}={det.distance:c}\", color=f\"C{i}\")\n",
     "    )\n",
-    "    f = subplots[i // 2, i % 2]\n",
-    "    xpiv = min(\n",
-    "        da.coords[\"toa\"].min() % (1.0 / source.frequency).to(unit=\"us\")\n",
-    "        for da in results[det.name].toas.data[\"visible\"].values()\n",
-    "    ).value\n",
-    "    f.ax.axvline(xpiv, ls=\"dashed\", color=\"magenta\", lw=2)\n",
-    "    f.ax.text(xpiv, 20, \"pivot time\", rotation=90, color=\"magenta\")\n",
-    "    f.canvas.draw()\n",
     "subplots"
    ]
   },
@@ -157,39 +139,23 @@
    "cell_type": "markdown",
    "id": "7",
    "metadata": {},
-   "source": [
-    "### Pivot time\n",
-    "\n",
-    "To compute the time-of-flight for a neutron, we need to identify which source pulse it originated from.\n",
-    "\n",
-    "In the first figure, the pink lines represent the earliest recorded arrival time at each detector:\n",
-    "we know that within a given frame at a selected detector,\n",
-    "any neutron recorded at a time earlier than this 'pivot' time must from from a previous pulse.\n",
-    "\n",
-    "The position of the pink lines is repeated in the second figure (above).\n",
-    "We can use this knowledge to unwrap the frames and compute the absolute time-of-arrival of the neutrons at the detectors."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "8",
-   "metadata": {},
    "source": [
     "### Computing time-of-flight\n",
     "\n",
-    "The pivot time and the resulting offsets can be computed from the properties of the source pulse and the chopper cascade.\n",
-    "\n",
     "We describe in this section the workflow that computes time-of-flight,\n",
     "given `event_time_zero` and `event_time_offset` for neutron events,\n",
     "as well as the properties of the source pulse and the choppers in the beamline.\n",
     "\n",
+    "In short, we use a lookup table which can predict the wavelength (or time-of-flight) of the neutrons,\n",
+    "according to their `event_time_offset`.\n",
+    "\n",
     "The workflow can be visualized as follows:"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9",
+   "id": "8",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -221,95 +187,16 @@
   },
   {
    "cell_type": "markdown",
-   "id": "10",
-   "metadata": {},
-   "source": [
-    "#### Unwrapped neutron time-of-arrival\n",
-    "\n",
-    "The first step that is computed in the workflow is the unwrapped detector arrival time of each neutron.\n",
-    "This is essentially just `event_time_offset + event_time_zero`."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "11",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "da = workflow.compute(time_of_flight.UnwrappedTimeOfArrival)[\n",
-    "    \"detector_number\", 2\n",
-    "]  # Look at a single detector\n",
-    "da.bins.concat().value.hist(time_of_arrival=300).plot()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "12",
-   "metadata": {},
-   "source": [
-    "#### Unwrapped neutron time-of-arrival minus pivot time\n",
-    "\n",
-    "The next step is to subtract the pivot time to the unwrapped arrival times,\n",
-    "to align the times so that they start at zero.\n",
-    "\n",
-    "This allows us to perform a computationally cheap modulo operation on the times below."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "13",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "da = workflow.compute(time_of_flight.UnwrappedTimeOfArrivalMinusPivotTime)[\n",
-    "    \"detector_number\", 2\n",
-    "]\n",
-    "f = da.bins.concat().value.hist(time_of_arrival=300).plot()\n",
-    "for i in range(source.pulses):\n",
-    "    f.ax.axvline(\n",
-    "        i * (1.0 / source.frequency).to(unit=\"us\").value, color=\"k\", ls=\"dotted\"\n",
-    "    )\n",
-    "f"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "14",
-   "metadata": {},
-   "source": [
-    "The vertical dotted lines here represent the frame period.\n",
-    "\n",
-    "#### Unwrapped neutron time-of-arrival modulo the frame period\n",
-    "\n",
-    "We now wrap the arrival times with the frame period to obtain well formed (unbroken) set of events.\n",
-    "\n",
-    "We also re-add the pivot time offset we had subtracted earlier (to enable to modulo operation)."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "15",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "da = workflow.compute(time_of_flight.FrameFoldedTimeOfArrival)[\"detector_number\", 2]\n",
-    "da.bins.concat().value.hist(time_of_arrival=200).plot()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "16",
+   "id": "9",
    "metadata": {},
    "source": [
-    "#### Create a lookup table\n",
+    "#### Create the lookup table\n",
     "\n",
-    "The chopper information is next used to construct a lookup table that provides an estimate of the real time-of-flight as a function of time-of-arrival.\n",
+    "The chopper information is used to construct a lookup table that provides an estimate of the real time-of-flight as a function of time-of-arrival.\n",
     "\n",
     "The `tof` module can be used to propagate a pulse of neutrons through the chopper system to the detectors,\n",
     "and predict the most likely neutron wavelength for a given time-of-arrival.\n",
+    "More advanced programs such as McStas can of course also be used for even better results.\n",
     "\n",
     "We typically have hundreds of thousands of pixels in an instrument,\n",
     "but it is actually not necessary to propagate the neutrons to 10<sup>5</sup> detectors.\n",
@@ -332,17 +219,17 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "17",
+   "id": "10",
    "metadata": {},
    "outputs": [],
    "source": [
-    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable)\n",
+    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable).squeeze()\n",
     "table.plot()"
    ]
   },
   {
    "cell_type": "markdown",
-   "id": "18",
+   "id": "11",
    "metadata": {},
    "source": [
     "#### Computing time-of-flight from the lookup\n",
@@ -353,19 +240,19 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "19",
+   "id": "12",
    "metadata": {},
    "outputs": [],
    "source": [
     "tofs = workflow.compute(time_of_flight.TofData)\n",
     "\n",
-    "tof_hist = tofs.bins.concat(\"pulse\").hist(tof=sc.scalar(500.0, unit=\"us\"))\n",
+    "tof_hist = tofs.hist(tof=sc.scalar(500.0, unit=\"us\"))\n",
     "pp.plot({det.name: tof_hist[\"detector_number\", i] for i, det in enumerate(detectors)})"
    ]
   },
   {
    "cell_type": "markdown",
-   "id": "20",
+   "id": "13",
    "metadata": {},
    "source": [
     "### Converting to wavelength\n",
@@ -379,7 +266,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "21",
+   "id": "14",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -393,11 +280,7 @@
     "bins = sc.linspace(\"wavelength\", 6.0, 9.0, 101, unit=\"angstrom\")\n",
     "\n",
     "# Compute wavelengths\n",
-    "wav_hist = (\n",
-    "    tofs.transform_coords(\"wavelength\", graph=graph)\n",
-    "    .bins.concat(\"pulse\")\n",
-    "    .hist(wavelength=bins)\n",
-    ")\n",
+    "wav_hist = tofs.transform_coords(\"wavelength\", graph=graph).hist(wavelength=bins)\n",
     "wavs = {det.name: wav_hist[\"detector_number\", i] for i, det in enumerate(detectors)}\n",
     "\n",
     "ground_truth = results[\"detector\"].data.flatten(to=\"event\")\n",
@@ -411,7 +294,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "22",
+   "id": "15",
    "metadata": {},
    "source": [
     "We see that all detectors agree on the wavelength spectrum,\n",
@@ -432,7 +315,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "23",
+   "id": "16",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -467,7 +350,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "24",
+   "id": "17",
    "metadata": {},
    "source": [
     "### Computing time-of-flight\n",
@@ -481,7 +364,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "25",
+   "id": "18",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -517,27 +400,27 @@
   },
   {
    "cell_type": "markdown",
-   "id": "26",
+   "id": "19",
    "metadata": {},
    "source": [
-    "If we inspect the time-of-flight lookup table,\n",
-    "we can see that the time-of-arrival (toa) dimension now spans longer than the pulse period of 71 ms."
+    "The time-of-flight lookup table now has an extra `pulse` dimension for each pulse in the stride:"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "27",
+   "id": "20",
    "metadata": {},
    "outputs": [],
    "source": [
     "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable)\n",
-    "table.plot()"
+    "\n",
+    "table[\"pulse\", 0].plot(title=\"Pulse-0\") + table[\"pulse\", 1].plot(title=\"Pulse-1\")"
    ]
   },
   {
    "cell_type": "markdown",
-   "id": "28",
+   "id": "21",
    "metadata": {},
    "source": [
     "The time-of-flight profiles are then:"
@@ -546,19 +429,19 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "29",
+   "id": "22",
    "metadata": {},
    "outputs": [],
    "source": [
     "tofs = workflow.compute(time_of_flight.TofData)\n",
     "\n",
-    "tof_hist = tofs.bins.concat(\"pulse\").hist(tof=sc.scalar(500.0, unit=\"us\"))\n",
+    "tof_hist = tofs.hist(tof=sc.scalar(500.0, unit=\"us\"))\n",
     "pp.plot({det.name: tof_hist[\"detector_number\", i] for i, det in enumerate(detectors)})"
    ]
   },
   {
    "cell_type": "markdown",
-   "id": "30",
+   "id": "23",
    "metadata": {},
    "source": [
     "### Conversion to wavelength\n",
@@ -569,7 +452,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "31",
+   "id": "24",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -577,11 +460,7 @@
     "bins = sc.linspace(\"wavelength\", 1.0, 8.0, 401, unit=\"angstrom\")\n",
     "\n",
     "# Compute wavelengths\n",
-    "wav_hist = (\n",
-    "    tofs.transform_coords(\"wavelength\", graph=graph)\n",
-    "    .bins.concat(\"pulse\")\n",
-    "    .hist(wavelength=bins)\n",
-    ")\n",
+    "wav_hist = tofs.transform_coords(\"wavelength\", graph=graph).hist(wavelength=bins)\n",
     "wavs = {det.name: wav_hist[\"detector_number\", i] for i, det in enumerate(detectors)}\n",
     "\n",
     "ground_truth = results[\"detector\"].data.flatten(to=\"event\")\n",

{essreduce-25.1.1 → essreduce-25.2.1}/docs/user-guide/tof/wfm.ipynb

@@ -259,7 +259,7 @@
     "raw_data = ess_beamline.get_monitor(\"detector\")[0]\n",
     "\n",
     "# Visualize\n",
-    "raw_data.hist(event_time_offset=300).sum(\"pulse\").plot()"
+    "raw_data.hist(event_time_offset=300).squeeze().plot()"
    ]
   },
   {
@@ -394,7 +394,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable)\n",
+    "table = workflow.compute(time_of_flight.TimeOfFlightLookupTable).squeeze()\n",
     "\n",
     "# Overlay mean on the figure above\n",
     "table[\"distance\", 1].plot(ax=fig2.ax, color=\"C1\", ls=\"-\", marker=None)\n",
@@ -477,7 +477,8 @@
     "# Define wavelength bin edges\n",
     "wavs = sc.linspace(\"wavelength\", 2, 10, 301, unit=\"angstrom\")\n",
     "\n",
-    "wav_wfm.hist(wavelength=wavs).sum(\"pulse\").plot()"
+    "histogrammed = wav_wfm.hist(wavelength=wavs).squeeze()\n",
+    "histogrammed.plot()"
    ]
   },
   {
@@ -503,7 +504,7 @@
     "\n",
     "pp.plot(\n",
     "    {\n",
-    "        \"wfm\": wav_wfm.hist(wavelength=wavs).sum(\"pulse\"),\n",
+    "        \"wfm\": histogrammed,\n",
     "        \"ground_truth\": ground_truth.hist(wavelength=wavs),\n",
     "    }\n",
     ")"