zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify hkl type handling

Browse Source
This commit is contained in:
usov_i 2021-02-09 16:26:52 +01:00
parent 97936d6c2a
commit 8eee968344
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyzebra/ccl_io.py
View File

@ -198,9 +198,6 @@ def parse_1D(fileobj, data_type):
for s in scan: for s in scan:
if s["h"].is_integer() and s["k"].is_integer() and s["l"].is_integer(): if s["h"].is_integer() and s["k"].is_integer() and s["l"].is_integer():
s["h"], s["k"], s["l"] = map(int, (s["h"], s["k"], s["l"])) s["h"], s["k"], s["l"] = map(int, (s["h"], s["k"], s["l"]))
s["indices"] = "hkl"
else:
s["indices"] = "real"
return scan return scan
@ -221,9 +218,10 @@ def export_1D(data, path, area_method=AREA_METHODS[0], lorentz=False, hkl_precis
idx_str = f"{scan['idx']:6}" idx_str = f"{scan['idx']:6}"
h, k, l = scan["h"], scan["k"], scan["l"] h, k, l = scan["h"], scan["k"], scan["l"]
if scan["indices"] == "hkl": hkl_are_integers = isinstance(h, int) # if True, other indices are of type 'int' too
if hkl_are_integers:
hkl_str = f"{h:6}{k:6}{l:6}" hkl_str = f"{h:6}{k:6}{l:6}"
else: # scan["indices"] == "real" else:
hkl_str = f"{h:8.{hkl_precision}f}{k:8.{hkl_precision}f}{l:8.{hkl_precision}f}" hkl_str = f"{h:8.{hkl_precision}f}{k:8.{hkl_precision}f}{l:8.{hkl_precision}f}"
area_n = scan["fit"][area_method].n area_n = scan["fit"][area_method].n
@ -248,7 +246,7 @@ def export_1D(data, path, area_method=AREA_METHODS[0], lorentz=False, hkl_precis
for angle, _ in CCL_ANGLES[zebra_mode]: for angle, _ in CCL_ANGLES[zebra_mode]:
ang_str = ang_str + f"{scan[angle]:8}" ang_str = ang_str + f"{scan[angle]:8}"
ref = file_content[".comm"] if scan["indices"] == "hkl" else file_content[".incomm"] ref = file_content[".comm"] if hkl_are_integers else file_content[".incomm"]
ref.append(idx_str + hkl_str + area_str + ang_str + "\n") ref.append(idx_str + hkl_str + area_str + ang_str + "\n")
for ext, content in file_content.items(): for ext, content in file_content.items():