Merge remote-tracking branch 'origin/elab_metadata_integration' into …

…develop
OpenCOMPES · Feb 10, 2025 · 166c297 · 166c297
2 parents 9d7bf93 + 4efb02d
commit 166c297
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/specsanalyzer/logging.py b/src/specsanalyzer/logging.py
@@ -70,6 +70,7 @@ def setup_logging(
         except PermissionError:
             logging.warning(f"Cannot create logfile in Folder {user_log_path}, disabling logfile.")
             base_logger.addHandler(logging.NullHandler())
+            base_logger.propagate = False
 
     # create named logger
     logger = base_logger.getChild(name)

diff --git a/src/specsscan/metadata.py b/src/specsscan/metadata.py
@@ -286,6 +286,22 @@ def fetch_elab_metadata(self, scan: int, metadata: dict) -> dict:
             elif metadata["elabFTW"]["scan"]["pump2_polarization"] == "p":
                 metadata["elabFTW"]["scan"]["pump2_polarization"] = 0
 
+        # fix pump status
+        if "scan" in metadata["elabFTW"] and "pump_status" in metadata["elabFTW"]["scan"]:
+            try:
+                metadata["elabFTW"]["scan"]["pump_status"] = (
+                    "opened" if int(metadata["elabFTW"]["scan"]["pump_status"]) else "closed"
+                )
+            except ValueError:
+                pass
+        if "scan" in metadata["elabFTW"] and "pump2_status" in metadata["elabFTW"]["scan"]:
+            try:
+                metadata["elabFTW"]["scan"]["pump2_status"] = (
+                    "opened" if int(metadata["elabFTW"]["scan"]["pump2_status"]) else "closed"
+                )
+            except ValueError:
+                pass
+
         # remove pump information if pump not applied:
         if metadata["elabFTW"]["scan"].get("pump_status", "closed") == "closed":
             if "pump_photon_energy" in metadata["elabFTW"].get("laser_status", {}):