Merge pull request silx-kit#2381 from EdgarGF93/unitfiber_keycache

Use unit.name as key cache
t20100 · Jan 21, 2025 · 48cb3ca · 48cb3ca
2 parents 44bd521 + 6a6de8a
commit 48cb3ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/pyFAI/geometry/core.py b/src/pyFAI/geometry/core.py
@@ -920,8 +920,7 @@ def center_array(self, shape=None, unit="2th_deg", scale=True):
         """
 
         unit = to_unit(unit)
-        space = unit.name.split("_")[0]
-        key = space + "_center"
+        key = f"{unit.space}_center"
         ary = self._cached_array.get(key)
 
         shape = self.get_shape(shape)
@@ -966,7 +965,7 @@ def delta_array(self, shape=None, unit="2th_deg", scale=False):
         """
 
         unit = to_unit(unit)
-        space = unit.name.split("_")[0] + "_delta"
+        space = f"{unit.space}_delta"
         ary = self._cached_array.get(space)
 
         shape = self.get_shape(shape)

diff --git a/src/pyFAI/units.py b/src/pyFAI/units.py
@@ -95,7 +95,7 @@ def __init__(self, name, scale=1, label=None, equation=None, formula=None,
         :param period: None or the periodicity of the unit (angles are periodic)
         """
         self.name = name
-        self.space = name.split("_")[0]  # used to idenfify compatible spaces.
+        self.space = "_".join(self.name.split("_")[:-1])  # used to idenfify compatible spaces.
         self.scale = scale
         self.label = label if label is not None else name
         self.corner = corner