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

Reapply changes

Browse Source
This commit is contained in:
usov_i 2020-10-22 10:36:04 +02:00
parent db785380ba
commit 784058b54e
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pyzebra/load_1D.py
View File

@ -192,20 +192,23 @@ def parse_1D(fileobj, data_type):
for name, val in zip(col_names, line.split()): for name, val in zip(col_names, line.split()):
data_cols[name].append(float(val)) data_cols[name].append(float(val))
data_cols['h_index'] = float(metadata['title'].split()[-3]) try:
data_cols['k_index'] = float(metadata['title'].split()[-2]) data_cols["h_index"] = float(metadata["title"].split()[-3])
data_cols['l_index'] = float(metadata['title'].split()[-1]) data_cols["k_index"] = float(metadata["title"].split()[-2])
data_cols['temperature'] = metadata['temp'] data_cols["l_index"] = float(metadata["title"].split()[-1])
data_cols['mag_field'] = metadata['mf'] except (ValueError, IndexError):
data_cols['omega_angle'] = metadata['omega'] print("seems hkl is not in title")
data_cols['number_of_measurements'] = len(data_cols['om'])
data_cols['monitor'] = data_cols['Monitor1'][0] data_cols["temperature"] = metadata["temp"]
data_cols["mag_field"] = metadata["mf"]
data_cols["omega_angle"] = metadata["omega"]
data_cols["number_of_measurements"] = len(data_cols["om"])
data_cols["monitor"] = data_cols["Monitor1"][0]
data_cols["twotheta_angle"] = metadata["2-theta"]
data_cols["chi_angle"] = metadata["chi"]
data_cols["phi_angle"] = metadata["phi"]
data_cols["nu_angle"] = metadata["nu"]
# add angles to scan from meta
data_cols["twotheta_angle"] = metadata['2-theta']
data_cols["chi_angle"] = metadata['chi']
data_cols["phi_angle"] = metadata['phi']
data_cols["nu_angle"] = metadata['nu']
measurements[1] = dict(data_cols) measurements[1] = dict(data_cols)
else: else: