essdiffraction 24.9.0__tar.gz → 24.10.0__tar.gz

{essdiffraction-24.9.0/src/essdiffraction.egg-info → essdiffraction-24.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: essdiffraction
-Version: 24.9.0
+Version: 24.10.0
 Summary: Diffraction data reduction for the European Spallation Source
 Author: Scipp contributors
 License: BSD 3-Clause License
@@ -51,7 +51,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dask
-Requires-Dist: essreduce>=24.08.2
+Requires-Dist: essreduce>=24.10.2
 Requires-Dist: graphviz
 Requires-Dist: numpy
 Requires-Dist: plopp

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/pyproject.toml

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

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/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>=24.08.2
+essreduce>=24.10.2
 graphviz
 numpy
 plopp

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:2cad3df672e12033fa21254667278ceafae15e09
+# SHA1:86f9288f7221f3a8506d1cc40db8a4584011b0e0
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -15,27 +15,27 @@ comm==0.2.2
     # via ipywidgets
 contourpy==1.3.0
     # via matplotlib
-cyclebane==24.6.0
+cyclebane==24.10.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.9.0
+dask==2024.9.1
     # via -r base.in
 decorator==5.1.1
     # via ipython
-essreduce==24.9.1
+essreduce==24.10.2
     # via -r base.in
 exceptiongroup==1.2.2
     # via ipython
 executing==2.1.0
     # via stack-data
-fonttools==4.53.1
+fonttools==4.54.1
     # via matplotlib
 fsspec==2024.9.0
     # via dask
 graphviz==0.20.3
     # via -r base.in
-h5py==3.11.0
+h5py==3.12.1
     # via
     #   scippneutron
     #   scippnexus
@@ -43,7 +43,7 @@ importlib-metadata==8.5.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.27.0
+ipython==8.28.0
     # via ipywidgets
 ipywidgets==8.1.5
     # via
@@ -65,9 +65,9 @@ matplotlib-inline==0.1.7
     # via ipython
 mpltoolbox==24.5.1
     # via scippneutron
-networkx==3.3
+networkx==3.4
     # via cyclebane
-numpy==2.1.1
+numpy==2.1.2
     # via
     #   -r base.in
     #   contourpy
@@ -91,11 +91,11 @@ pexpect==4.9.0
     # via ipython
 pillow==10.4.0
     # via matplotlib
-plopp==24.9.1
+plopp==24.9.3
     # via
     #   -r base.in
     #   scippneutron
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via ipython
 ptyprocess==0.7.0
     # via pexpect
@@ -125,7 +125,7 @@ scipp==24.9.1
     #   scippnexus
 scippneutron==24.9.0
     # via -r base.in
-scippnexus==24.9.0
+scippnexus==24.10.0
     # via
     #   -r base.in
     #   essreduce
@@ -140,7 +140,7 @@ six==1.16.0
     #   python-dateutil
 stack-data==0.6.3
     # via ipython
-toolz==0.12.1
+toolz==1.0.0
     # via
     #   dask
     #   partd

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/basetest.txt

@@ -7,7 +7,7 @@
 #
 certifi==2024.8.30
     # via requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
 exceptiongroup==1.2.2
     # via pytest
@@ -15,13 +15,13 @@ idna==3.10
     # via requests
 iniconfig==2.0.0
     # via pytest
-numpy==2.1.1
+numpy==2.1.2
     # via pandas
 packaging==24.1
     # via
     #   pooch
     #   pytest
-pandas==2.2.2
+pandas==2.2.3
     # via -r basetest.in
 platformdirs==4.3.6
     # via pooch
@@ -39,9 +39,9 @@ requests==2.32.3
     # via pooch
 six==1.16.0
     # via python-dateutil
-tomli==2.0.1
+tomli==2.0.2
     # via pytest
-tzdata==2024.1
+tzdata==2024.2
     # via pandas
 urllib3==2.2.3
     # via requests

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/ci.txt

@@ -11,11 +11,11 @@ certifi==2024.8.30
     # via requests
 chardet==5.2.0
     # via tox
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
 colorama==0.4.6
     # via tox
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
 filelock==3.16.1
     # via
@@ -44,13 +44,15 @@ requests==2.32.3
     # via -r ci.in
 smmap==5.0.1
     # via gitdb
-tomli==2.0.1
+tomli==2.0.2
     # via
     #   pyproject-api
     #   tox
-tox==4.20.0
+tox==4.21.2
     # via -r ci.in
+typing-extensions==4.12.2
+    # via tox
 urllib3==2.2.3
     # via requests
-virtualenv==20.26.5
+virtualenv==20.26.6
     # via tox

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/dev.txt

@@ -14,7 +14,7 @@
 -r wheels.txt
 annotated-types==0.7.0
     # via pydantic
-anyio==4.4.0
+anyio==4.6.0
     # via
     #   httpx
     #   jupyter-server
@@ -38,7 +38,7 @@ funcy==2.0
     # via copier
 h11==0.14.0
     # via httpcore
-httpcore==1.0.5
+httpcore==1.0.6
     # via httpx
 httpx==0.27.2
     # via jupyterlab
@@ -81,9 +81,9 @@ pip-compile-multi==2.6.4
     # via -r dev.in
 pip-tools==7.4.1
     # via pip-compile-multi
-plumbum==1.8.3
+plumbum==1.9.0
     # via copier
-prometheus-client==0.20.0
+prometheus-client==0.21.0
     # via jupyter-server
 pycparser==2.22
     # via cffi
@@ -115,7 +115,7 @@ terminado==0.18.1
     #   jupyter-server-terminals
 toposort==1.10
     # via pip-compile-multi
-types-python-dateutil==2.9.0.20240906
+types-python-dateutil==2.9.0.20241003
     # via arrow
 uri-template==1.3.0
     # via jsonschema

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/docs.txt

@@ -26,9 +26,9 @@ bleach==6.1.0
     # via nbconvert
 certifi==2024.8.30
     # via requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
-debugpy==1.8.5
+debugpy==1.8.7
     # via ipykernel
 defusedxml==0.7.1
     # via nbconvert
@@ -60,7 +60,7 @@ jinja2==3.1.4
     #   sphinx
 jsonschema==4.23.0
     # via nbformat
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via jsonschema
 jupyter-client==8.6.3
     # via
@@ -81,7 +81,7 @@ markdown-it-py==3.0.0
     # via
     #   mdit-py-plugins
     #   myst-parser
-markupsafe==2.1.5
+markupsafe==3.0.1
     # via
     #   jinja2
     #   nbconvert
@@ -106,7 +106,7 @@ nbsphinx==0.9.5
     # via -r docs.in
 nest-asyncio==1.6.0
     # via ipykernel
-pandas==2.2.2
+pandas==2.2.3
     # via -r docs.in
 pandocfilters==1.5.1
     # via nbconvert
@@ -150,7 +150,7 @@ snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.6
     # via beautifulsoup4
-sphinx==8.0.2
+sphinx==8.1.0
     # via
     #   -r docs.in
     #   myst-parser
@@ -160,7 +160,7 @@ sphinx==8.0.2
     #   sphinx-copybutton
     #   sphinx-design
     #   sphinxcontrib-bibtex
-sphinx-autodoc-typehints==2.4.4
+sphinx-autodoc-typehints==2.5.0
     # via -r docs.in
 sphinx-copybutton==0.5.2
     # via -r docs.in
@@ -182,13 +182,13 @@ sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 tinycss2==1.3.0
     # via nbconvert
-tomli==2.0.1
+tomli==2.0.2
     # via sphinx
 tornado==6.4.1
     # via
     #   ipykernel
     #   jupyter-client
-tzdata==2024.1
+tzdata==2024.2
     # via pandas
 urllib3==2.2.3
     # via requests

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/nightly.txt

@@ -16,11 +16,11 @@ comm==0.2.2
     # via ipywidgets
 contourpy==1.3.0
     # via matplotlib
-cyclebane==24.6.0
+cyclebane==24.10.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.9.0
+dask==2024.9.1
     # via -r nightly.in
 decorator==5.1.1
     # via ipython
@@ -28,13 +28,13 @@ essreduce @ git+https://github.com/scipp/essreduce@main
     # via -r nightly.in
 executing==2.1.0
     # via stack-data
-fonttools==4.53.1
+fonttools==4.54.1
     # via matplotlib
 fsspec==2024.9.0
     # via dask
 graphviz==0.20.3
     # via -r nightly.in
-h5py==3.11.0
+h5py==3.12.1
     # via
     #   scippneutron
     #   scippnexus
@@ -42,7 +42,7 @@ importlib-metadata==8.5.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.27.0
+ipython==8.28.0
     # via ipywidgets
 ipywidgets==8.1.5
     # via
@@ -64,7 +64,7 @@ matplotlib-inline==0.1.7
     # via ipython
 mpltoolbox==24.5.1
     # via scippneutron
-networkx==3.3
+networkx==3.4
     # via cyclebane
 parso==0.8.4
     # via jedi
@@ -78,7 +78,7 @@ plopp @ git+https://github.com/scipp/plopp@main
     # via
     #   -r nightly.in
     #   scippneutron
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via ipython
 ptyprocess==0.7.0
     # via pexpect
@@ -115,7 +115,7 @@ scipy==1.14.1
     #   scippnexus
 stack-data==0.6.3
     # via ipython
-toolz==0.12.1
+toolz==1.0.0
     # via
     #   dask
     #   partd

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/static.txt

@@ -7,7 +7,7 @@
 #
 cfgv==3.4.0
     # via pre-commit
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
 filelock==3.16.1
     # via virtualenv
@@ -17,9 +17,9 @@ nodeenv==1.9.1
     # via pre-commit
 platformdirs==4.3.6
     # via virtualenv
-pre-commit==3.8.0
+pre-commit==4.0.1
     # via -r static.in
 pyyaml==6.0.2
     # via pre-commit
-virtualenv==20.26.5
+virtualenv==20.26.6
     # via pre-commit

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/requirements/wheels.txt

@@ -5,11 +5,11 @@
 #
 #    pip-compile-multi
 #
-build==1.2.2
+build==1.2.2.post1
     # via -r wheels.in
 packaging==24.1
     # via build
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via build
-tomli==2.0.1
+tomli==2.0.2
     # via build

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/src/ess/dream/io/geant4.py

@@ -4,6 +4,7 @@
 import numpy as np
 import sciline
 import scipp as sc
+import scippnexus as snx
 
 from ess.powder.types import (
     CalibratedDetector,
@@ -11,13 +12,13 @@ from ess.powder.types import (
     CalibrationFilename,
     DetectorData,
     Filename,
-    NeXusDetector,
+    NeXusComponent,
     NeXusDetectorName,
-    NeXusSample,
-    NeXusSource,
+    Position,
     RunType,
 )
-from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
+from ess.reduce.nexus.types import CalibratedBeamline
+from ess.reduce.nexus.workflow import GenericNeXusWorkflow
 
 MANTLE_DETECTOR_ID = sc.index(7)
 HIGH_RES_DETECTOR_ID = sc.index(8)
@@ -60,9 +61,23 @@ def load_geant4_csv(file_path: Filename[RunType]) -> AllRawDetectors[RunType]:
 
 def extract_geant4_detector(
     detectors: AllRawDetectors[RunType], detector_name: NeXusDetectorName
-) -> NeXusDetector[RunType]:
+) -> NeXusComponent[snx.NXdetector, RunType]:
     """Extract a single detector from a loaded GEANT4 simulation."""
-    return NeXusDetector[RunType](detectors["instrument"][detector_name])
+    return NeXusComponent[snx.NXdetector, RunType](
+        detectors["instrument"][detector_name]
+    )
+
+
+def get_calibrated_geant4_detector(
+    detector: NeXusComponent[snx.NXdetector, RunType],
+) -> CalibratedDetector[RunType]:
+    """
+    Replacement for :py:func:`ess.reduce.nexus.workflow.get_calibrated_detector`.
+
+    Since the Geant4 detectors already have computed positions as well as logical shape,
+    this just extracts the relevant event data.
+    """
+    return detector['events'].copy(deep=False)
 
 
 def _load_raw_events(file_path: str) -> sc.DataArray:
@@ -171,21 +186,21 @@ def geant4_load_calibration(filename: CalibrationFilename) -> CalibrationData:
 
 
 def dummy_assemble_detector_data(
-    detector: CalibratedDetector[RunType],
+    detector: CalibratedBeamline[RunType],
 ) -> DetectorData[RunType]:
     """Dummy assembly of detector data, detector already contains neutron data."""
     return DetectorData[RunType](detector)
 
 
-def dummy_source() -> NeXusSource[RunType]:
-    return NeXusSource[RunType](
-        sc.DataGroup(position=sc.vector([np.nan, np.nan, np.nan], unit="mm"))
+def dummy_source_position() -> Position[snx.NXsource, RunType]:
+    return Position[snx.NXsource, RunType](
+        sc.vector([np.nan, np.nan, np.nan], unit="mm")
     )
 
 
-def dummy_sample() -> NeXusSample[RunType]:
-    return NeXusSample[RunType](
-        sc.DataGroup(position=sc.vector([np.nan, np.nan, np.nan], unit="mm"))
+def dummy_sample_position() -> Position[snx.NXsample, RunType]:
+    return Position[snx.NXsample, RunType](
+        sc.vector([np.nan, np.nan, np.nan], unit="mm")
     )
 
 
@@ -197,7 +212,8 @@ def LoadGeant4Workflow() -> sciline.Pipeline:
     wf.insert(extract_geant4_detector)
     wf.insert(load_geant4_csv)
     wf.insert(geant4_load_calibration)
+    wf.insert(get_calibrated_geant4_detector)
     wf.insert(dummy_assemble_detector_data)
-    wf.insert(dummy_source)
-    wf.insert(dummy_sample)
+    wf.insert(dummy_source_position)
+    wf.insert(dummy_sample_position)
     return wf

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/src/ess/dream/io/nexus.py

@@ -15,8 +15,8 @@ and the ICD DREAM interface specification for details.
 
 import sciline
 
-from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
 from ess.reduce.nexus.types import DetectorBankSizes
+from ess.reduce.nexus.workflow import GenericNeXusWorkflow
 
 DETECTOR_BANK_SIZES = {
     "endcap_backward_detector": {

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/src/ess/dream/workflow.py

@@ -5,12 +5,12 @@ import itertools
 
 import sciline
 import scipp as sc
+import scippnexus as snx
 
 from ess.powder import providers as powder_providers
 from ess.powder.types import (
     AccumulatedProtonCharge,
-    NeXusSample,
-    NeXusSource,
+    Position,
     SampleRun,
     VanadiumRun,
 )
@@ -23,14 +23,14 @@ _dream_providers = (prepare_reduced_dspacing_cif,)
 
 def default_parameters() -> dict:
     # Quantities not available in the simulated data
-    sample = sc.DataGroup(position=sc.vector([0.0, 0.0, 0.0], unit="mm"))
-    source = sc.DataGroup(position=sc.vector([-3.478, 0.0, -76550], unit="mm"))
+    sample_position = sc.vector([0.0, 0.0, 0.0], unit="mm")
+    source_position = sc.vector([-3.478, 0.0, -76550], unit="mm")
     charge = sc.scalar(1.0, unit="µAh")
     return {
-        NeXusSample[SampleRun]: sample,
-        NeXusSample[VanadiumRun]: sample,
-        NeXusSource[SampleRun]: source,
-        NeXusSource[VanadiumRun]: source,
+        Position[snx.NXsample, SampleRun]: sample_position,
+        Position[snx.NXsample, VanadiumRun]: sample_position,
+        Position[snx.NXsource, SampleRun]: source_position,
+        Position[snx.NXsource, VanadiumRun]: source_position,
         AccumulatedProtonCharge[SampleRun]: charge,
         AccumulatedProtonCharge[VanadiumRun]: charge,
         CIFAuthors: CIFAuthors([]),

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/src/ess/powder/types.py

@@ -14,36 +14,28 @@ import sciline
 import scipp as sc
 from scippneutron.io import cif
 
-from ess.reduce.nexus import generic_types as reduce_gt
 from ess.reduce.nexus import types as reduce_t
 from ess.reduce.uncertainty import UncertaintyBroadcastMode as _UncertaintyBroadcastMode
 
 # 1 TypeVars used to parametrize the generic parts of the workflow
 
-BackgroundRun = reduce_gt.BackgroundRun
-CalibratedDetector = reduce_gt.CalibratedDetector
-CalibratedMonitor = reduce_gt.CalibratedMonitor
-DetectorData = reduce_gt.DetectorData
-DetectorPositionOffset = reduce_gt.DetectorPositionOffset
-EmptyBeamRun = reduce_gt.EmptyBeamRun
-Filename = reduce_gt.Filename
-Incident = reduce_gt.Incident
-MonitorData = reduce_gt.MonitorData
-MonitorPositionOffset = reduce_gt.MonitorPositionOffset
-MonitorType = reduce_gt.MonitorType
-NeXusMonitorName = reduce_gt.NeXusMonitorName
-NeXusDetector = reduce_gt.NeXusDetector
-NeXusMonitor = reduce_gt.NeXusMonitor
-NeXusSample = reduce_gt.NeXusSample
-NeXusSource = reduce_gt.NeXusSource
-RunType = reduce_gt.RunType
-SampleRun = reduce_gt.SampleRun
-ScatteringRunType = reduce_gt.ScatteringRunType
-Transmission = reduce_gt.Transmission
-TransmissionRun = reduce_gt.TransmissionRun
-SamplePosition = reduce_gt.SamplePosition
-SourcePosition = reduce_gt.SourcePosition
-VanadiumRun = reduce_gt.VanadiumRun
+BackgroundRun = reduce_t.BackgroundRun
+CalibratedDetector = reduce_t.CalibratedDetector
+CalibratedMonitor = reduce_t.CalibratedMonitor
+DetectorData = reduce_t.DetectorData
+DetectorPositionOffset = reduce_t.DetectorPositionOffset
+EmptyBeamRun = reduce_t.EmptyBeamRun
+Filename = reduce_t.Filename
+MonitorData = reduce_t.MonitorData
+MonitorPositionOffset = reduce_t.MonitorPositionOffset
+MonitorType = reduce_t.MonitorType
+NeXusDetectorName = reduce_t.NeXusDetectorName
+NeXusMonitorName = reduce_t.NeXusName
+NeXusComponent = reduce_t.NeXusComponent
+RunType = reduce_t.RunType
+SampleRun = reduce_t.SampleRun
+Position = reduce_t.Position
+VanadiumRun = reduce_t.VanadiumRun
 
 DetectorBankSizes = reduce_t.DetectorBankSizes
 NeXusDetectorName = reduce_t.NeXusDetectorName

{essdiffraction-24.9.0 → essdiffraction-24.10.0/src/essdiffraction.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: essdiffraction
-Version: 24.9.0
+Version: 24.10.0
 Summary: Diffraction data reduction for the European Spallation Source
 Author: Scipp contributors
 License: BSD 3-Clause License
@@ -51,7 +51,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dask
-Requires-Dist: essreduce>=24.08.2
+Requires-Dist: essreduce>=24.10.2
 Requires-Dist: graphviz
 Requires-Dist: numpy
 Requires-Dist: plopp

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/src/essdiffraction.egg-info/requires.txt

@@ -1,5 +1,5 @@
 dask
-essreduce>=24.08.2
+essreduce>=24.10.2
 graphviz
 numpy
 plopp

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/tests/dream/geant4_reduction_test.py

@@ -7,6 +7,7 @@ import pytest
 import sciline
 import scipp as sc
 import scipp.testing
+import scippnexus as snx
 from scippneutron.io.cif import Author
 
 import ess.dream.data  # noqa: F401
@@ -22,9 +23,8 @@ from ess.powder.types import (
     IofDspacingTwoTheta,
     MaskedData,
     NeXusDetectorName,
-    NeXusSample,
-    NeXusSource,
     NormalizedByProtonCharge,
+    Position,
     ReducedDspacingCIF,
     SampleRun,
     TofMask,
@@ -35,8 +35,8 @@ from ess.powder.types import (
     WavelengthMask,
 )
 
-sample = sc.DataGroup(position=sc.vector([0.0, 0.0, 0.0], unit='mm'))
-source = sc.DataGroup(position=sc.vector([-3.478, 0.0, -76550], unit='mm'))
+sample = sc.vector([0.0, 0.0, 0.0], unit='mm')
+source = sc.vector([-3.478, 0.0, -76550], unit='mm')
 charge = sc.scalar(1.0, unit='µAh')
 
 params = {
@@ -48,10 +48,10 @@ params = {
     DspacingBins: sc.linspace('dspacing', 0.0, 2.3434, 201, unit='angstrom'),
     TofMask: lambda x: (x < sc.scalar(0.0, unit='ns'))
     | (x > sc.scalar(86e6, unit='ns')),
-    NeXusSample[SampleRun]: sample,
-    NeXusSample[VanadiumRun]: sample,
-    NeXusSource[SampleRun]: source,
-    NeXusSource[VanadiumRun]: source,
+    Position[snx.NXsample, SampleRun]: sample,
+    Position[snx.NXsample, VanadiumRun]: sample,
+    Position[snx.NXsource, SampleRun]: source,
+    Position[snx.NXsource, VanadiumRun]: source,
     AccumulatedProtonCharge[SampleRun]: charge,
     AccumulatedProtonCharge[VanadiumRun]: charge,
     TwoThetaMask: None,

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/tests/dream/io/geant4_test.py

@@ -8,17 +8,11 @@ import numpy as np
 import pytest
 import scipp as sc
 import scipp.testing
+import scippnexus as snx
 
 from ess.dream import data, load_geant4_csv
 from ess.dream.io.geant4 import LoadGeant4Workflow
-from ess.powder.types import (
-    Filename,
-    NeXusDetector,
-    NeXusDetectorName,
-    NeXusSample,
-    NeXusSource,
-    SampleRun,
-)
+from ess.powder.types import Filename, NeXusComponent, NeXusDetectorName, SampleRun
 
 
 @pytest.fixture(scope="module")
@@ -186,13 +180,13 @@ def test_geant4_in_pipeline(file_path, file):
     pipeline = LoadGeant4Workflow()
     pipeline[Filename[SampleRun]] = file_path
     pipeline[NeXusDetectorName] = NeXusDetectorName("mantle")
-    pipeline[NeXusSample[SampleRun]] = sc.DataGroup(
+    pipeline[NeXusComponent[snx.NXsample, SampleRun]] = sc.DataGroup(
         position=sc.vector([0.0, 0.0, 0.0], unit="mm")
     )
-    pipeline[NeXusSource[SampleRun]] = sc.DataGroup(
+    pipeline[NeXusComponent[snx.NXsource, SampleRun]] = sc.DataGroup(
         position=sc.vector([-3.478, 0.0, -76550], unit="mm")
     )
 
-    detector = pipeline.compute(NeXusDetector[SampleRun])['events']
+    detector = pipeline.compute(NeXusComponent[snx.NXdetector, SampleRun])['events']
     expected = load_geant4_csv(file)["instrument"]["mantle"]["events"]
     sc.testing.assert_identical(detector, expected)

{essdiffraction-24.9.0 → essdiffraction-24.10.0}/tests/dream/io/nexus_test.py

@@ -6,16 +6,16 @@ import scipp as sc
 
 import ess.dream.data  # noqa: F401
 from ess import dream
-from ess.reduce.nexus.generic_types import (
+from ess.reduce.nexus.types import (
     CalibratedDetector,
     CalibratedMonitor,
     DetectorData,
     Filename,
     Monitor1,
-    NeXusMonitorName,
+    NeXusDetectorName,
     SampleRun,
 )
-from ess.reduce.nexus.types import NeXusDetectorName
+from ess.reduce.nexus.types import NeXusName as NeXusMonitorName
 
 bank_dims = {'wire', 'module', 'segment', 'strip', 'counter'}
 hr_sans_dims = {'strip', 'other'}