Merge branch 'main' into gravity-toggle

Author: MridulS

.github/workflows/nightly_at_main.yml

@@ -31,4 +31,5 @@ jobs:
       os-variant: ${{ matrix.os }}
       python-version: ${{ matrix.python.version }}
       tox-env: ${{ matrix.python.tox-env }}
+      test-artifacts-name: 'essreflectometry-test-artifacts-latest'
     secrets: inherit

.github/workflows/nightly_at_release.yml

@@ -38,4 +38,5 @@ jobs:
       python-version: ${{ matrix.python.version }}
       tox-env: ${{ matrix.python.tox-env }}
       checkout_ref: ${{ needs.setup.outputs.release_tag }}
+      test-artifacts-name: 'essreflectometry-test-artifacts-stable'
     secrets: inherit

.github/workflows/test.yml

@@ -20,6 +20,9 @@ on:
       checkout_ref:
         default: ''
         type: string
+      test-artifacts-name:
+        default: ''
+        type: string
   workflow_call:
     inputs:
       os-variant:
@@ -39,6 +42,9 @@ on:
       checkout_ref:
         default: ''
         type: string
+      test-artifacts-name:
+        default: ''
+        type: string
 
 jobs:
   package-test:
@@ -71,9 +77,14 @@ jobs:
           python-version: ${{ inputs.python-version }}
       - run: python -m pip install --upgrade pip
       - run: python -m pip install -r ${{ inputs.pip-recipe }}
-      - run: tox -e ${{ inputs.tox-env }}
+      - run: tox -e ${{ inputs.tox-env }} -- --file-output="tests_outputs"
       - uses: actions/upload-artifact@v4
         if: ${{ inputs.coverage-report }}
         with:
           name: CoverageReport
           path: coverage_html/
+      - uses: actions/upload-artifact@v4
+        if: ${{ inputs.test-artifacts-name != '' }}
+        with:
+          name: ${{ inputs.test-artifacts-name }}
+          path: tests_outputs/

src/ess/amor/data.py

@@ -12,7 +12,7 @@ def _make_pooch():
     return pooch.create(
         path=pooch.os_cache("ess/amor"),
         env="ESS_AMOR_DATA_DIR",
-        base_url="https://fileserver-cache.johanneskasimir.workers.dev/groups/scipp/ess/amor/{version}/",
+        base_url="https://public.esss.dk/groups/scipp/ess/amor/{version}/",
         version=_version,
         registry={
             "reference.nxs": "md5:56d493c8051e1c5c86fb7a95f8ec643b",

tests/amor/pipeline_test.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
-# flake8: noqa: F403, F405
+from pathlib import Path
 
 import numpy as np
 import pytest
@@ -103,6 +103,17 @@ def test_orso_pipeline(amor_pipeline: sciline.Pipeline):
     assert np.isfinite(res.data).all()
 
 
+@pytest.mark.filterwarnings("ignore:Failed to convert .* into a transformation")
+@pytest.mark.filterwarnings("ignore:Invalid transformation, missing attribute")
+def test_save_reduced_orso_file(amor_pipeline: sciline.Pipeline, output_folder: Path):
+    from orsopy import fileio
+
+    amor_pipeline[SampleRotation[SampleRun]] = sc.scalar(0.85, unit="deg")
+    amor_pipeline[Filename[SampleRun]] = amor.data.amor_sample_run(608)
+    res = amor_pipeline.compute(orso.OrsoIofQDataset)
+    fileio.orso.save_orso(datasets=[res], fname=output_folder / 'amor_reduced_iofq.ort')
+
+
 @pytest.mark.filterwarnings("ignore:Failed to convert .* into a transformation")
 @pytest.mark.filterwarnings("ignore:Invalid transformation, missing attribute")
 def test_pipeline_can_compute_reflectivity_merging_events_from_multiple_runs(

tests/conftest.py

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
+
+from pathlib import Path
+
+import pytest
+
+
+def pytest_addoption(parser: pytest.Parser) -> None:
+    parser.addoption("--file-output", help='Output folder for reduced data')
+
+
+@pytest.fixture
+def output_folder(request: pytest.FixtureRequest) -> Path:
+    if (path := request.config.getoption("--file-output")) is not None:
+        out = Path(path)
+        out.mkdir(parents=True, exist_ok=True)
+        return out
+    return request.getfixturevalue("tmp_path")