essdiffraction 26.4.1__tar.gz → 26.5.2__tar.gz

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2025, Scipp contributors (https://github.com/scipp)
+Copyright (c) 2026, Scipp contributors (https://github.com/scipp)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: essdiffraction
-Version: 26.4.1
+Version: 26.5.2
 Summary: Diffraction data reduction for the European Spallation Source
 Author: Scipp contributors
 License-Expression: BSD-3-Clause
-Project-URL: Bug Tracker, https://github.com/scipp/essdiffraction/issues
-Project-URL: Documentation, https://scipp.github.io/essdiffraction
-Project-URL: Source, https://github.com/scipp/essdiffraction
+Project-URL: Bug Tracker, https://github.com/scipp/ess/issues
+Project-URL: Documentation, https://scipp.github.io/ess/diffraction
+Project-URL: Source, https://github.com/scipp/ess/tree/main/packages/essdiffraction
 Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
@@ -38,11 +38,27 @@ Requires-Dist: pandas>=2.1.2; extra == "test"
 Requires-Dist: pooch>=1.5; extra == "test"
 Requires-Dist: pytest>=7.0; extra == "test"
 Requires-Dist: ipywidgets>=8.1.7; extra == "test"
+Provides-Extra: docs
+Requires-Dist: autodoc-pydantic; extra == "docs"
+Requires-Dist: ipykernel; extra == "docs"
+Requires-Dist: ipympl; extra == "docs"
+Requires-Dist: ipython!=8.7.0; extra == "docs"
+Requires-Dist: myst-parser; extra == "docs"
+Requires-Dist: nbsphinx; extra == "docs"
+Requires-Dist: pandas; extra == "docs"
+Requires-Dist: pooch; extra == "docs"
+Requires-Dist: pydata-sphinx-theme>=0.14; extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
+Requires-Dist: sphinx-copybutton; extra == "docs"
+Requires-Dist: sphinx-design; extra == "docs"
+Requires-Dist: sphinxcontrib-bibtex; extra == "docs"
+Requires-Dist: pyarrow; extra == "docs"
 Dynamic: license-file
 
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
 [![PyPI badge](http://img.shields.io/pypi/v/essdiffraction.svg)](https://pypi.python.org/pypi/essdiffraction)
-[![Anaconda-Server Badge](https://anaconda.org/conda-forge/essdiffraction/badges/version.svg)](https://anaconda.org/conda-forge/essdiffraction)
+[![Conda Badge](https://img.shields.io/conda/v/conda-forge/essdiffraction)](https://anaconda.org/conda-forge/essdiffraction)
 [![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE)
 
 # ESSdiffraction

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/README.md

@@ -1,6 +1,6 @@
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
 [![PyPI badge](http://img.shields.io/pypi/v/essdiffraction.svg)](https://pypi.python.org/pypi/essdiffraction)
-[![Anaconda-Server Badge](https://anaconda.org/conda-forge/essdiffraction/badges/version.svg)](https://anaconda.org/conda-forge/essdiffraction)
+[![Conda Badge](https://img.shields.io/conda/v/conda-forge/essdiffraction)](https://anaconda.org/conda-forge/essdiffraction)
 [![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE)
 
 # ESSdiffraction

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/_templates/doc_version.html

@@ -1,2 +1,2 @@
 <!-- This will display the version of the docs -->
-Current ESSdiffraction version: {{ version }} (<a href="https://github.com/scipp/essdiffraction/releases">older versions</a>).
+Current ESSdiffraction version: {{ version }} (<a href="https://github.com/scipp/ess/releases?q=essdiffraction">older versions</a>).

essdiffraction-26.5.2/docs/_templates/layout.html

@@ -0,0 +1,5 @@
+{% extends "!layout.html" %}
+{% block docs_body %}
+<span data-pagefind-meta="image[data-url]" data-url="{{ pathto('_static/essdiffraction-search-logo.png', 1) }}" hidden></span>
+{{ super() }}
+{% endblock %}

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/about/index.md

@@ -18,12 +18,12 @@ To cite a specific version of ESSdiffraction, select the desired version on Zeno
 
 ## Older versions of the documentation
 
-Older versions of the documentation pages can be found under the assets of each [release](https://github.com/scipp/essdiffraction/releases).
+Older versions of the documentation pages can be found under the assets of each [release](https://github.com/scipp/ess/releases?q=essdiffraction).
 Simply download the archive, unzip and view locally in a web browser.
 
 ## Source code and development
 
-ESSdiffraction is hosted and developed [on GitHub](https://github.com/scipp/essdiffraction).
+ESSdiffraction is hosted and developed [on GitHub](https://github.com/scipp/ess/tree/main/packages/essdiffraction).
 
 ```{toctree}
 ---

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/api-reference/index.md

@@ -140,6 +140,34 @@
    workflow
 ```
 
+## MAGIC
+
+### Workflows
+
+
+```{eval-rst}
+.. currentmodule:: ess.magic
+
+.. autosummary::
+   :toctree: ../generated/functions
+
+   MagicWorkflow
+```
+
+### Submodules
+
+```{eval-rst}
+.. autosummary::
+   :toctree: ../generated/modules
+   :template: module-template.rst
+   :recursive:
+
+   beamline
+   data
+   types
+   workflow
+```
+
 ## SNS powder
 
 ```{eval-rst}

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/conf.py

@@ -191,7 +191,7 @@ html_theme_options = {
     "icon_links": [
         {
             "name": "GitHub",
-            "url": "https://github.com/scipp/essdiffraction",
+            "url": "https://github.com/scipp/ess/tree/main/packages/essdiffraction",
             "icon": "fa-brands fa-github",
             "type": "fontawesome",
         },

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/index.md

@@ -43,6 +43,11 @@
 
 :::
 
+:::{grid-item-card} MAGIC
+:link: user-guide/magic/index.md
+
+:::
+
 :::{grid-item-card} SNS instruments
 :link: user-guide/sns-instruments/index.md
 
@@ -61,8 +66,8 @@
 
 ## Get in touch
 
-- If you have questions that are not answered by these documentation pages, ask on [discussions](https://github.com/scipp/essdiffraction/discussions). Please include a self-contained reproducible example if possible.
-- Report bugs (including unclear, missing, or wrong documentation!), suggest features or view the source code [on GitHub](https://github.com/scipp/essdiffraction).
+- If you have questions that are not answered by these documentation pages, ask on [discussions](https://github.com/scipp/ess/discussions). Please include a self-contained reproducible example if possible.
+- Report bugs (including unclear, missing, or wrong documentation!), suggest features or view the source code [on GitHub](https://github.com/scipp/ess/tree/main/packages/essdiffraction).
 
 ```{toctree}
 ---

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/user-guide/beer/beer_modulation_mcstas.ipynb

@@ -40,7 +40,7 @@
    "source": [
     "## Beam modulation mode\n",
     "\n",
-    "In the \"modulation mode\" the BEER instrument maximizes signal intensity while retaining wavelength resolution by utilizing choppers to create multiple pulses, each with well defined wavelenth, that reach the sample simultaneously.\n",
+    "In the \"modulation mode\" the BEER instrument maximizes signal intensity while retaining wavelength resolution by utilizing choppers to create multiple pulses, each with well-defined wavelength, that reach the sample simultaneously.\n",
     "The pulses can be distinguished in the detector data under the assumption that the peaks in $d_{hkl}$ are sufficiently well separated from each other.\n",
     "\n",
     "\n",
@@ -83,7 +83,7 @@
     "\n",
     "### Difference between modulation modes\n",
     "\n",
-    "There are different modulation modes depending on the desired trade off between resolution and intensity.\n",
+    "There are different modulation modes depending on the desired trade-off between resolution and intensity.\n",
     "Below is a table describing the available modes.\n",
     "\n",
     "<table style=\"border-collapse: collapse; border: 1px solid #aaa; font-family: Arial, sans-serif; font-size: 14px;\">\n",

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/user-guide/common/vanadium_processing.ipynb

@@ -8,7 +8,7 @@
     "# Vanadium processing\n",
     "\n",
     "We normalize by vanadium measurements because vanadium scatters almost entirely incoherently.\n",
-    "But there it does produce some coherent scattering peaks and those need to be removed before normalization.\n",
+    "But vanadium does produce some coherent scattering peaks, and those need to be removed before normalization.\n",
     "This notebook demonstrates how this can be done using ESSdiffraction and ScippNeutron.\n",
     "It uses the same data as the [POWGEN_data_reduction](../sns-instruments/POWGEN_data_reduction.rst) workflow.\n",
     "\n",
@@ -130,7 +130,7 @@
     "Even though the peaks are small for vanadium, we need to remove them to extract pure incoherent scattering.\n",
     "We can approximate the coherent scattering contribution by fitting functions to the peaks and subtracting those fitted functions.\n",
     "[scippneutron.peaks](https://scipp.github.io/scippneutron/generated/modules/scippneutron.peaks.html) contains general functionality for fitting and removing peaks.\n",
-    "Here, we use it through [ess.snspowder.powgen.peaks](../../generated/modules/ess.snspowder.powgen.peaks.rst) which provides useful defaults for vanadium peaks at POWGEN.\n",
+    "Here, we use it through [ess.snspowder.powgen.peaks](../../generated/modules/ess.snspowder.powgen.peaks.rst), which provides useful defaults for vanadium peaks at POWGEN.\n",
     "For example, it selects appropriate models for peaks (gaussian) and backgrounds (linear and quadratic).\n",
     "\n",
     "First, define estimates for the peaks based on the known crystal structure of vanadium:"

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/user-guide/dream/dream-powder-reduction.ipynb

@@ -165,7 +165,7 @@
    "source": [
     "cif_data.comment = \"\"\"This file was generated with the basic DREAM data reduction user guide\n",
     "in the documentation of ESSdiffraction.\n",
-    "See https://scipp.github.io/essdiffraction/\n",
+    "See https://scipp.github.io/ess/diffraction/\n",
     "\"\"\"\n",
     "cif_data.save(\"reduced.cif\")"
    ]
@@ -207,7 +207,7 @@
     "\n",
     "---\n",
     "\n",
-    "Next, consider reading [DREAM advanced powder data reduction](./dream-advanced-powder-reduction.rst) guide which demonstrates some builtin options for customizing the workflow and how to compute alternative results."
+    "Next, consider reading the [DREAM advanced powder data reduction](./dream-advanced-powder-reduction.rst) guide, which demonstrates some built-in options for customizing the workflow and how to compute alternative results."
    ]
   }
  ],

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/user-guide/dream/workflow-widget-dream.ipynb

@@ -7,7 +7,7 @@
    "source": [
     "# Workflow widgets example\n",
     "\n",
-    "This notebook illustrates how we can use ESSreduce’s [workflow widgets](https://scipp.github.io/essreduce/user-guide/widget.html) to generate a graphical interface for running the [DREAM GEANT4 workflow](./dream-powder-reduction.rst).\n",
+    "This notebook illustrates how we can use ESSreduce's [workflow widgets](https://scipp.github.io/essreduce/user-guide/widget.html) to generate a graphical interface for running the [DREAM GEANT4 workflow](./dream-powder-reduction.rst).\n",
     "\n",
     "## Initializing the GUI\n",
     "\n",

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/docs/user-guide/index.md

@@ -8,6 +8,7 @@ maxdepth: 1
 installation
 dream/index
 beer/index
+magic/index
 sns-instruments/index
 common/index
 ```

essdiffraction-26.5.2/docs/user-guide/magic/index.md

@@ -0,0 +1,4 @@
+# MAGIC
+
+MAGIC — **Mag**netism Single-Crystal Diffractometer — is an ESS polarised
+time-of-flight single-crystal diffractometer for studying magnetic structures.

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/pyproject.toml

@@ -10,7 +10,6 @@ name = "essdiffraction"
 description = "Diffraction data reduction for the European Spallation Source"
 authors = [{ name = "Scipp contributors" }]
 license = "BSD-3-Clause"
-license-files = ["LICENSE"]
 readme = "README.md"
 classifiers = [
     "Intended Audience :: Science/Research",
@@ -54,13 +53,35 @@ test = [
     "pytest>=7.0",
     "ipywidgets>=8.1.7",
 ]
+docs = [
+    "autodoc-pydantic",
+    "ipykernel",
+    "ipympl",
+    # Breaks syntax highlighting in Jupyter code cells.
+    "ipython!=8.7.0",
+    "myst-parser",
+    "nbsphinx",
+    "pandas",
+    "pooch",
+    "pydata-sphinx-theme>=0.14",
+    "sphinx",
+    "sphinx-autodoc-typehints",
+    "sphinx-copybutton",
+    "sphinx-design",
+    "sphinxcontrib-bibtex",
+    # needed by pandas < 3.0
+    "pyarrow",
+]
 
 [project.urls]
-"Bug Tracker" = "https://github.com/scipp/essdiffraction/issues"
-"Documentation" = "https://scipp.github.io/essdiffraction"
-"Source" = "https://github.com/scipp/essdiffraction"
+"Bug Tracker" = "https://github.com/scipp/ess/issues"
+"Documentation" = "https://scipp.github.io/ess/diffraction"
+"Source" = "https://github.com/scipp/ess/tree/main/packages/essdiffraction"
 
 [tool.setuptools_scm]
+root = "../.."
+tag_regex = "^essdiffraction/(?P<version>[vV]?\\d+(?:\\.\\d+)*(?:[._-]?\\w+)*)$"
+git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "essdiffraction/*[0-9]*"]
 
 [tool.pytest.ini_options]
 minversion = "7.0"
@@ -79,43 +100,6 @@ filterwarnings = [
   'ignore:\s*Pyarrow will become a required dependency of pandas:DeprecationWarning',
 ]
 
-[tool.ruff]
-line-length = 88
-extend-include = ["*.ipynb"]
-extend-exclude = [
-    ".*", "__pycache__", "build", "dist", "install",
-]
-
-[tool.ruff.lint]
-# See https://docs.astral.sh/ruff/rules/
-select = ["B", "C4", "DTZ", "E", "F", "G", "I", "PERF", "PGH", "PT", "PYI", "RUF", "S", "T20", "UP", "W"]
-ignore = [
-    # Conflict with ruff format, see
-    # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
-    "COM812", "COM819", "D206", "D300", "E111", "E114", "E117", "ISC001", "ISC002", "Q000", "Q001", "Q002", "Q003", "W191",
-]
-fixable = ["B010", "I001", "PT001", "RUF022"]
-isort.known-first-party = ["ess.diffraction", "ess.dream", "ess.powder"]
-pydocstyle.convention = "numpy"
-
-[tool.ruff.lint.per-file-ignores]
-# those files have an increased risk of relying on import order
-"tests/*" = [
-    "S101",  # asserts are fine in tests
-    "B018",  # 'useless expressions' are ok because some tests just check for exceptions
-]
-"*.ipynb" = [
-    "E501",  # longer lines are sometimes more readable
-    "F403",  # *-imports used with domain types
-    "F405",  # linter may fail to find names because of *-imports
-    "I",  # we don't collect imports at the top
-    "S101",  # asserts are used for demonstration and are safe in notebooks
-    "T201",  # printing is ok for demonstration purposes
-]
-
-[tool.ruff.format]
-quote-style = "preserve"
-
 [tool.mypy]
 strict = true
 ignore_missing_imports = true
@@ -125,11 +109,3 @@ enable_error_code = [
     "truthy-bool",
 ]
 warn_unreachable = true
-
-[tool.codespell]
-ignore-words-list = [
-    # Codespell wants "socioeconomic" which seems to be the standard spelling.
-    # But we use the word in our code of conduct which is the contributor covenant.
-    # Let's not modify it if we don't have to.
-    "socio-economic",
-]

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/beer/clustering.py

@@ -1,7 +1,6 @@
 import scipp as sc
-from scipy.signal import find_peaks, medfilt
-
 from ess.powder.types import RunType
+from scipy.signal import find_peaks, medfilt
 
 from .conversions import tof_from_t0_estimate_graph
 from .types import (

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/beer/conversions.py

@@ -1,8 +1,7 @@
 import scipp as sc
 import scipp.constants
-from scippneutron.conversion import graph
-
 from ess.powder.types import ElasticCoordTransformGraph, RunType
+from scippneutron.conversion import graph
 
 from .types import (
     DHKLList,

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/beer/io.py

@@ -8,9 +8,10 @@ import h5py
 import numpy as np
 import scipp as sc
 import scipp.constants
-
 from ess.powder.types import CaveMonitor, RunType, WavelengthMonitor
 
+from ess.reduce.nexus.types import DetectorBankSizes
+
 from .types import (
     DetectorBank,
     Filename,
@@ -147,7 +148,38 @@ def _effective_chopper_position_from_mode(
         raise ValueError(f'Unkonwn chopper mode {mode}.')
 
 
-def _load_beer_mcstas(f, north_or_south=None, number=None):
+def _load_beer_mcstas(f, *, north_or_south=None, number=None, detector_sizes):
+    # Allow the keys of detector_sizes to be both the
+    # NeXus detector name or DetectorBank enum.
+    # It makes the code a bit more complex here, but I think mixing them up
+    # is an easy mistake to make and it makes sense
+    # to handle that gracefully.
+    normalized_detector_sizes = {
+        (
+            'south'
+            if key in (DetectorBank.south, 'south_detector')
+            else 'north'
+            if key in (DetectorBank.north, 'north_detector')
+            else key
+        ): value
+        for key, value in detector_sizes.items()
+    }
+    if north_or_south is not None:
+        # In newer files the bank is determined by a name (north or south).
+        sizes = normalized_detector_sizes[north_or_south]
+    else:
+        # In older files the detector bank is determined by an index.
+        if number == 1:
+            sizes = normalized_detector_sizes['south']
+        elif number == 2:
+            sizes = normalized_detector_sizes['north']
+        else:
+            raise ValueError(
+                'Could not determine detector sizes from provided '
+                f'`DetectorBankSizes`: {detector_sizes}. '
+                'Expected keys: "south_detector" and "north_detector".'
+            )
+
     positions = {
         name: f'/entry1/instrument/components/{key}/Position'
         for key in f['/entry1/instrument/components']
@@ -177,7 +209,7 @@ def _load_beer_mcstas(f, north_or_south=None, number=None):
         positions['MCC'],
     )
     data = (
-        next(_find_all_h5(data_dir, f'.*{north_or_south}{number}'))
+        next(_find_all_h5(data_dir, f'.*{north_or_south}{number}_events'))
         if north_or_south is not None and number is not None
         else next(_find_all_h5(data_dir, f'.*{north_or_south}'))
         if north_or_south is not None
@@ -190,7 +222,7 @@ def _load_beer_mcstas(f, north_or_south=None, number=None):
     ]
     detector_rotation = _find_h5(
         f['/entry1/instrument/components'],
-        f'.*nD_Mantid_?{north_or_south}_{number}.*'
+        f'.*nD_Mantid_?{north_or_south}_{number}$'
         if north_or_south is not None and number is not None
         else f'.*nD_Mantid_?{north_or_south}.*'
         if north_or_south is not None
@@ -255,8 +287,8 @@ def _load_beer_mcstas(f, north_or_south=None, number=None):
     # Bin detector panel into rectangular "pixels"
     # similar in size to the physical detector pixels.
     da = da.bin(
-        y=sc.linspace('y', -0.5, 0.5, 201, unit='m'),
-        x=sc.linspace('x', -0.5, 0.5, 501, unit='m'),
+        y=sc.linspace('y', -0.5, 0.5, sizes['y'] + 1, unit='m'),
+        x=sc.linspace('x', -0.5, 0.5, sizes['x'] + 1, unit='m'),
     )
 
     # Compute the position of each pixel in the global coordinate system.
@@ -318,7 +350,9 @@ def _load_beer_mcstas(f, north_or_south=None, number=None):
     return da
 
 
-def load_beer_mcstas(f: str | Path | h5py.File, bank: DetectorBank) -> sc.DataArray:
+def load_beer_mcstas(
+    f: str | Path | h5py.File, bank: DetectorBank, detector_sizes: DetectorBankSizes
+) -> sc.DataArray:
     '''Load beer McStas data from a file to a data array.'''
     if not isinstance(bank, DetectorBank):
         raise ValueError(
@@ -327,20 +361,30 @@ def load_beer_mcstas(f: str | Path | h5py.File, bank: DetectorBank) -> sc.DataAr
 
     if isinstance(f, str | Path):
         with h5py.File(f) as ff:
-            return load_beer_mcstas(ff, bank=bank)
+            return load_beer_mcstas(ff, bank=bank, detector_sizes=detector_sizes)
 
     if len(list(_find_all_h5(f['/entry1/data'], '.*bank', nxclass='NXdata'))) < 8:
         # If we don't find ~13 detectors, then assume the detectors are 2D
         if len(list(_find_all_h5(f['/entry1/data'], '.*south', nxclass='NXdata'))) > 0:
-            return _load_beer_mcstas(f, north_or_south=bank.name)
+            return _load_beer_mcstas(
+                f, north_or_south=bank.name, detector_sizes=detector_sizes
+            )
 
         return _load_beer_mcstas(
-            f, north_or_south=None, number=1 if bank == DetectorBank.south else 2
+            f,
+            north_or_south=None,
+            number=1 if bank == DetectorBank.south else 2,
+            detector_sizes=detector_sizes,
         )
 
     return sc.concat(
         [
-            _load_beer_mcstas(f, north_or_south=bank.name, number=number)
+            _load_beer_mcstas(
+                f,
+                north_or_south=bank.name,
+                number=number,
+                detector_sizes=detector_sizes,
+            )
             for number in range(1, 13)
         ],
         dim='panel',
@@ -399,10 +443,9 @@ def load_beer_mcstas_monitor(f: str | Path | h5py.File):
 
 
 def load_beer_mcstas_provider(
-    fname: Filename[RunType],
-    bank: DetectorBank,
+    fname: Filename[RunType], bank: DetectorBank, detector_bank_sizes: DetectorBankSizes
 ) -> RawDetector[RunType]:
-    return load_beer_mcstas(fname, bank)
+    return load_beer_mcstas(fname, bank, detector_bank_sizes)
 
 
 def load_beer_mcstas_monitor_provider(

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/beer/workflow.py

@@ -4,7 +4,6 @@ import itertools
 
 import sciline as sl
 import scipp as sc
-
 from ess.powder import providers as powder_providers
 from ess.powder.correction import RunNormalization, insert_run_normalization
 from ess.powder.types import (
@@ -15,6 +14,7 @@ from ess.powder.types import (
     SampleRun,
     VanadiumRun,
 )
+
 from ess.reduce.nexus.types import DetectorBankSizes, NeXusName
 from ess.reduce.unwrap import GenericUnwrapWorkflow
 
@@ -28,6 +28,10 @@ from .types import (
 
 default_parameters = {
     PulseLength: sc.scalar(0.003, unit='s'),
+    DetectorBankSizes: {
+        'south_detector': {'y': 200, 'x': 500},
+        'north_detector': {'y': 200, 'x': 500},
+    },
 }
 
 
@@ -93,10 +97,6 @@ def BeerPowderWorkflow(
         monitor_types=[BunkerMonitor, CaveMonitor],
         **kwargs,
     )
-    wf[DetectorBankSizes] = {
-        'south_detector': {'y': 200, 'x': 500},
-        'north_detector': {'y': 200, 'x': 500},
-    }
     wf[NeXusName[CaveMonitor]] = "monitor_cave"
 
     for provider in itertools.chain(powder_providers, convert_pulse_shaping):
@@ -109,6 +109,7 @@ def BeerPowderWorkflow(
 
 
 def BeerPowderMcStasWorkflow(**kwargs) -> sl.Pipeline:
+    """Create the BEER powder workflow with McStas loaders inserted."""
     wf = BeerPowderWorkflow(**kwargs)
     for provider in mcstas_providers:
         wf.insert(provider)

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/diffraction/__init__.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
-# ruff: noqa: E402, F401, I
 
 """
 Components for diffraction experiments (powder and single crystal).

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/dream/io/cif.py

@@ -4,8 +4,6 @@
 """CIF writer for DREAM."""
 
 import scipp as sc
-from scippneutron.io import cif
-
 from ess.powder.calibration import OutputCalibrationData
 from ess.powder.types import (
     Beamline,
@@ -19,6 +17,7 @@ from ess.powder.types import (
     SampleRun,
     Source,
 )
+from scippneutron.io import cif
 
 
 def prepare_reduced_tof_cif(

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/dream/io/geant4.py

@@ -5,8 +5,6 @@ import numpy as np
 import sciline
 import scipp as sc
 import scippnexus as snx
-from scippneutron.metadata import ESS_SOURCE
-
 from ess.powder.types import (
     Beamline,
     CalibrationData,
@@ -26,6 +24,7 @@ from ess.powder.types import (
     RunType,
     Source,
 )
+from scippneutron.metadata import ESS_SOURCE
 
 MANTLE_DETECTOR_ID = sc.index(7)
 HIGH_RES_DETECTOR_ID = sc.index(8)

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/dream/parameters.py

@@ -19,6 +19,7 @@ from ess.powder.types import (
     UncertaintyBroadcastMode,
     VanadiumRun,
 )
+
 from ess.reduce.parameter import (
     BinEdgesParameter,
     FilenameParameter,

{essdiffraction-26.4.1 → essdiffraction-26.5.2}/src/ess/dream/workflows.py

@@ -6,8 +6,6 @@ import itertools
 import sciline
 import scipp as sc
 import scippnexus as snx
-from scippneutron.metadata import Software
-
 from ess.powder import providers as powder_providers
 from ess.powder import with_pixel_mask_filenames
 from ess.powder.correction import RunNormalization, insert_run_normalization
@@ -30,6 +28,8 @@ from ess.powder.types import (
     VanadiumRun,
     WavelengthMask,
 )
+from scippneutron.metadata import Software
+
 from ess.reduce.nexus.types import DetectorBankSizes, NeXusName
 from ess.reduce.parameter import parameter_mappers
 from ess.reduce.unwrap import GenericUnwrapWorkflow
@@ -144,6 +144,7 @@ parameter_mappers[PixelMaskFilename] = with_pixel_mask_filenames
 
 
 def default_parameters() -> dict:
+    """Return the default reduction parameters shared by DREAM powder workflows."""
     return {
         KeepEvents[SampleRun]: KeepEvents[SampleRun](True),
         KeepEvents[VanadiumRun]: KeepEvents[VanadiumRun](True),

essdiffraction-26.5.2/src/ess/magic/__init__.py

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2026 Scipp contributors (https://github.com/scipp)
+
+import importlib.metadata
+
+from .workflow import MagicWorkflow, default_parameters
+
+try:
+    __version__ = importlib.metadata.version("essdiffraction")
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "0.0.0"
+
+del importlib
+
+__all__ = [
+    'MagicWorkflow',
+    '__version__',
+    'default_parameters',
+]