essdiffraction 25.5.0__tar.gz → 25.5.1__tar.gz

{essdiffraction-25.5.0/src/essdiffraction.egg-info → essdiffraction-25.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: essdiffraction
-Version: 25.5.0
+Version: 25.5.1
 Summary: Diffraction data reduction for the European Spallation Source
 Author: Scipp contributors
 License-Expression: BSD-3-Clause
@@ -22,7 +22,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dask
-Requires-Dist: essreduce>=25.05.1
+Requires-Dist: essreduce>=25.05.2
 Requires-Dist: graphviz
 Requires-Dist: numpy
 Requires-Dist: plopp>=25.03.0

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/docs/user-guide/dream/dream-advanced-powder-reduction.ipynb

@@ -56,12 +56,12 @@
     "\n",
     "workflow[Filename[SampleRun]] = dream.data.simulated_diamond_sample()\n",
     "workflow[Filename[VanadiumRun]] = dream.data.simulated_vanadium_sample()\n",
-    "workflow[Filename[BackgroundRun]] = dream.data.simulated_empty_can()\n",
+    "workflow[Filename[EmptyCanRun]] = dream.data.simulated_empty_can()\n",
     "workflow[CalibrationFilename] = None\n",
     "\n",
     "workflow[MonitorFilename[SampleRun]] = dream.data.simulated_monitor_diamond_sample()\n",
     "workflow[MonitorFilename[VanadiumRun]] = dream.data.simulated_monitor_vanadium_sample()\n",
-    "workflow[MonitorFilename[BackgroundRun]] = dream.data.simulated_monitor_empty_can()\n",
+    "workflow[MonitorFilename[EmptyCanRun]] = dream.data.simulated_monitor_empty_can()\n",
     "workflow[CaveMonitorPosition] = sc.vector([0.0, 0.0, -4220.0], unit=\"mm\")\n",
     "\n",
     "workflow[dream.InstrumentConfiguration] = dream.InstrumentConfiguration.high_flux\n",
@@ -111,7 +111,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow.visualize(IofDspacingTwoTheta, graph_attr={\"rankdir\": \"LR\"})"
+    "workflow.visualize(IofDspacingTwoTheta[SampleRun], graph_attr={\"rankdir\": \"LR\"})"
    ]
   },
   {
@@ -129,7 +129,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "grouped_dspacing = workflow.compute(IofDspacingTwoTheta)\n",
+    "grouped_dspacing = workflow.compute(IofDspacingTwoTheta[SampleRun])\n",
     "grouped_dspacing"
    ]
   },
@@ -174,12 +174,12 @@
     "\n",
     "workflow[Filename[SampleRun]] = dream.data.simulated_diamond_sample()\n",
     "workflow[Filename[VanadiumRun]] = dream.data.simulated_vanadium_sample()\n",
-    "workflow[Filename[BackgroundRun]] = dream.data.simulated_empty_can()\n",
+    "workflow[Filename[EmptyCanRun]] = dream.data.simulated_empty_can()\n",
     "workflow[CalibrationFilename] = None\n",
     "\n",
     "workflow[MonitorFilename[SampleRun]] = dream.data.simulated_monitor_diamond_sample()\n",
     "workflow[MonitorFilename[VanadiumRun]] = dream.data.simulated_monitor_vanadium_sample()\n",
-    "workflow[MonitorFilename[BackgroundRun]] = dream.data.simulated_monitor_empty_can()\n",
+    "workflow[MonitorFilename[EmptyCanRun]] = dream.data.simulated_monitor_empty_can()\n",
     "workflow[CaveMonitorPosition] = sc.vector([0.0, 0.0, -4220.0], unit=\"mm\")\n",
     "\n",
     "workflow[dream.InstrumentConfiguration] = dream.InstrumentConfiguration.high_flux\n",
