Merge pull request #112 from scipp/scippneutron-0.5

Release 0.4 (using scippneutron-0.5)

.github/workflows/pr_and_main.yml

@@ -45,7 +45,7 @@ jobs:
           fetch-depth: 0  # history required so cmake can determine version
       - uses: conda-incubator/setup-miniconda@v2
       - run: conda install --channel conda-forge --yes conda-build mamba boa
-      - run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda
+      - run: conda mambabuild --channel conda-forge --channel scipp --channel mantid --no-anaconda-upload --override-channels --output-folder conda/package conda
 
       - uses: actions/upload-artifact@v2
         with:

.github/workflows/weekly_and_release.yml

@@ -39,7 +39,7 @@ jobs:
           fetch-depth: 0  # history required so cmake can determine version
       - uses: conda-incubator/setup-miniconda@v2
       - run: conda install --channel conda-forge --yes conda-build mamba boa
-      - run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda
+      - run: conda mambabuild --channel conda-forge --channel scipp --channel mantid --no-anaconda-upload --override-channels --output-folder conda/package conda
 
       - uses: actions/upload-artifact@v2
         with:

conda/meta.yaml

@@ -13,7 +13,7 @@ requirements:
     - ipywidgets
     - matplotlib
     - pooch
-    - scippneutron>=0.4.2
+    - scippneutron>=0.5
     - scipy
     - tifffile
 
@@ -25,7 +25,7 @@ test:
     - ess.reflectometry
   requires:
     - ipympl
-    - mantid-framework
+    - mantid
     - pytest
     - pandoc
     - pythreejs

docs/_templates/topbar/launchbuttons.html

@@ -11,6 +11,12 @@
         <a class="dropdown-buttons"
             href="https://scipp.github.io/ess"><button type="button"
                 class="btn btn-secondary topbarbtn">latest</button></a>
+        <a class="dropdown-buttons"
+            href="https://scipp.github.io/ess/release/0.4.0"><button type="button"
+                class="btn btn-secondary topbarbtn">v0.4</button></a>
+        <a class="dropdown-buttons"
+            href="https://scipp.github.io/ess/release/0.3.0"><button type="button"
+                class="btn btn-secondary topbarbtn">v0.3</button></a>
         <a class="dropdown-buttons"
             href="https://scipp.github.io/ess/release/0.2.0"><button type="button"
                 class="btn btn-secondary topbarbtn">v0.2</button></a>

docs/about/release-notes.rst

@@ -3,26 +3,14 @@
 Release Notes
 =============
 
-v0.4.0 (unreleased)
--------------------
-
-Features
-~~~~~~~~
+v0.4.0 (February 2022)
+----------------------
 
 Breaking changes
 ~~~~~~~~~~~~~~~~
 
 * When doing ``import ess``, all the submodules (``amor``, ``reflectometry``, and ``wfm``) are no longer directly available as ``ess.amor``. Instead, we now rely on simply doing ``from ess import amor`` or ``import ess.sans as sans`` `#102 <https://github.com/scipp/ess/pull/102>`_.
 
-Bugfixes
-~~~~~~~~
-
-Deprecations
-~~~~~~~~~~~~
-
-Stability, Maintainability, and Testing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Contributors
 ~~~~~~~~~~~~
 
@@ -39,18 +27,6 @@ Features
 * Implemented a logging framework for reflectometry and Amor `#93 <https://github.com/scipp/ess/pull/93>`_.
 * Added the ``sans.to_I_of_Q`` workflow to reduce SANS2D data, as well as notebooks that describe the workflow and illustrate its usage `#60 <https://github.com/scipp/ess/pull/60>`_.
 
-Breaking changes
-~~~~~~~~~~~~~~~~
-
-Bugfixes
-~~~~~~~~
-
-Deprecations
-~~~~~~~~~~~~
-
-Stability, Maintainability, and Testing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Contributors
 ~~~~~~~~~~~~
 
@@ -62,9 +38,6 @@ and Jan-Lukas Wynen :sup:`a`
 v0.2.0 (January 2022)
 ---------------------
 
-Features
-~~~~~~~~
-
 Breaking changes
 ~~~~~~~~~~~~~~~~
 
@@ -75,15 +48,6 @@ Breaking changes
   * The unit conversion (computing wavelength and Q) now use ``transform_coords``.
   * The Amor reduction notebook from ``ess-notebooks`` has been imported into the ``ess`` repository.
 
-Bugfixes
-~~~~~~~~
-
-Deprecations
-~~~~~~~~~~~~
-
-Stability, Maintainability, and Testing
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Contributors
 ~~~~~~~~~~~~
 

docs/developer/getting-started.rst

@@ -25,7 +25,7 @@ We use the ``tools/metatoenv.py`` script to merge the dependencies in the
 .. code-block:: bash
 
   python tools/metatoenv.py --dir=conda --env-file=ess-developer.yml \
-    --channels=conda-forge,scipp --merge-with=developer-extra.yml
+    --channels=conda-forge,scipp,mantid --merge-with=developer-extra.yml
   conda env create -f ess-developer.yml
   conda activate ess-developer
 

docs/developer/style-guide.rst

@@ -54,7 +54,8 @@ If you have functions in your workflow that represent important steps
 (or costly operations) in your data processing, it is recommended to register the calls
 to those functions via Scipp's logging framework.
 
-More details can be found `here <https://scipp.github.io/reference/logging.html>`_,
+More details can be found in the
+`logging documentation <https://scipp.github.io/reference/logging.html>`_,
 as well as in the
 `Scipp documentation on logging <https://scipp.github.io/reference/logging.html>`_.
 
@@ -102,7 +103,7 @@ Using data files
 
 If your notebooks require data files, you should use the ``pooch`` utility to handle
 file paths.
-See `here <https://github.com/scipp/ess/blob/main/src/ess/amor/data.py>`_ for an
+See `amor.data <https://github.com/scipp/ess/blob/main/src/ess/amor/data.py>`_ for an
 example showing how it is used in practice.
 
 References
@@ -151,7 +152,7 @@ This involves
 
 - including python docstrings on your user facing functions
 - providing code comments
-- adding type-hints to your function arguments and return types (see `here <https://docs.python.org/3/library/typing.html>`_)
+- adding type-hints to your function arguments and return types (see `typing <https://docs.python.org/3/library/typing.html>`_)
 - adding your functions to the API reference for your technique or instrument
 - including any additional document (Jupyter notebook or .rst file) that helps explain or describe how your functions or module work
 

src/ess/wfm/stitch.py

@@ -77,6 +77,7 @@ def _stitch_event_data(item: sc.DataArray, frames: sc.Dataset, dim: str, new_dim
 
     binned.masks['frame_gaps'] = (sc.arange(dim, 2 * frames.sizes["frame"] - 1) %
                                   2).astype(bool)
+    binned.masks['frame_gaps'].unit = None
 
     new_edges = sc.concat([
         (frames["time_min"]["frame", 0] - frames["time_correction"]["frame", 0]).data,