From 8129b5e6835c20fb3c1f5bc6e93249c8197a76d1 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Fri, 1 Oct 2021 15:44:22 +0200 Subject: [PATCH] Fix scan_motors renaming --- pyzebra/ccl_io.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pyzebra/ccl_io.py b/pyzebra/ccl_io.py index 255d843..3880570 100644 --- a/pyzebra/ccl_io.py +++ b/pyzebra/ccl_io.py @@ -214,27 +214,24 @@ def parse_1D(fileobj, data_type): s[motor] = np.median(s[motor]) else: s["scan_motors"].append(motor) - s["scan_motor"] = s["scan_motors"][0] # "om" -> "omega" if "om" in s["scan_motors"]: s["scan_motors"][s["scan_motors"].index("om")] = "omega" - if s["scan_motor"] == "om": - s["scan_motor"] = "omega" s["omega"] = s["om"] del s["om"] # "tt" -> "temp" - elif "tt" in s["scan_motors"]: + if "tt" in s["scan_motors"]: s["scan_motors"][s["scan_motors"].index("tt")] = "temp" - if s["scan_motor"] == "tt": - s["scan_motor"] = "temp" s["temp"] = s["tt"] del s["tt"] # "mf" stays "mf" # "phi" stays "phi" + s["scan_motor"] = s["scan_motors"][0] + if "h" not in s: s["h"] = s["k"] = s["l"] = float("nan")