@@ -209,7 +209,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow.visualize(IofDspacing, graph_attr={\"rankdir\": \"LR\"})"
+    "workflow.visualize(IofDspacing[SampleRun], graph_attr={\"rankdir\": \"LR\"})"
    ]
   },
   {
@@ -227,7 +227,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "result = workflow.compute(IofDspacing)\n",
+    "result = workflow.compute(IofDspacing[SampleRun])\n",
     "result.hist().plot(title=result.coords['detector'].value.capitalize())"
    ]
   },
@@ -254,7 +254,7 @@
     "\n",
     "workflow[Filename[SampleRun]] = dream.data.simulated_diamond_sample()\n",
     "workflow[Filename[VanadiumRun]] = dream.data.simulated_vanadium_sample()\n",
-    "workflow[Filename[BackgroundRun]] = dream.data.simulated_empty_can()\n",
+    "workflow[Filename[EmptyCanRun]] = dream.data.simulated_empty_can()\n",
     "workflow[CalibrationFilename] = None\n",
     "\n",
     "workflow[dream.InstrumentConfiguration] = dream.InstrumentConfiguration.high_flux\n",
@@ -285,7 +285,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow.visualize(IofDspacing, graph_attr={\"rankdir\": \"LR\"})"
+    "workflow.visualize(IofDspacing[SampleRun], graph_attr={\"rankdir\": \"LR\"})"
    ]
   },
   {
@@ -303,7 +303,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "result = workflow.compute(IofDspacing)\n",
+    "result = workflow.compute(IofDspacing[SampleRun])\n",
     "result.hist().plot(title=result.coords['detector'].value.capitalize())"
    ]
   },
@@ -374,7 +374,7 @@
     "\n",
     "workflow[Filename[SampleRun]] = dream.data.simulated_diamond_sample()\n",
     "workflow[Filename[VanadiumRun]] = dream.data.simulated_vanadium_sample()\n",
-    "workflow[Filename[BackgroundRun]] = dream.data.simulated_empty_can()\n",
+    "workflow[Filename[EmptyCanRun]] = dream.data.simulated_empty_can()\n",
     "workflow[CalibrationFilename] = None\n",
     "\n",
     "workflow[dream.InstrumentConfiguration] = dream.InstrumentConfiguration.high_flux\n",
@@ -424,8 +424,10 @@
     ").rename_axis(index='detector')\n",
     "\n",
     "all_detector_workflow = workflow.copy()\n",
