From 7fd0f683201410473e81429841440e4da335bd16 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Thu, 23 Jan 2025 12:37:02 +0100 Subject: [PATCH 1/2] use `unit.space` in diffmap.py --- src/pyFAI/diffmap.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pyFAI/diffmap.py b/src/pyFAI/diffmap.py index ab2487ed8..78f40fa6d 100644 --- a/src/pyFAI/diffmap.py +++ b/src/pyFAI/diffmap.py @@ -456,7 +456,7 @@ def makeHDF5(self, rewrite=False): maxshape=(None, None, self.nbpt_azim, self.nbpt_rad), fillvalue=numpy.nan) self.dataset.attrs["interpretation"] = "image" - self.nxdata_grp.attrs["axes"] = [self.slow_motor_name, self.fast_motor_name, "azimuthal", str(self.unit).split("_")[0]] + self.nxdata_grp.attrs["axes"] = [self.slow_motor_name, self.fast_motor_name, "azimuthal", self.unit.space] # Build a transposed view to display the mapping experiment layout = h5py.VirtualLayout(shape=(self.nbpt_azim, self.nbpt_rad, self.nbpt_slow, self.nbpt_fast), dtype=self.dataset.dtype) source = h5py.VirtualSource(self.dataset) @@ -475,7 +475,7 @@ def makeHDF5(self, rewrite=False): maxshape=(None, None, self.nbpt_rad), fillvalue=numpy.nan) self.dataset.attrs["interpretation"] = "spectrum" - self.nxdata_grp.attrs["axes"] = [self.slow_motor_name, self.fast_motor_name, str(self.unit).split("_")[0]] + self.nxdata_grp.attrs["axes"] = [self.slow_motor_name, self.fast_motor_name, self.unit.space] # Build a transposed view to display the mapping experiment layout = h5py.VirtualLayout(shape=(self.nbpt_rad, self.nbpt_slow, self.nbpt_fast), dtype=self.dataset.dtype) source = h5py.VirtualSource(self.dataset) @@ -531,7 +531,8 @@ def init_ai(self): chunks=(1,) + self.dataset.shape[1:], maxshape=(None,) + self.dataset.shape[1:]) self.dataset_error.attrs["interpretation"] = "image" if self.dataset.ndim == 4 else "spectrum" - space, unit = str(self.unit).split("_") + space = self.unit.space + unit = str(self.unit)[len(space)+1:] if space not in self.nxdata_grp: self.nxdata_grp[space] = tth self.nxdata_grp[space].attrs["axes"] = 3 From e5e36199694599a249591d284b43d8623af5e213 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:38:40 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pyFAI/diffmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyFAI/diffmap.py b/src/pyFAI/diffmap.py index 78f40fa6d..9c7edab62 100644 --- a/src/pyFAI/diffmap.py +++ b/src/pyFAI/diffmap.py @@ -532,7 +532,7 @@ def init_ai(self): maxshape=(None,) + self.dataset.shape[1:]) self.dataset_error.attrs["interpretation"] = "image" if self.dataset.ndim == 4 else "spectrum" space = self.unit.space - unit = str(self.unit)[len(space)+1:] + unit = str(self.unit)[len(space)+1:] if space not in self.nxdata_grp: self.nxdata_grp[space] = tth self.nxdata_grp[space].attrs["axes"] = 3