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

Temporary resolve issues with new format metadata

Browse Source
This commit is contained in:
usov_i
2022-05-06 15:54:12 +02:00
parent 7075e0f42b
commit 6f83292d69
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pyzebra/ccl_io.py
View File

@@ -109,24 +109,29 @@ def parse_1D(fileobj, data_type):
variable = variable.strip() variable = variable.strip()
value = value.strip() value = value.strip()
if variable in META_VARS_STR: try:
metadata[variable] = value if variable in META_VARS_STR:
metadata[variable] = value
elif variable in META_VARS_FLOAT: elif variable in META_VARS_FLOAT:
if variable == "2-theta": # fix that angle name not to be an expression if variable == "2-theta": # fix that angle name not to be an expression
variable = "twotheta" variable = "twotheta"
if variable in ("a", "b", "c", "alpha", "beta", "gamma"): if variable in ("a", "b", "c", "alpha", "beta", "gamma"):
variable += "_cell" variable += "_cell"
metadata[variable] = float(value) metadata[variable] = float(value)
elif variable in META_UB_MATRIX: elif variable in META_UB_MATRIX:
if variable == "UB": if variable == "UB":
metadata["ub"] = np.array(literal_eval(value)).reshape(3, 3) metadata["ub"] = np.array(literal_eval(value)).reshape(3, 3)
else: else:
if "ub" not in metadata: if "ub" not in metadata:
metadata["ub"] = np.zeros((3, 3)) metadata["ub"] = np.zeros((3, 3))
row = int(variable[-2]) - 1 row = int(variable[-2]) - 1
metadata["ub"][row, :] = list(map(float, value.split())) metadata["ub"][row, :] = list(map(float, value.split()))
except Exception:
print(f"Error reading {variable} with value '{value}'")
metadata[variable] = 0
if "#data" in line: if "#data" in line:
# this is the end of metadata and the start of data section # this is the end of metadata and the start of data section