-    "mapped = all_detector_workflow[IofDspacing].map(parameter_table)\n",
-    "all_detector_workflow[IofDspacing] = mapped.reduce(func=powder.grouping.collect_detectors)"
+    "mapped = all_detector_workflow[EmptyCanSubtractedIofDspacing[SampleRun]].map(parameter_table)\n",
+    "all_detector_workflow[EmptyCanSubtractedIofDspacing[SampleRun]] = mapped.reduce(\n",
+    "    func=powder.grouping.collect_detectors\n",
+    ")"
    ]
   },
   {
@@ -443,7 +445,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "all_detector_workflow.visualize(IofDspacing, graph_attr={\"rankdir\": \"LR\"}, compact=True)"
+    "all_detector_workflow.visualize(\n",
+    "    EmptyCanSubtractedIofDspacing[SampleRun],\n",
+    "    graph_attr={\"rankdir\": \"LR\"},\n",
+    "    compact=True\n",
+    ")"
    ]
   },
   {
@@ -461,7 +467,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "result = all_detector_workflow.compute(IofDspacing)"
+    "result = all_detector_workflow.compute(EmptyCanSubtractedIofDspacing[SampleRun])"
    ]
   },
   {
@@ -534,8 +540,10 @@
     ").rename_axis(index='detector')\n",
     "\n",
     "all_detector_workflow = workflow.copy()\n",
-    "mapped = all_detector_workflow[IofDspacingTwoTheta].map(parameter_table)\n",
-    "all_detector_workflow[IofDspacingTwoTheta] = mapped.reduce(func=powder.grouping.collect_detectors)"
+    "mapped = all_detector_workflow[EmptyCanSubtractedIofDspacingTwoTheta[SampleRun]].map(parameter_table)\n",
+    "all_detector_workflow[EmptyCanSubtractedIofDspacingTwoTheta[SampleRun]] = mapped.reduce(\n",
+    "    func=powder.grouping.collect_detectors\n",
+    ")"
    ]
   },
   {
@@ -545,7 +553,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "all_detector_workflow.visualize(IofDspacing, graph_attr={\"rankdir\": \"LR\"}, compact=True)"
+    "all_detector_workflow.visualize(\n",
+    "    EmptyCanSubtractedIofDspacingTwoTheta[SampleRun],\n",
+    "    graph_attr={\"rankdir\": \"LR\"},\n",
+    "    compact=True\n",
+    ")"
    ]
   },
   {
@@ -555,7 +567,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "result = all_detector_workflow.compute(IofDspacingTwoTheta)"
+    "result = all_detector_workflow.compute(EmptyCanSubtractedIofDspacingTwoTheta[SampleRun])"
    ]
   },
   {
@@ -592,7 +604,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "pp.imagefigure(*(pp.Node(da.hist()) for da in result.values()), norm='log', cbar=True)"
+    "pp.imagefigure(\n",
+    "    *(pp.Node(da.hist()) for da in result.values()),\n",
+    "    norm='log',\n",
+    "    cbar=True,\n",
+    "    vmin=1e-3,\n",
+    ")"
    ]
   }
  ],

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/docs/user-guide/dream/dream-powder-reduction.ipynb

