Support older scipp versions

Author: jl-wynen

src/ess/_migration.py

@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
+
+from typing import MutableMapping
+
+import scipp as sc
+
+
+def get_attrs(da: sc.DataArray) -> MutableMapping[str, sc.Variable]:
+    try:
+        # During deprecation phase
+        return da.deprecated_attrs
+    except AttributeError:
+        try:
+            # Before deprecation phase
+            return da.attrs
+        except AttributeError:
+            # After deprecation phase / removal of attrs
+            return da.coords
+
+
+def get_meta(da: sc.DataArray) -> MutableMapping[str, sc.Variable]:
+    try:
+        # During deprecation phase
+        return da.deprecated_meta
+    except AttributeError:
+        try:
+            # Before deprecation phase
+            return da.meta
+        except AttributeError:
+            # After deprecation phase / removal of attrs
+            return da.coords

src/ess/diffraction/powder/conversions.py

@@ -9,6 +9,7 @@
 
 import scipp as sc
 
+from ..._migration import get_attrs
 from ...logging import get_logger
 from .corrections import merge_calibration
 
@@ -153,7 +154,7 @@ def to_dspacing_with_calibration(
     # should be able to remove this.
     for key in ('difc', 'difa', 'tzero'):
         if key not in out.coords:
-            out.coords[key] = out.deprecated_attrs.pop(key)
+            out.coords[key] = get_attrs(out).pop(key)
 
     out = out.transform_coords('dspacing', graph=graph, keep_intermediate=False)
     out.coords.pop('_tag_positions_consumed', None)

src/ess/sans/beam_center_finder.py

@@ -6,6 +6,7 @@
 import numpy as np
 import scipp as sc
 
+from .._migration import get_meta
 from ..logging import get_logger
 from . import i_of_q
 from .common import gravity_vector
@@ -28,9 +29,9 @@ def center_of_mass(data: sc.DataArray) -> sc.Variable:
     :
         The position of the center-of-mass, as a vector.
     """
-    summed = data.sum(list(set(data.dims) - set(data.deprecated_meta['position'].dims)))
+    summed = data.sum(list(set(data.dims) - set(get_meta(data)['position'].dims)))
     v = sc.values(summed.data)
-    return sc.sum(summed.deprecated_meta['position'] * v) / v.sum()
+    return sc.sum(get_meta(summed)['position'] * v) / v.sum()
 
 
 def _offsets_to_vector(data: sc.DataArray, xy: List[float], graph: dict) -> sc.Variable:
@@ -339,7 +340,7 @@ def beam_center(
     This is what is now implemented in this version of the algorithm.
     """  # noqa: E501
     logger = get_logger('sans')
-    if 'gravity' not in data.deprecated_meta:
+    if 'gravity' not in get_meta(data):
         data = data.copy(deep=False)
         data.coords['gravity'] = gravity_vector()
     # Use center of mass to get initial guess for beam center

src/ess/sans/i_of_q.py

@@ -6,6 +6,7 @@
 import scipp as sc
 from scipp.scipy.interpolate import interp1d
 
+from .._migration import get_meta
 from ..logging import get_logger
 from . import conversions, normalization
 from .common import gravity_vector, mask_range
@@ -160,7 +161,7 @@ def convert_to_q_and_merge_spectra(
     :
         The input data converted to Q and then summed over all detector pixels.
     """
-    if gravity and ('gravity' not in data.deprecated_meta):
+    if gravity and ('gravity' not in get_meta(data)):
         data = data.copy(deep=False)
         data.coords["gravity"] = gravity_vector()
 
@@ -329,7 +330,7 @@ def to_I_of_Q(
     # Insert a copy of coords needed for conversion to Q.
     # TODO: can this be avoided by copying the Q coords from the converted numerator?
     for coord in ['position', 'sample_position', 'source_position']:
-        denominator.coords[coord] = data.deprecated_meta[coord]
+        denominator.coords[coord] = get_meta(data)[coord]
 
     # In the case where no wavelength bands are requested, we create a single wavelength
     # band to make sure we select the correct wavelength range that corresponds to

src/ess/wfm/stitch.py

@@ -4,6 +4,8 @@
 
 import scipp as sc
 
+from .._migration import get_attrs
+
 
 def _stitch_dense_data(
     item: sc.DataArray,
@@ -47,10 +49,13 @@ def _stitch_dense_data(
         ),
         coords={new_dim: new_coord},
     )
-    for group in ["coords", "deprecated_attrs"]:
-        for key in getattr(item, group):
-            if key != dim:
-                getattr(out, group)[key] = getattr(item, group)[key].copy()
+
+    for key in item.coords:
+        if key != dim:
+            out.coords[key] = item.coords[key].copy()
+    for key in get_attrs(item):
+        if key != dim:
+            get_attrs(out)[key] = get_attrs(item)[key].copy()
 
     for i in range(frames.sizes["frame"]):
         section = item[