From a988e6b5f14745c6a406195bd6f016dc4b02c53d Mon Sep 17 00:00:00 2001 From: rettigl Date: Sun, 9 Feb 2025 22:32:59 +0100 Subject: [PATCH 1/2] disable propagation of base_logger if logfile cannot be opened --- src/specsanalyzer/logging.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/specsanalyzer/logging.py b/src/specsanalyzer/logging.py index 3698340..d6915d1 100644 --- 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) From 4efb02dc2e0679d4a15b49938fbc92ba700545ad Mon Sep 17 00:00:00 2001 From: rettigl Date: Mon, 10 Feb 2025 23:44:48 +0100 Subject: [PATCH 2/2] fix beam status --- src/specsscan/metadata.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/specsscan/metadata.py b/src/specsscan/metadata.py index e2c1776..6b45809 100644 --- 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", {}):