essreduce 25.10.2__tar.gz → 25.11.1__tar.gz

{essreduce-25.10.2 → essreduce-25.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: essreduce
-Version: 25.10.2
+Version: 25.11.1
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License-Expression: BSD-3-Clause
@@ -20,7 +20,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sciline>=25.05.1
+Requires-Dist: sciline>=25.11.0
 Requires-Dist: scipp>=25.04.0
 Requires-Dist: scippneutron>=25.02.0
 Requires-Dist: scippnexus>=25.06.0

{essreduce-25.10.2 → essreduce-25.11.1}/docs/user-guide/reduction-workflow-guidelines.md

@@ -146,6 +146,69 @@ workflow.visualize(Result)
 workflow.compute(Result)
 ```
 
+### C.6: Domain types for data products
+
+Data types that flow through the reduction workflow should follow a systematic naming convention that reflects their processing stage and coordinate space. This ensures consistency across instruments and techniques, making workflows more transferable and easier to understand.
+
+**Type structure**
+
+Domain types use a **prefix-suffix** pattern:
+- **Prefix**: Describes the processing stage (e.g., `Raw`, `Tof`, `Corrected`, `Normalized`)
+- **Suffix**: Describes the coordinate space or component (e.g., `Monitor`, `Detector`, `Q`, `Dspacing`, `Energy`)
+
+**Monitor types**
+
+Monitors follow a linear progression through processing stages:
+
+```
+EmptyMonitor      # Geometry only, calibrated
+RawMonitor        # With counts
+TofMonitor        # Time-of-flight domain
+WavelengthMonitor # Wavelength domain (end of monitor chain)
+```
+
+**Detector types**
+
+Detectors progress through both processing stages and move from "detector space" (pixel space) to, e.g., Q-space:
+
+```
+EmptyDetector      # Geometry only, calibrated, pixel-masked
+RawDetector        # With counts
+TofDetector        # With added time-of-flight coord
+WavelengthDetector # With added wavelength coord
+CorrectedDetector  # Corrections applied (masking, filtering, efficiency, Lorentz, absorption)
+CorrectedQ         # Transformed to Q-space, pixels reduced
+NormalizedQ        # Normalized (to monitor, proton charge)
+IntensityQ         # Absolute intensity, e.g., normalized to vanadium
+```
+
+Alternative domain-specific names to, e.g., `IntensityQ` such as `ReflectivityQ` are also valid.
+
+**Coordinate space variants**
+
+The final coordinate space (`Q` in the example above) should be replaced with the appropriate space for the technique:
+- `Dspacing` for d-spacing coordinates
+- `EnergyTransfer` for energy transfer
+- `TwoTheta` for scattering angle
+- Multiple dimensions can be combined: `DspacingTwoTheta`
+
+For example, a powder diffraction workflow might use:
+```
+CorrectedDetector → CorrectedDspacing → NormalizedDspacing → IntensityDspacing
+```
+
+**Guidelines**
+
+1. **Maintain the standard progression**: Keep processing stages separate unless there's a scientific reason to combine them (e.g., computational efficiency for a specific technique).
+
+2. **Prefix carries forward**: When transforming coordinate spaces without additional processing, the prefix carries forward (e.g., `CorrectedDetector` → `CorrectedQ`).
+
+3. **Skip only when appropriate**: Stages can be skipped if they don't exist for a particular technique, but avoid skipping for convenience alone.
+
+4. **Be explicit about the space**: Always include the coordinate space or component in the suffix to make the data's nature clear.
+
+5. **Consistency across instruments**: Use the same type names for equivalent processing stages across different instruments and techniques to facilitate knowledge transfer.
+
 ## D: Documentation
 
 ### D.1: Document math and references in docstrings

{essreduce-25.10.2 → essreduce-25.11.1}/docs/user-guide/tof/dream.ipynb

@@ -24,7 +24,7 @@
     "import plopp as pp\n",
     "import scipp as sc\n",
     "from scippneutron.chopper import DiskChopper\n",
-    "from ess.reduce.nexus.types import DetectorData, SampleRun\n",
+    "from ess.reduce.nexus.types import AnyRun, RawDetector, SampleRun\n",
     "from ess.reduce.time_of_flight import *"
    ]
   },
@@ -300,10 +300,10 @@
    "source": [
     "wf = GenericTofWorkflow(run_types=[SampleRun], monitor_types=[])\n",
     "\n",
-    "wf[DetectorData[SampleRun]] = raw_data\n",
+    "wf[RawDetector[SampleRun]] = raw_data\n",
     "wf[DetectorLtotal[SampleRun]] = Ltotal\n",
     "\n",
-    "wf.visualize(DetectorTofData[SampleRun])"
+    "wf.visualize(TofDetector[SampleRun])"
    ]
   },
   {
@@ -340,7 +340,7 @@
    "outputs": [],
    "source": [
     "lut_wf = TofLookupTableWorkflow()\n",
-    "lut_wf[DiskChoppers] = disk_choppers\n",
+    "lut_wf[DiskChoppers[AnyRun]] = disk_choppers\n",
     "lut_wf[SourcePosition] = source_position\n",
     "lut_wf[LtotalRange] = (\n",
     "    sc.scalar(75.5, unit=\"m\"),\n",
@@ -436,7 +436,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "id": "30",
    "metadata": {},
@@ -457,7 +456,7 @@
     "wf[TimeOfFlightLookupTable] = table\n",
     "\n",
     "# Compute time-of-flight of neutron events\n",
-    "tofs = wf.compute(DetectorTofData[SampleRun])\n",
+    "tofs = wf.compute(TofDetector[SampleRun])\n",
     "tofs"
    ]
   },
@@ -616,11 +615,11 @@
    "outputs": [],
    "source": [
     "# Update workflow\n",
-    "wf[DetectorData[SampleRun]] = raw_data\n",
+    "wf[RawDetector[SampleRun]] = raw_data\n",
     "wf[DetectorLtotal[SampleRun]] = Ltotal\n",
     "\n",
     "# Compute tofs and wavelengths\n",
-    "tofs = wf.compute(DetectorTofData[SampleRun])\n",
+    "tofs = wf.compute(TofDetector[SampleRun])\n",
     "wav_wfm = tofs.transform_coords(\"wavelength\", graph=graph)\n",
     "\n",
     "# Compare in plot\n",
@@ -713,7 +712,7 @@
    "outputs": [],
    "source": [
     "# Update workflow\n",
-    "lut_wf[DiskChoppers] = disk_choppers\n",
+    "lut_wf[DiskChoppers[AnyRun]] = disk_choppers\n",
     "\n",
     "sim = lut_wf.compute(SimulationResults)\n",
     "\n",
@@ -795,13 +794,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "wf[DetectorData[SampleRun]] = ess_beamline.get_monitor(\"detector\")[0]\n",
+    "wf[RawDetector[SampleRun]] = ess_beamline.get_monitor(\"detector\")[0]\n",
     "wf[DetectorLtotal[SampleRun]] = Ltotal\n",
     "\n",
     "wf[TimeOfFlightLookupTable] = table\n",
     "\n",
     "# Compute time-of-flight\n",
-    "tofs = wf.compute(DetectorTofData[SampleRun])\n",
+    "tofs = wf.compute(TofDetector[SampleRun])\n",
     "# Compute wavelength\n",
     "wav_wfm = tofs.transform_coords(\"wavelength\", graph=graph)\n",
     "\n",
@@ -823,17 +822,6 @@
    "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
   }
  },
  "nbformat": 4,

{essreduce-25.10.2 → essreduce-25.11.1}/docs/user-guide/tof/frame-unwrapping.ipynb

@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-   "attachments": {},
    "cell_type": "markdown",
    "id": "0",
    "metadata": {},
@@ -32,7 +31,7 @@
     "import plopp as pp\n",
     "import scipp as sc\n",
     "from scippneutron.chopper import DiskChopper\n",
-    "from ess.reduce.nexus.types import DetectorData, SampleRun\n",
+    "from ess.reduce.nexus.types import AnyRun, RawDetector, SampleRun\n",
     "from ess.reduce.time_of_flight import *\n",
     "import tof\n",
     "\n",
@@ -161,10 +160,10 @@
    "source": [
     "wf = GenericTofWorkflow(run_types=[SampleRun], monitor_types=[])\n",
     "\n",
-    "wf[DetectorData[SampleRun]] = nxevent_data\n",
+    "wf[RawDetector[SampleRun]] = nxevent_data\n",
     "wf[DetectorLtotal[SampleRun]] = nxevent_data.coords[\"Ltotal\"]\n",
     "\n",
-    "wf.visualize(DetectorTofData[SampleRun])"
+    "wf.visualize(TofDetector[SampleRun])"
    ]
   },
   {
@@ -212,7 +211,7 @@
    "source": [
     "lut_wf = TofLookupTableWorkflow()\n",
     "lut_wf[LtotalRange] = detectors[0].distance, detectors[-1].distance\n",
-    "lut_wf[DiskChoppers] = {\n",
+    "lut_wf[DiskChoppers[AnyRun]] = {\n",
     "    \"chopper\": DiskChopper(\n",
     "        frequency=-chopper.frequency,\n",
     "        beam_position=sc.scalar(0.0, unit=\"deg\"),\n",
@@ -271,7 +270,7 @@
     "wf[TimeOfFlightLookupTable] = table\n",
     "\n",
     "# Compute neutron tofs\n",
-    "tofs = wf.compute(DetectorTofData[SampleRun])\n",
+    "tofs = wf.compute(TofDetector[SampleRun])\n",
     "\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)})"
@@ -399,7 +398,7 @@
     "lut_wf = TofLookupTableWorkflow()\n",
     "lut_wf[PulseStride] = 2\n",
     "lut_wf[LtotalRange] = detectors[0].distance, detectors[-1].distance\n",
-    "lut_wf[DiskChoppers] = {\n",
+    "lut_wf[DiskChoppers[AnyRun]] = {\n",
     "    ch.name: DiskChopper(\n",
     "        frequency=-ch.frequency,\n",
     "        beam_position=sc.scalar(0.0, unit=\"deg\"),\n",
@@ -456,11 +455,11 @@
     "# Reduction workflow\n",
     "wf = GenericTofWorkflow(run_types=[SampleRun], monitor_types=[])\n",
     "nxevent_data = results.to_nxevent_data()\n",
-    "wf[DetectorData[SampleRun]] = nxevent_data\n",
+    "wf[RawDetector[SampleRun]] = nxevent_data\n",
     "wf[DetectorLtotal[SampleRun]] = nxevent_data.coords[\"Ltotal\"]\n",
     "wf[TimeOfFlightLookupTable] = table\n",
     "\n",
-    "tofs = wf.compute(DetectorTofData[SampleRun])\n",
+    "tofs = wf.compute(TofDetector[SampleRun])\n",
     "\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)})"
@@ -500,24 +499,7 @@
    ]
   }
  ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
-  }
- },
+ "metadata": {},
  "nbformat": 4,
  "nbformat_minor": 5
 }

{essreduce-25.10.2 → essreduce-25.11.1}/docs/user-guide/tof/wfm.ipynb

@@ -25,7 +25,7 @@
     "import plopp as pp\n",
     "import scipp as sc\n",
     "from scippneutron.chopper import DiskChopper\n",
-    "from ess.reduce.nexus.types import DetectorData, SampleRun\n",
+    "from ess.reduce.nexus.types import AnyRun, RawDetector, SampleRun\n",
     "from ess.reduce.time_of_flight import *"
    ]
   },
@@ -321,10 +321,10 @@
    "source": [
     "wf = GenericTofWorkflow(run_types=[SampleRun], monitor_types=[])\n",
     "\n",
-    "wf[DetectorData[SampleRun]] = raw_data\n",
+    "wf[RawDetector[SampleRun]] = raw_data\n",
     "wf[DetectorLtotal[SampleRun]] = Ltotal\n",
     "\n",
-    "wf.visualize(DetectorTofData[SampleRun])"
+    "wf.visualize(TofDetector[SampleRun])"
    ]
   },
   {
@@ -361,7 +361,7 @@
    "outputs": [],
    "source": [
     "lut_wf = TofLookupTableWorkflow()\n",
-    "lut_wf[DiskChoppers] = disk_choppers\n",
+    "lut_wf[DiskChoppers[AnyRun]] = disk_choppers\n",
     "lut_wf[SourcePosition] = source_position\n",
     "lut_wf[LtotalRange] = Ltotal, Ltotal\n",
     "lut_wf[LookupTableRelativeErrorThreshold] = 0.1\n",
@@ -442,7 +442,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "id": "27",
    "metadata": {},
@@ -466,7 +465,7 @@
    "source": [
     "wf[TimeOfFlightLookupTable] = table\n",
     "\n",
-    "tofs = wf.compute(DetectorTofData[SampleRun])\n",
+    "tofs = wf.compute(TofDetector[SampleRun])\n",
     "tofs"
    ]
   },
@@ -549,24 +548,7 @@
    ]
   }
  ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
-  }
- },
+ "metadata": {},
  "nbformat": 4,
  "nbformat_minor": 5
 }

{essreduce-25.10.2 → essreduce-25.11.1}/pyproject.toml

@@ -30,7 +30,7 @@ requires-python = ">=3.11"
 # Run 'tox -e deps' after making changes here. This will update requirement files.
 # Make sure to list one dependency per line.
 dependencies = [
-    "sciline>=25.05.1",
+    "sciline>=25.11.0",
     "scipp>=25.04.0",
     "scippneutron>=25.02.0",
     "scippnexus>=25.06.0",

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/base.in

@@ -2,7 +2,7 @@
 # will not be touched by ``make_base.py``
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
-sciline>=25.05.1
+sciline>=25.11.0
 scipp>=25.04.0
 scippneutron>=25.02.0
 scippnexus>=25.06.0

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:99f16c205324f8050cb96af707a607064a1a39a3
+# SHA1:e86f9d2876cf304569910ff89826c8e5aac84bf8
 #
 # This file was generated by pip-compile-multi.
 # To update, run:
@@ -66,9 +66,9 @@ python-dateutil==2.9.0.post0
     #   matplotlib
     #   scippneutron
     #   scippnexus
-sciline==25.8.0
+sciline==25.11.0
     # via -r base.in
-scipp==25.8.0
+scipp==25.11.0
     # via
     #   -r base.in
     #   scippneutron
@@ -79,7 +79,7 @@ scippnexus==25.6.0
     # via
     #   -r base.in
     #   scippneutron
-scipy==1.16.2
+scipy==1.16.3
     # via
     #   scippneutron
     #   scippnexus

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/basetest.txt

@@ -31,11 +31,11 @@ ipython==9.6.0
     # via ipywidgets
 ipython-pygments-lexers==1.1.1
     # via ipython
-ipywidgets==8.1.7
+ipywidgets==8.1.8
     # via -r basetest.in
 jedi==0.19.2
     # via ipython
-jupyterlab-widgets==3.0.15
+jupyterlab-widgets==3.0.16
     # via ipywidgets
 kiwisolver==1.4.9
     # via matplotlib
@@ -97,9 +97,9 @@ python-dateutil==2.9.0.post0
     # via matplotlib
 requests==2.32.5
     # via pooch
-scipp==25.8.0
+scipp==25.11.0
     # via tof
-scipy==1.16.2
+scipy==1.16.3
     # via
     #   -r basetest.in
     #   tof
@@ -120,5 +120,5 @@ urllib3==2.5.0
     # via requests
 wcwidth==0.2.14
     # via prompt-toolkit
-widgetsnbextension==4.0.14
+widgetsnbextension==4.0.15
     # via ipywidgets

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/ci.txt

@@ -48,5 +48,5 @@ tox==4.32.0
     # via -r ci.in
 urllib3==2.5.0
     # via requests
-virtualenv==20.35.3
+virtualenv==20.35.4
     # via tox

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/dev.txt

@@ -83,7 +83,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
@@ -117,7 +117,7 @@ tzdata==2025.2
     # via arrow
 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

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/docs.txt

@@ -65,7 +65,7 @@ ipython==9.6.0
     #   ipywidgets
 ipython-pygments-lexers==1.1.1
     # via ipython
-ipywidgets==8.1.7
+ipywidgets==8.1.8
     # via -r docs.in
 jedi==0.19.2
     # via ipython
@@ -92,7 +92,7 @@ jupyter-core==5.9.1
     #   nbformat
 jupyterlab-pygments==0.3.0
     # via nbconvert
-jupyterlab-widgets==3.0.15
+jupyterlab-widgets==3.0.16
     # via ipywidgets
 llvmlite==0.45.1
     # via numba
@@ -141,7 +141,7 @@ platformdirs==4.5.0
     # via jupyter-core
 prompt-toolkit==3.0.52
     # via ipython
-psutil==7.1.2
+psutil==7.1.3
     # via ipykernel
 ptyprocess==0.7.0
     # via pexpect
@@ -239,5 +239,5 @@ webencodings==0.5.1
     # via
     #   bleach
     #   tinycss2
-widgetsnbextension==4.0.14
+widgetsnbextension==4.0.15
     # via ipywidgets

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/nightly.txt

@@ -50,11 +50,11 @@ ipython==9.6.0
     # via ipywidgets
 ipython-pygments-lexers==1.1.1
     # via ipython
-ipywidgets==8.1.7
+ipywidgets==8.1.8
     # via -r nightly.in
 jedi==0.19.2
     # via ipython
-jupyterlab-widgets==3.0.15
+jupyterlab-widgets==3.0.16
     # via ipywidgets
 kiwisolver==1.4.10rc0
     # via matplotlib
@@ -147,7 +147,7 @@ scippnexus @ git+https://github.com/scipp/scippnexus@main
     # via
     #   -r nightly.in
     #   scippneutron
-scipy==1.16.2
+scipy==1.16.3
     # via
     #   -r nightly.in
     #   scippneutron
@@ -177,5 +177,5 @@ urllib3==2.5.0
     # via requests
 wcwidth==0.2.14
     # via prompt-toolkit
-widgetsnbextension==4.0.14
+widgetsnbextension==4.0.15
     # via ipywidgets

{essreduce-25.10.2 → essreduce-25.11.1}/requirements/static.txt

@@ -21,5 +21,5 @@ pre-commit==4.3.0
     # via -r static.in
 pyyaml==6.0.3
     # via pre-commit
-virtualenv==20.35.3
+virtualenv==20.35.4
     # via pre-commit

{essreduce-25.10.2 → essreduce-25.11.1}/src/ess/reduce/live/raw.py

@@ -29,7 +29,7 @@ import scipp as sc
 import scippnexus as snx
 
 from ess.reduce.nexus.types import (
-    CalibratedDetector,
+    EmptyDetector,
     Filename,
     NeXusComponent,
     NeXusDetectorName,
@@ -305,7 +305,7 @@ class RollingDetectorView(Detector):
 
     @staticmethod
     def from_detector_and_histogrammer(
-        detector: CalibratedDetector[SampleRun],
+        detector: EmptyDetector[SampleRun],
         window: RollingDetectorViewWindow,
         projection: Histogrammer,
     ) -> RollingDetectorView:
@@ -320,10 +320,10 @@ class RollingDetectorView(Detector):
     def from_detector_with_projection(
         projection: Callable[[sc.DataArray], sc.DataArray] | None,
     ) -> Callable[
-        [CalibratedDetector[SampleRun], RollingDetectorViewWindow], RollingDetectorView
+        [EmptyDetector[SampleRun], RollingDetectorViewWindow], RollingDetectorView
     ]:
         def factory(
-            detector: CalibratedDetector[SampleRun],
+            detector: EmptyDetector[SampleRun],
             window: RollingDetectorViewWindow,
         ) -> RollingDetectorView:
             """Helper for constructing via a Sciline workflow."""
@@ -591,7 +591,7 @@ def gaussian_position_noise(sigma: PositionNoiseSigma) -> PositionNoise:
 
 def position_with_noisy_replicas(
     *,
-    detector: CalibratedDetector[SampleRun],
+    detector: EmptyDetector[SampleRun],
     position_noise: PositionNoise,
     replicas: PositionNoiseReplicaCount,
 ) -> CalibratedPositionWithNoisyReplicas:

{essreduce-25.10.2 → essreduce-25.11.1}/src/ess/reduce/nexus/types.py

@@ -40,6 +40,14 @@ PreopenNeXusFile = NewType('PreopenNeXusFile', bool)
 # 1  TypeVars used to parametrize the generic parts of the workflow
 
 # 1.1  Run types
+
+AnyRun = NewType("AnyRun", int)
+"""RunType that does not represent a specific measurement run.
+
+This can be used in cases where it makes no sense to use an 'actual' run type
+like ``SampleRun`` or ``BackgroundRun``.
+"""
+
 BackgroundRun = NewType('BackgroundRun', int)
 """Background run such as a run with only a solvent which the sample is placed in."""
 EmptyBeamRun = NewType('EmptyBeamRun', int)
@@ -136,12 +144,17 @@ This list will be supplemented with monitor types when creating a pipeline.
 UniqueComponent = TypeVar('UniqueComponent', snx.NXsample, snx.NXsource)
 """Components that can be identified by their type as there will only be one."""
 
-Beamline = scn_meta.Beamline
-"""Beamline metadata."""
-Measurement = scn_meta.Measurement
-"""measurement metadata."""
-Source = scn_meta.Source
-"""Neutron source metadata."""
+
+class Beamline(scn_meta.Beamline, Generic[RunType]):
+    """Beamline metadata."""
+
+
+class Measurement(scn_meta.Measurement, Generic[RunType]):
+    """measurement metadata."""
+
+
+class Source(scn_meta.Source, Generic[RunType]):
+    """Neutron source metadata."""
 
 
 class NeXusName(sciline.Scope[Component, str], str):
@@ -186,25 +199,19 @@ class MonitorPositionOffset(
     """Offset for the monitor position, added to base position."""
 
 
-class CalibratedDetector(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
-    """Calibrated data from a detector."""
+class EmptyDetector(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
+    """Detector without neutron data."""
 
 
-class CalibratedBeamline(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
-    """Calibrated beamline with detector and other components."""
-
-
-class CalibratedMonitor(
-    sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray
-):
-    """Calibrated data from a monitor."""
+class EmptyMonitor(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray):
+    """Monitor without neutron data."""
 
 
-class DetectorData(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
+class RawDetector(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
     """Calibrated detector merged with neutron event or histogram data."""
 
 
-class MonitorData(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray):
+class RawMonitor(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray):
     """Calibrated monitor merged with neutron event or histogram data."""