Merge remote-tracking branch 'origin/main' into v1_feature_branch

OpenCOMPES · Sep 19, 2024 · 83fe946 · 83fe946
2 parents 60e43e7 + d039094
commit 83fe946
Show file tree

Hide file tree

Showing 6 changed files with 799 additions and 834 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ name = "sed-processor"
 packages = [
     {include = "sed"}
 ]
-version = "0.1.10a9"
+version = "0.2.1a0"
 description = "Single Event Data Frame Processor: Backend to handle photoelectron resolved datastreams"
 authors = ["OpenCOMPES team <[email protected]>"]
 readme = "README.md"
@@ -27,8 +27,8 @@ numba = ">=0.55.1"
 numpy = ">=1.18, <2.0"
 pandas = ">=1.4.1"
 psutil = ">=5.9.0"
-pynxtools-mpes = "^0.1.1"
-pynxtools = "^0.5.1"
+pynxtools-mpes = "^0.2.0"
+pynxtools = "^0.7.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
@@ -959,9 +959,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