make ruff happy

Author: nvaytet

docs/user-guide/amor/amor-reduction.ipynb

@@ -25,7 +25,6 @@
    "outputs": [],
    "source": [
     "import scipp as sc\n",
-    "import sciline\n",
     "from ess import amor\n",
     "from ess.reflectometry.types import *\n",
     "from ess.amor.types import *"
@@ -354,8 +353,7 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "pygments_lexer": "ipython3"
   }
  },
  "nbformat": 4,

docs/user-guide/amor/compare-to-eos.ipynb

@@ -23,7 +23,6 @@
     "\n",
     "import scipp as sc\n",
     "import plopp as pp\n",
-    "import sciline\n",
     "from ess import amor\n",
     "from ess.reflectometry.types import *\n",
     "from ess.amor.types import ChopperPhase"
@@ -137,7 +136,7 @@
    "outputs": [],
    "source": [
     "# PSI results\n",
-    "for key, angle in mu.items():\n",
+    "for key in mu:\n",
     "    d = orsopy.fileio.load_orso(amor.data.amor_psi_software_result(key))[0].data\n",
     "    y = sc.array(dims=['Q'], values=d[:, 1], variances=d[:, 2] ** 2)\n",
     "    results['psi'][key] = sc.DataArray(\n",
@@ -162,7 +161,7 @@
    "source": [
     "fig, axs = plt.subplots(3, 2, figsize=(12, 12))\n",
     "\n",
-    "for ax, (key, angle) in zip(axs.ravel(), mu.items()):\n",
+    "for ax, (key, angle) in zip(axs.ravel(), mu.items(), strict=True):\n",
     "    pp.plot(\n",
     "        {\n",
     "            facility: results[facility][key][results[facility][key].data > 0.0]\n",
@@ -196,9 +195,9 @@
    "source": [
     "fig, axs = plt.subplots(1, 2, figsize=(12, 4))\n",
     "\n",
-    "for ax, (facility, res) in zip(axs.ravel(), results.items()):\n",
+    "for ax, (facility, res) in zip(axs.ravel(), results.items(), strict=True):\n",
     "    pp.plot(\n",
-    "        {k: v for k, v in list(res.items())[:4]},  # First 4 curves\n",
+    "        dict(list(res.items())[:4]),  # First 4 curves\n",
     "        ax=ax,\n",
     "        norm='log',\n",
     "        ls='solid',\n",

src/ess/amor/geometry.py

@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
-from typing import Tuple
-
 import scipp as sc
 
 
@@ -30,7 +28,7 @@ class Detector:
 
 def _pixel_coordinate_in_detector_system(
     pixelID: sc.Variable,
-) -> Tuple[sc.Variable, sc.Variable]:
+) -> tuple[sc.Variable, sc.Variable]:
     """Determines beam travel distance inside the detector
     and the beam divergence angle from the detector number."""
     (bladeNr, bPixel) = (
@@ -55,7 +53,7 @@ def _pixel_coordinate_in_detector_system(
 
 def pixel_coordinate_in_lab_frame(
     pixelID: sc.Variable, nu: sc.Variable
-) -> Tuple[sc.Variable, sc.Variable]:
+) -> tuple[sc.Variable, sc.Variable]:
     """Computes spatial coordinates (lab reference frame), and the beam divergence
     angle for the detector pixel associated with `pixelID`"""
     distance_in_detector, divergence_angle = _pixel_coordinate_in_detector_system(

src/ess/amor/orso.py

@@ -2,8 +2,6 @@
 # Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
 """ORSO utilities for Amor."""
 
-from typing import Optional
-
 import numpy as np
 import scipp as sc
 from orsopy.fileio import base as orso_base
@@ -81,9 +79,7 @@ def _extract_values_array(var: sc.Variable) -> np.ndarray:
     return var.values
 
 
-def _limits_of_coord(
-    data: sc.DataArray, name: str
-) -> Optional[tuple[float, float, str]]:
+def _limits_of_coord(data: sc.DataArray, name: str) -> tuple[float, float, str] | None:
     if (coord := _get_coord(data, name)) is None:
         return None
     min_ = coord.min().value
@@ -92,7 +88,7 @@ def _limits_of_coord(
     return float(min_), float(max_), _ascii_unit(coord.unit)
 
 
-def _get_coord(data: sc.DataArray, name: str) -> Optional[sc.Variable]:
+def _get_coord(data: sc.DataArray, name: str) -> sc.Variable | None:
     if name in data.coords:
         return sc.DataArray(data=data.coords[name], masks=data.masks)
     if (data.bins is not None) and (name in data.bins.coords):

src/ess/amor/resolution.py

@@ -145,9 +145,7 @@ def sigma_Q(
         Combined resolution function.
     """
     return sc.sqrt(
-        angular_resolution**2
-        + wavelength_resolution**2
-        + sample_size_resolution**2
+        angular_resolution**2 + wavelength_resolution**2 + sample_size_resolution**2
     ).flatten(to="detector_number").max("detector_number") * sc.midpoints(q_bins)
 
 

src/ess/amor/utils.py

@@ -1,5 +1,4 @@
 import scipp as sc
-
 from ess.reflectometry.types import (
     DetectorRotation,
     NormalizedIofQ,

src/ess/reflectometry/conversions.py

@@ -130,7 +130,7 @@ def add_coords(
     da = da.transform_coords(["theta", "wavelength", "Q"], graph=graph)
     da.coords["z_index"] = sc.arange(
         "row", 0, da.sizes["blade"] * da.sizes["wire"], unit=None
-    ).fold("row", sizes=dict(blade=da.sizes["blade"], wire=da.sizes["wire"]))
+    ).fold("row", sizes={dim: da.sizes[dim] for dim in ("blade", "wire")})
     da.coords["y_index"] = sc.arange("stripe", 0, da.sizes["stripe"], unit=None)
     return da
 

src/ess/reflectometry/load.py

@@ -1,4 +1,5 @@
-from typing import Type, Union
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
 
 import sciline
 import scipp as sc
@@ -7,7 +8,7 @@
 from .types import IdealReferenceIntensity, ReferenceFilePath
 
 
-def load_nx(group: Union[snx.Group, str], *paths: str):
+def load_nx(group: snx.Group | str, *paths: str):
     if isinstance(group, str):
         with snx.File(group) as group:
             yield from load_nx(group, *paths)
@@ -26,7 +27,7 @@ def load_nx(group: Union[snx.Group, str], *paths: str):
 # Remove when this function is exposed in essreduce
 def _unique_child_group(
     group: snx.Group,
-    nx_class: Type[snx.NXobject],
+    nx_class: type[snx.NXobject],
 ) -> snx.Group:
     children = group[nx_class]
     if len(children) == 0: