Merge pull request #486 from OpenCOMPES/pynxtools-update

Pynxtools update
OpenCOMPES · Aug 19, 2024 · fa22a56 · fa22a56
2 parents 4eac5b7 + 11fec94
commit fa22a56
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 168 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,8 +27,8 @@ numba = ">=0.55.1"
 numpy = ">=1.18"
 pandas = ">=1.4.1"
 psutil = ">=5.9.0"
-pynxtools-mpes = ">=0.1.1"
-pynxtools = ">=0.5.1"
+pynxtools-mpes = "^0.2.0"
+pynxtools = "^0.6.0"
 pyyaml = ">=6.0.0"
 scipy = ">=1.8.0"
 symmetrize = ">=0.5.5"

diff --git a/sed/calibrator/energy.py b/sed/calibrator/energy.py
@@ -953,9 +953,11 @@ def gather_calibration_metadata(self, calibration: dict = None) -> dict:
         metadata["applied"] = True
         metadata["calibration"] = deepcopy(calibration)
         metadata["tof"] = deepcopy(self.tof)
+        if metadata["tof"] is None:
+            metadata["tof"] = 0.0
         # create empty calibrated axis entry, if it is not present.
         if "axis" not in metadata["calibration"]:
-            metadata["calibration"]["axis"] = 0
+            metadata["calibration"]["axis"] = 0.0
 
         return metadata