Merge pull request #588 from scipp/remote-attrs

Remove uses of attrs and meta and remove deprecated Mantid functions
scipp · Jan 17, 2025 · 7734ed2 · 7734ed2
2 parents cb602e1 + 80ae9f1
commit 7734ed2
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 792 deletions.
diff --git a/docs/api-reference/index.md b/docs/api-reference/index.md
@@ -11,7 +11,6 @@
    :toctree: ../generated/functions
    :recursive:
 
-   array_from_mantid
    from_mantid
    load_with_mantid
    to_mantid

diff --git a/src/scippneutron/__init__.py b/src/scippneutron/__init__.py
@@ -33,10 +33,8 @@
 from .core import convert
 from .mantid import (
     from_mantid,
-    array_from_mantid,
     to_mantid,
     load_with_mantid,
-    load,
     fit,
 )
 from .instrument_view import instrument_view
@@ -59,11 +57,9 @@
     "two_theta",
     "convert",
     "from_mantid",
-    "array_from_mantid",
     "to_mantid",
     "io",
     "load_with_mantid",
-    "load",
     "fit",
     "instrument_view",
     "atoms",

diff --git a/src/scippneutron/_utils/__init__.py b/src/scippneutron/_utils/__init__.py
@@ -5,8 +5,6 @@
 Internal utilities; do not use outside scippneutron!
 """
 
-from collections.abc import MutableMapping
-
 import scipp as sc
 from scipp.typing import VariableLike
 
@@ -28,29 +26,3 @@ def float_dtype(var: VariableLike) -> sc.DType:
 
 def as_float_type(var: VariableLike, ref: VariableLike) -> VariableLike:
     return var.astype(float_dtype(ref), copy=False)
-
-
-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
diff --git a/src/scippneutron/instrument_view.py b/src/scippneutron/instrument_view.py
@@ -6,8 +6,6 @@
 import scipp as sc
 from scipy.spatial.transform import Rotation as Rot
 
-from ._utils import get_meta
-
 try:
     import pythreejs as p3
 except ImportError as ex:
@@ -274,7 +272,7 @@ def instrument_view(
 
     import plopp as pp
 
-    positions_var = get_meta(scipp_obj)[positions]
+    positions_var = scipp_obj.coords[positions]
     if pixel_size is None:
         pos_array = positions_var.values
         if len(pos_array) > 1: