Use new dim arg of scipp.bin

src/ess/reflectometry/corrections.py

@@ -57,7 +57,7 @@ def compute_reference_intensity(
  with the experiment parameters (such as sample rotation).
  Therefore it can be used to normalize sample measurements.
  """
- b = da.bins.concat(set(da.dims) - set(da.coords["z_index"].dims)).bin(wavelength=wb)
+ b = da.bin(wavelength=wb, dim=set(da.dims) - set(da.coords["z_index"].dims))
  h = b.hist()
  h.masks["too_few_events"] = h.data < sc.scalar(1, unit="counts")
  # Add a Q coordinate to each bin, the Q is not completely unique in every bin,

src/ess/reflectometry/normalize.py

@@ -43,8 +43,7 @@ def normalization_factor(
 
  """
  sample_q = (
- da.bins.concat(set(da.dims) - set(da.coords["z_index"].dims))
- .bin(wavelength=wbins)
+ da.bin(wavelength=wbins, dim=set(da.dims) - set(da.coords["z_index"].dims))
  .bins.coords["Q"]
  .bins.mean()
  )
@@ -112,7 +111,7 @@ def reflectivity_over_q(
  Reflectivity as a function of Q
  """
  return NormalizedIofQ(
- da.bins.concat().bin(Q=qbins) / sc.values(n.flatten(to="Q").hist(Q=qbins))
+ da.bin(Q=qbins, dim=da.dims) / sc.values(n.hist(Q=qbins, dim=n.dims))
  )