diff --git a/.github/workflows/pr_and_main.yml b/.github/workflows/pr_and_main.yml index b584a3fec..a61ba3895 100644 --- a/.github/workflows/pr_and_main.yml +++ b/.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: diff --git a/.github/workflows/weekly_and_release.yml b/.github/workflows/weekly_and_release.yml index 259f0006e..e50775f55 100644 --- a/.github/workflows/weekly_and_release.yml +++ b/.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: diff --git a/conda/meta.yaml b/conda/meta.yaml index eba9fbb67..70675227b 100644 --- a/conda/meta.yaml +++ b/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 diff --git a/docs/_templates/topbar/launchbuttons.html b/docs/_templates/topbar/launchbuttons.html index 4582c514d..91f75d0ca 100644 --- a/docs/_templates/topbar/launchbuttons.html +++ b/docs/_templates/topbar/launchbuttons.html @@ -11,6 +11,12 @@ + + diff --git a/docs/about/release-notes.rst b/docs/about/release-notes.rst index 4857b573e..260a604b5 100644 --- a/docs/about/release-notes.rst +++ b/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 `_. -Bugfixes -~~~~~~~~ - -Deprecations -~~~~~~~~~~~~ - -Stability, Maintainability, and Testing -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Contributors ~~~~~~~~~~~~ @@ -39,18 +27,6 @@ Features * Implemented a logging framework for reflectometry and Amor `#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 `_. -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 ~~~~~~~~~~~~ diff --git a/docs/developer/getting-started.rst b/docs/developer/getting-started.rst index 2ee553a8c..39d139c99 100644 --- a/docs/developer/getting-started.rst +++ b/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 diff --git a/docs/developer/style-guide.rst b/docs/developer/style-guide.rst index ccd595f75..e6ec8946e 100644 --- a/docs/developer/style-guide.rst +++ b/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 `_, +More details can be found in the +`logging documentation `_, as well as in the `Scipp documentation on logging `_. @@ -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 `_ for an +See `amor.data `_ 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 `_) +- adding type-hints to your function arguments and return types (see `typing `_) - 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 diff --git a/src/ess/wfm/stitch.py b/src/ess/wfm/stitch.py index 718903e03..2a4c3d55e 100644 --- a/src/ess/wfm/stitch.py +++ b/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,