Merge pull request #701 from scipp/replace-bins-is-none

Use is_binned property instead of bins is [not] None

Author: jl-wynen

pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "numpy>=1.20",
     "plopp>=26.4.1",
     "pydantic>=2",
-    "scipp>=25.8.0",
+    "scipp>=25.11.0",
     "scippnexus>=23.11.0",
     "scipy>=1.7.0",
 ]

requirements/base.in

@@ -10,6 +10,6 @@ mpltoolbox>=24.6.0
 numpy>=1.20
 plopp>=26.4.1
 pydantic>=2
-scipp>=25.8.0
+scipp>=25.11.0
 scippnexus>=23.11.0
 scipy>=1.7.0

src/scippneutron/_utils/__init__.py

@@ -10,11 +10,11 @@
 
 
 def elem_unit(var: VariableLike) -> sc.Unit:
-    return var.bins.unit if var.bins is not None else var.unit
+    return var.bins.unit if var.is_binned else var.unit
 
 
 def elem_dtype(var: VariableLike) -> sc.DType:
-    return var.bins.constituents['data'].dtype if var.bins is not None else var.dtype
+    return var.bins.constituents['data'].dtype if var.is_binned else var.dtype
 
 
 def float_dtype(var: VariableLike) -> sc.DType:

src/scippneutron/peaks/_fit_peaks.py

@@ -736,7 +736,7 @@ def _assert_data_is_supported(data: sc.DataArray) -> None:
         raise sc.DimensionError(
             f'`fit_peaks` requires 1d data, got {data.ndim} dimensions'
         )
-    if data.bins is not None:
+    if data.is_binned:
         raise sc.DTypeError('`fit_peaks` does not support binned data')
     if data.coords.is_edges(data.dim):
         raise sc.CoordError(