@@ -56,7 +56,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow = dream.DreamGeant4Workflow(run_norm=powder.RunNormalization.monitor_histogram)"
+    "workflow = dream.DreamGeant4Workflow(\n",
+    "    run_norm=powder.RunNormalization.monitor_histogram,\n",
+    ")"
    ]
   },
   {
@@ -77,12 +79,12 @@
    "source": [
     "workflow[Filename[SampleRun]] = dream.data.simulated_diamond_sample()\n",
     "workflow[Filename[VanadiumRun]] = dream.data.simulated_vanadium_sample()\n",
-    "workflow[Filename[BackgroundRun]] = dream.data.simulated_empty_can()\n",
+    "workflow[Filename[EmptyCanRun]] = dream.data.simulated_empty_can()\n",
     "workflow[CalibrationFilename] = None\n",
     "\n",
     "workflow[MonitorFilename[SampleRun]] = dream.data.simulated_monitor_diamond_sample()\n",
     "workflow[MonitorFilename[VanadiumRun]] = dream.data.simulated_monitor_vanadium_sample()\n",
-    "workflow[MonitorFilename[BackgroundRun]] = dream.data.simulated_monitor_empty_can()\n",
+    "workflow[MonitorFilename[EmptyCanRun]] = dream.data.simulated_monitor_empty_can()\n",
     "workflow[CaveMonitorPosition] = sc.vector([0.0, 0.0, -4220.0], unit=\"mm\")\n",
     "\n",
     "workflow[dream.InstrumentConfiguration] = dream.InstrumentConfiguration.high_flux\n",
@@ -105,8 +107,11 @@
     "## Use the reduction workflow\n",
     "\n",
     "We then call [workflow.compute(target)](https://scipp.github.io/sciline/generated/classes/sciline.Pipeline.html#sciline.Pipeline.compute) to compute the result.\n",
-    "`IofDspacing` is the normalized intensity as a function of $d$-spacing.\n",
-    "`ReducedTofCIF` encode the same data but converted back to time-of-flight and ready to be written to a CIF file."
+    "\n",
+    "- `EmptyCanSubtractedIofDspacing` is the normalized intensity as a function of $d$-spacing.\n",
+    "- `ReducedEmptyCanSubtractedTofCIF` encode the same data but converted back to time-of-flight and ready to be written to a CIF file.\n",
+    "\n",
+    "If we didn't want to subtract an empty can measurement from the sample measurement, we would instead request `IofDspacing[SampleRun]` and `ReducedTofCIF`."
    ]
   },
   {
@@ -116,9 +121,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "results = workflow.compute([IofDspacing, ReducedTofCIF])\n",
-    "intensity = results[IofDspacing]\n",
-    "cif_data = results[ReducedTofCIF]"
+    "results = workflow.compute([\n",
+    "    EmptyCanSubtractedIofDspacing[SampleRun],\n",
+    "    ReducedEmptyCanSubtractedTofCIF\n",
+    "])\n",
+    "intensity = results[EmptyCanSubtractedIofDspacing[SampleRun]]\n",
+    "cif_data = results[ReducedEmptyCanSubtractedTofCIF]"
    ]
   },
   {
@@ -182,7 +190,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow.visualize(ReducedTofCIF, graph_attr={\"rankdir\": \"LR\"})"
+    "workflow.visualize(ReducedEmptyCanSubtractedTofCIF, graph_attr={\"rankdir\": \"LR\"})"
    ]
   },
   {

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/docs/user-guide/dream/workflow-widget-dream.ipynb

@@ -59,7 +59,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(\"IofTof\")\n",
+    "ind = keys.index(\"IofDspacing[SampleRun]\")\n",
     "outputs.value = (values[ind],)\n",
     "# Refresh parameters\n",
     "pbox = wfw.parameter_box\n",
@@ -116,7 +116,7 @@
    "outputs": [],
    "source": [
     "(da,) = results.values()\n",
-    "da.hist(tof=200).plot()"
+    "da.hist(dspacing=200).plot()"
    ]
   }
  ],

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/docs/user-guide/sns-instruments/POWGEN_data_reduction.ipynb

@@ -106,7 +106,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "IofDspacing in workflow.get(IofDspacing).keys()"
+    "IofDspacing[SampleRun] in workflow.get(IofDspacing[SampleRun]).keys()"
    ]
   },
   {
@@ -116,7 +116,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow.visualize(IofDspacing, graph_attr={\"rankdir\": \"LR\"})"
+    "workflow.visualize(IofDspacing[SampleRun], graph_attr={\"rankdir\": \"LR\"})"
    ]
   },
   {
@@ -134,7 +134,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "result = workflow.compute(IofDspacing)\n",
+    "result = workflow.compute(IofDspacing[SampleRun])\n",
     "result"
    ]
   },
@@ -172,7 +172,7 @@
    "outputs": [],
    "source": [
     "def save_xye(\n",
-    "    reduced_data: IofDspacing,\n",
+    "    reduced_data: IofDspacing[SampleRun],\n",
     "    out_filename: OutFilename,\n",
     ") -> None:\n",
     "    data = reduced_data.hist()\n",
@@ -319,7 +319,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "workflow.visualize(IofDspacingTwoTheta, graph_attr={\"rankdir\": \"LR\"})"
+    "workflow.visualize(IofDspacingTwoTheta[SampleRun], graph_attr={\"rankdir\": \"LR\"})"
    ]
   },
   {
@@ -337,7 +337,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "grouped_dspacing = workflow.compute(IofDspacingTwoTheta)\n",
+    "grouped_dspacing = workflow.compute(IofDspacingTwoTheta[SampleRun])\n",
     "grouped_dspacing"
    ]
   },

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/pyproject.toml

