Merge branch 'maciej/qvector-npt-smearing' of https://github.com/ISIS…

…NeutronMuon/MDANSE into maciej/qvector-npt-smearing
ISISNeutronMuon · Feb 24, 2025 · 00d07de · 00d07de
2 parents 49e239e + 11da332
commit 00d07de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/MDANSE/Src/MDANSE/Framework/QVectors/SphericalLatticeQVectors.py b/MDANSE/Src/MDANSE/Framework/QVectors/SphericalLatticeQVectors.py
@@ -58,9 +58,7 @@ def _generate(self):
 
         hkl_vects = hkl_vects.reshape(
             3,
-            int(2 * hklMax[0, 0] + 1)
-            * int(2 * hklMax[1, 1] + 1)
-            * int(2 * hklMax[2, 2] + 1),
+            np.prod(2 * np.diag(hklMax) + 1, dtype=int),
         )
 
         vects = self.hkl_to_qvectors(hkl_vects, self._unit_cell)

diff --git a/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Models/PlottingContext.py b/MDANSE_GUI/Src/MDANSE_GUI/Tabs/Models/PlottingContext.py
@@ -94,8 +94,8 @@ def __init__(self, name: str, source: "h5py.File"):
         self._axes_units = {}
         if self._axes_tag == "index":
             for dim_number, dim_length in enumerate(self._data.shape):
-                self._axes["index" + str(dim_number)] = np.arange(dim_length)
-                self._axes_units["index" + str(dim_number)] = "N/A"
+                self._axes[f"index{dim_number}"] = np.arange(dim_length)
+                self._axes_units[f"index{dim_number}"] = "N/A"
             return
         for ax_number, axis_name in enumerate(self._axes_tag.split("|")):
             aname = axis_name.strip()