essdiffraction 26.5.1__tar.gz → 26.5.2__tar.gz

{essdiffraction-26.5.1/src/essdiffraction.egg-info → essdiffraction-26.5.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: essdiffraction
-Version: 26.5.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
@@ -58,7 +58,7 @@ 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.5.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.5.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.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.5.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.5.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.5.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.5.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\")"
    ]

{essdiffraction-26.5.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.5.1 → essdiffraction-26.5.2}/pyproject.toml

@@ -74,9 +74,9 @@ docs = [
 ]
 
 [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 = "../.."

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

@@ -209,7 +209,7 @@ def _load_beer_mcstas(f, *, north_or_south=None, number=None, detector_sizes):
         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
@@ -222,7 +222,7 @@ def _load_beer_mcstas(f, *, north_or_south=None, number=None, detector_sizes):
     ]
     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

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',
+]

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

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2026 Scipp contributors (https://github.com/scipp)
+"""Geometry and default parameters for MAGIC."""
+
+DETECTOR_BANK_SIZES: dict[str, dict[str, int]] = {
+    'detector_a': {},
+    'detector_b': {},
+}
+"""Names and dimensions are placeholders."""

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

@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2026 Scipp contributors (https://github.com/scipp)
+
+from ess.reduce.data import make_registry
+
+_registry = make_registry(
+    "ess/magic",
+    version="1",
+    files={},
+)

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

@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2026 Scipp contributors (https://github.com/scipp)
+
+from enum import Enum
+from typing import NewType
+
+import scipp as sc
+
+from ess.reduce.nexus.types import Filename, RawDetector, RunType, SampleRun
+
+RawDetector = RawDetector
+Filename = Filename
+RunType = RunType
+SampleRun = SampleRun
+
+
+class DetectorBank(Enum):
+    detector_a = 'detector_a'
+    detector_b = 'detector_b'
+
+
+class PolarizationState(Enum):
+    up = 'up'
+    down = 'down'
+
+
+IncidentPolarization = NewType("IncidentPolarization", sc.Variable)
+"""Polarisation of the incident beam."""
+
+ScatteredPolarization = NewType("ScatteredPolarization", sc.Variable)
+"""Polarisation of the scattered beam (polarisation analysis mode)."""

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

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2026 Scipp contributors (https://github.com/scipp)
+
+import sciline as sl
+
+from ess.reduce.nexus.types import DetectorBankSizes
+
+from .beamline import DETECTOR_BANK_SIZES
+
+default_parameters = {
+    DetectorBankSizes: DETECTOR_BANK_SIZES,
+}
+
+
+def MagicWorkflow() -> sl.Pipeline:
+    """Workflow for the MAGIC single-crystal magnetism diffractometer.
+
+    This is currently a placeholder skeleton: it registers default beamline
+    parameters but provides no reduction providers yet. Single-crystal and
+    polarisation-analysis providers will be added as the MAGIC reduction
+    pipeline is developed.
+    """
+    return sl.Pipeline(providers=(), params=default_parameters)

{essdiffraction-26.5.1 → essdiffraction-26.5.2}/src/ess/powder/types.py

@@ -33,6 +33,7 @@ NeXusDetectorName = reduce_t.NeXusDetectorName
 NeXusMonitorName = reduce_t.NeXusName
 NeXusComponent = reduce_t.NeXusComponent
 Position = reduce_t.Position
+ProtonCharge = reduce_t.ProtonCharge
 
 DetectorBankSizes = reduce_t.DetectorBankSizes
 
@@ -191,10 +192,6 @@ PixelMaskFilename = NewType("PixelMaskFilename", str)
 """Filename of a pixel mask."""
 
 
-class ProtonCharge(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
-    """Time-dependent proton charge."""
-
-
 class RawDataAndMetadata(sciline.Scope[RunType, sc.DataGroup], sc.DataGroup):
     """Raw data and associated metadata."""
 

{essdiffraction-26.5.1 → essdiffraction-26.5.2/src/essdiffraction.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: essdiffraction
-Version: 26.5.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
@@ -58,7 +58,7 @@ 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.5.1 → essdiffraction-26.5.2}/src/essdiffraction.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ docs/user-guide/dream/dream-powder-reduction.ipynb
 docs/user-guide/dream/dream-visualize-absorption.ipynb
 docs/user-guide/dream/index.md
 docs/user-guide/dream/workflow-widget-dream.ipynb
+docs/user-guide/magic/index.md
 docs/user-guide/sns-instruments/POWGEN_data_reduction.ipynb
 docs/user-guide/sns-instruments/index.md
 resources/logo.svg
@@ -67,6 +68,11 @@ src/ess/dream/workflows.py
 src/ess/dream/io/__init__.py
 src/ess/dream/io/cif.py
 src/ess/dream/io/geant4.py
+src/ess/magic/__init__.py
+src/ess/magic/beamline.py
+src/ess/magic/data.py
+src/ess/magic/types.py
+src/ess/magic/workflow.py
 src/ess/powder/__init__.py
 src/ess/powder/_util.py
 src/ess/powder/calibration.py
@@ -103,6 +109,7 @@ tests/dream/instrument_view_test.py
 tests/dream/io/cif_test.py
 tests/dream/io/geant4_test.py
 tests/dream/workflows/dream_generic_workflow_test.py
+tests/magic/workflow_test.py
 tests/powder/conversion_test.py
 tests/powder/correction_test.py
 tests/powder/filtering_test.py

{essdiffraction-26.5.1 → essdiffraction-26.5.2}/tests/beer/mcstas_reduction_test.py

@@ -105,6 +105,9 @@ def test_can_load_3d_detector():
         mcstas_few_neutrons_3d_detector_example(), DetectorBank.south, sizes
     )
     assert 'panel' in da.dims
+    # Detector position.x is monotone in panel dimension.
+    panel_x_diff = np.diff(da.coords['detector_position'].fields.x.values)
+    assert (panel_x_diff > 0).all() or (panel_x_diff < 0).all()
 
 
 def test_can_load_monitor():

{essdiffraction-26.5.1 → essdiffraction-26.5.2}/tests/dream/geant4_reduction_test.py

@@ -307,7 +307,7 @@ def test_pipeline_save_data_to_disk(output_folder: Path):
     result = wf.compute(ReducedTofCIF)
     result.comment = """This file was generated with the DREAM data reduction user guide
     in the documentation of ESSdiffraction.
-    See https://scipp.github.io/essdiffraction/
+    See https://scipp.github.io/ess/diffraction/
     """
     result.save(output_folder / "dream_reduced.cif")
 

essdiffraction-26.5.2/tests/magic/workflow_test.py

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2026 Scipp contributors (https://github.com/scipp)
+import sciline as sl
+from ess.magic import MagicWorkflow, default_parameters
+
+from ess.reduce.nexus.types import DetectorBankSizes
+
+
+def test_magic_workflow_can_be_constructed():
+    wf = MagicWorkflow()
+    assert isinstance(wf, sl.Pipeline)
+
+
+def test_default_parameters_include_detector_bank_sizes():
+    sizes = default_parameters[DetectorBankSizes]
+    assert 'detector_a' in sizes
+    assert 'detector_b' in sizes