@@ -32,7 +32,7 @@ requires-python = ">=3.10"
 # Make sure to list one dependency per line.
 dependencies = [
   "dask",
-  "essreduce>=25.05.1",
+  "essreduce>=25.05.2",
   "graphviz",
   "numpy",
   "plopp>=25.03.0",

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/requirements/base.in

@@ -3,7 +3,7 @@
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
-essreduce>=25.05.1
+essreduce>=25.05.2
 graphviz
 numpy
 plopp>=25.03.0

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:9fd92aa14a70d874a87640e7dbb332600b0c2ac7
+# SHA1:60cb3370153cfec27ffbe68c100df7aa10faaed0
 #
 # This file was generated by pip-compile-multi.
 # To update, run:
@@ -9,7 +9,7 @@ annotated-types==0.7.0
     # via pydantic
 asttokens==3.0.0
     # via stack-data
-click==8.2.0
+click==8.2.1
     # via dask
 cloudpickle==3.1.1
     # via dask
@@ -21,7 +21,7 @@ cyclebane==24.10.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2025.5.0
+dask==2025.5.1
     # via -r base.in
 decorator==5.2.1
     # via ipython
@@ -29,7 +29,7 @@ dnspython==2.7.0
     # via email-validator
 email-validator==2.2.0
     # via scippneutron
-essreduce==25.5.1
+essreduce==25.5.2
     # via -r base.in
 exceptiongroup==1.3.0
     # via ipython
@@ -37,7 +37,7 @@ executing==2.2.0
     # via stack-data
 fonttools==4.58.0
     # via matplotlib
-fsspec==2025.3.2
+fsspec==2025.5.0
     # via dask
 graphviz==0.20.3
     # via -r base.in
@@ -80,7 +80,7 @@ mpltoolbox==25.4.0
     # via scippneutron
 networkx==3.4.2
     # via cyclebane
-numpy==2.2.5
+numpy==2.2.6
     # via
     #   -r base.in
     #   contourpy
@@ -104,7 +104,7 @@ pexpect==4.9.0
     # via ipython
 pillow==11.2.1
     # via matplotlib
-plopp==25.4.1
+plopp==25.5.0
     # via
     #   -r base.in
     #   scippneutron
@@ -132,7 +132,7 @@ pythreejs==2.4.2
     # via -r base.in
 pyyaml==6.0.2
     # via dask
-sciline==25.5.1
+sciline==25.5.2
     # via
     #   -r base.in
     #   essreduce
@@ -185,7 +185,7 @@ typing-extensions==4.13.2
     #   pydantic-core
     #   sciline
     #   typing-inspection
-typing-inspection==0.4.0
+typing-inspection==0.4.1
     # via pydantic
 wcwidth==0.2.13
     # via prompt-toolkit

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/requirements/basetest.txt

@@ -15,7 +15,7 @@ idna==3.10
     # via requests
 iniconfig==2.1.0
     # via pytest
-numpy==2.2.5
+numpy==2.2.6
     # via pandas
 packaging==25.0
     # via
@@ -25,7 +25,7 @@ pandas==2.2.3
     # via -r basetest.in
 platformdirs==4.3.8
     # via pooch
-pluggy==1.5.0
+pluggy==1.6.0
     # via pytest
 pooch==1.8.2
     # via -r basetest.in

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/requirements/ci.txt

@@ -36,7 +36,7 @@ platformdirs==4.3.8
     # via
     #   tox
     #   virtualenv
-pluggy==1.5.0
+pluggy==1.6.0
     # via tox
 pyproject-api==1.9.1
     # via tox

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/requirements/dev.txt

@@ -81,7 +81,7 @@ pip-tools==7.4.1
     # via pip-compile-multi
 plumbum==1.9.0
     # via copier
-prometheus-client==0.21.1
+prometheus-client==0.22.0
     # via jupyter-server
 pycparser==2.22
     # via cffi
@@ -107,7 +107,7 @@ terminado==0.18.1
     #   jupyter-server-terminals
 toposort==1.10
     # via pip-compile-multi
-types-python-dateutil==2.9.0.20241206
+types-python-dateutil==2.9.0.20250516
     # via arrow
 uri-template==1.3.0
     # via jsonschema

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/requirements/docs.txt

@@ -138,7 +138,7 @@ requests==2.32.3
     # via
     #   pooch
     #   sphinx
-rpds-py==0.24.0
+rpds-py==0.25.1
     # via
     #   jsonschema
     #   referencing
@@ -180,7 +180,7 @@ tinycss2==1.4.0
     # via bleach
 tomli==2.2.1
     # via sphinx
-tornado==6.4.2
+tornado==6.5
     # via
     #   ipykernel
     #   jupyter-client

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/requirements/nightly.txt

@@ -16,7 +16,7 @@ certifi==2025.4.26
     # via requests
 charset-normalizer==3.4.2
     # via requests
-click==8.2.0
+click==8.2.1
     # via dask
 cloudpickle==3.1.1
     # via dask
@@ -28,7 +28,7 @@ cyclebane==24.10.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2025.5.0
+dask==2025.5.1
     # via -r nightly.in
 decorator==5.2.1
     # via ipython
@@ -46,7 +46,7 @@ executing==2.2.0
     # via stack-data
 fonttools==4.58.0
     # via matplotlib
-fsspec==2025.3.2
+fsspec==2025.5.0
     # via dask
 graphviz==0.20.3
     # via -r nightly.in
@@ -93,7 +93,7 @@ mpltoolbox==25.4.0
     # via scippneutron
 networkx==3.4.2
     # via cyclebane
-numpy==2.2.5
+numpy==2.2.6
     # via
     #   -r nightly.in
     #   contourpy
@@ -129,7 +129,7 @@ plopp @ git+https://github.com/scipp/plopp@main
     #   -r nightly.in
     #   scippneutron
     #   tof
-pluggy==1.5.0
+pluggy==1.6.0
     # via pytest
 pooch==1.8.2
     # via -r nightly.in
@@ -218,7 +218,7 @@ typing-extensions==4.13.2
     #   pydantic-core
     #   sciline
     #   typing-inspection
-typing-inspection==0.4.0
+typing-inspection==0.4.1
     # via pydantic
 tzdata==2025.2
     # via pandas

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/src/ess/dream/data.py

@@ -29,9 +29,10 @@ def _make_pooch():
             "DREAM_simple_pwd_workflow/Cave_TOF_Monitor_vana_inc_coh.dat": "md5:701d66792f20eb283a4ce76bae0c8f8f",  # noqa: E501
             "DREAM-high-flux-tof-lookup-table.h5": "md5:1b95a359fa7b0d8b4277806ece9bf279",  # noqa: E501
             # Smaller files for unit tests
-            "DREAM_simple_pwd_workflow/TEST_data_dream_diamond_vana_container_sample_union.csv.zip": "md5:018a87e0934c1dd0f07a708e9d497891",  # noqa: E501
-            "DREAM_simple_pwd_workflow/TEST_data_dream_vana_container_sample_union.csv.zip": "md5:d244126cd8012f9ed186f4e08a19f88d",  # noqa: E501
-            "DREAM_simple_pwd_workflow/TEST_data_dream_vanadium.csv.zip": "md5:178f9bea9f35dbdef693e38ff893c258",  # noqa: E501
+            "DREAM_simple_pwd_workflow/TEST_data_dream_diamond_vana_container_sample_union.csv.zip": "md5:405df9b5ade9d61ab71fe8d8c19bb51b",  # noqa: E501
+            "DREAM_simple_pwd_workflow/TEST_data_dream_vana_container_sample_union.csv.zip": "md5:20186119d1debfb0c2352f9db384cd0a",  # noqa: E501
+            "DREAM_simple_pwd_workflow/TEST_data_dream_vanadium.csv.zip": "md5:e5624a973f30dfe440642319c5bf0da6",  # noqa: E501
+            "DREAM_simple_pwd_workflow/TEST_data_dream_vanadium_inc_coh.csv.zip": "md5:a2e7756b264f65ab5ed7ff7fb5eca280",  # noqa: E501
             "TEST_data_dream0_new_hkl_Si_pwd.csv.zip": "md5:df6c41f4b7b21e129915808f625828f6",  # noqa: E501
             "TEST_data_dream_with_sectors.csv.zip": "md5:2a6b5e40e6b67f6c71b25373bf4b11a1",  # noqa: E501
             # The TEST_DREAM_nexus_sorted-2023-12-07.nxs file was created using the
@@ -147,7 +148,9 @@ def simulated_vanadium_sample(*, small: bool = False) -> str:
         ```
     """
     prefix = "TEST_" if small else ""
-    return get_path(f"DREAM_simple_pwd_workflow/{prefix}data_dream_vanadium.csv.zip")
+    return get_path(
+        f"DREAM_simple_pwd_workflow/{prefix}data_dream_vanadium_inc_coh.csv.zip"
+    )
 
 
 def simulated_vanadium_sample_incoherent(*, small: bool = False) -> str:

{essdiffraction-25.5.0 → essdiffraction-25.5.1}/src/ess/dream/io/cif.py

@@ -10,9 +10,11 @@ from ess.powder.calibration import OutputCalibrationData
 from ess.powder.types import (
     Beamline,
     CIFAuthors,
+    EmptyCanSubtractedIofTof,
     IofTof,
+    ReducedEmptyCanSubtractedTofCIF,
     ReducedTofCIF,
-    ReducerSoftwares,
+    ReducerSoftware,
     Source,
 )
 
@@ -23,7 +25,7 @@ def prepare_reduced_tof_cif(
     authors: CIFAuthors,
     beamline: Beamline,
     source: Source,
-    reducers: ReducerSoftwares,
+    reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedTofCIF:
     """Construct a CIF builder with reduced data in d-spacing.
@@ -53,6 +55,71 @@ def prepare_reduced_tof_cif(
         An object that contains the reduced data and metadata.
         Us its ``save`` method to write the CIF file.
     """
+    return _prepare_reduced_tof_cif_impl(
+        da,
+        authors=authors,
+        beamline=beamline,
+        source=source,
+        reducers=reducers,
+        calibration=calibration,
+    )
+
+
+def prepare_reduced_empty_can_subtracted_tof_cif(
+    da: EmptyCanSubtractedIofTof,
+    *,
+    authors: CIFAuthors,
+    beamline: Beamline,
+    source: Source,
+    reducers: ReducerSoftware,
+    calibration: OutputCalibrationData,
+) -> ReducedEmptyCanSubtractedTofCIF:
+    """Construct a CIF builder with reduced data in d-spacing.
+
+    The object contains the d-spacing coordinate, intensities,
+    and some metadata.
+
+    Parameters
+    ----------
+    da:
+        Reduced 1d data with a ``'tof'`` dimension and coordinate.
+    authors:
+        List of authors to write to the file.
+    beamline:
+        Information about the beamline that the data was produced at.
+    source:
+        Information about the neutron source.
+    reducers:
+        List of software pieces used to reduce the data.
+    calibration:
+        Coefficients for conversion between d-spacing and final ToF.
+        See :meth:`scippneutron.io.cif.CIF.with_powder_calibration`.
+
+    Returns
+    -------
+    :
+        An object that contains the reduced data and metadata.
+        Us its ``save`` method to write the CIF file.
+    """
+    return _prepare_reduced_tof_cif_impl(
+        da,
+        authors=authors,
+        beamline=beamline,
+        source=source,
+        reducers=reducers,
+        calibration=calibration,
+    )
+
+
+def _prepare_reduced_tof_cif_impl(
+    da: IofTof,
+    *,
+    authors: CIFAuthors,
+    beamline: Beamline,
+    source: Source,
+    reducers: ReducerSoftware,
+    calibration: OutputCalibrationData,
+) -> ReducedTofCIF:
     to_save = _prepare_data(da)
     return ReducedTofCIF(
         cif.CIF('reduced_tof')