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

Utility renames

Browse Source
This commit is contained in:
usov_i 2021-01-05 17:44:43 +01:00
parent c5ec09a5e3
commit c2215e9b6d
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pyzebra/ccl_io.py
View File

@ -138,37 +138,37 @@ def parse_1D(fileobj, data_type):
ccl_second_line = CCL_SECOND_LINE ccl_second_line = CCL_SECOND_LINE
for line in fileobj: for line in fileobj:
d = {} s = {}
# first line # first line
for param, (param_name, param_type) in zip(line.split(), ccl_first_line): for param, (param_name, param_type) in zip(line.split(), ccl_first_line):
d[param_name] = param_type(param) s[param_name] = param_type(param)
# second line # second line
next_line = next(fileobj) next_line = next(fileobj)
for param, (param_name, param_type) in zip(next_line.split(), ccl_second_line): for param, (param_name, param_type) in zip(next_line.split(), ccl_second_line):
d[param_name] = param_type(param) s[param_name] = param_type(param)
d["om"] = np.linspace( s["om"] = np.linspace(
d["omega_angle"] - (d["n_points"] / 2) * d["angle_step"], s["omega_angle"] - (s["n_points"] / 2) * s["angle_step"],
d["omega_angle"] + (d["n_points"] / 2) * d["angle_step"], s["omega_angle"] + (s["n_points"] / 2) * s["angle_step"],
d["n_points"], s["n_points"],
) )
# subsequent lines with counts # subsequent lines with counts
counts = [] counts = []
while len(counts) < d["n_points"]: while len(counts) < s["n_points"]:
counts.extend(map(int, next(fileobj).split())) counts.extend(map(int, next(fileobj).split()))
d["Counts"] = counts s["Counts"] = counts
scan[d["scan_number"]] = d scan[s["scan_number"]] = s
elif data_type == ".dat": elif data_type == ".dat":
# skip the first 2 rows, the third row contans the column names # skip the first 2 rows, the third row contans the column names
next(fileobj) next(fileobj)
next(fileobj) next(fileobj)
col_names = next(fileobj).split() col_names = next(fileobj).split()
data_cols = defaultdict(list) s = defaultdict(list)
for line in fileobj: for line in fileobj:
if "END-OF-DATA" in line: if "END-OF-DATA" in line:
@ -176,33 +176,33 @@ def parse_1D(fileobj, data_type):
break break
for name, val in zip(col_names, line.split()): for name, val in zip(col_names, line.split()):
data_cols[name].append(float(val)) s[name].append(float(val))
try: try:
data_cols["h_index"] = float(metadata["title"].split()[-3]) s["h_index"] = float(metadata["title"].split()[-3])
data_cols["k_index"] = float(metadata["title"].split()[-2]) s["k_index"] = float(metadata["title"].split()[-2])
data_cols["l_index"] = float(metadata["title"].split()[-1]) s["l_index"] = float(metadata["title"].split()[-1])
except (ValueError, IndexError): except (ValueError, IndexError):
print("seems hkl is not in title") print("seems hkl is not in title")
data_cols["om"] = np.array(data_cols["om"]) s["om"] = np.array(s["om"])
data_cols["temperature"] = metadata["temp"] s["temperature"] = metadata["temp"]
try: try:
data_cols["mag_field"] = metadata["mf"] s["mag_field"] = metadata["mf"]
except KeyError: except KeyError:
print("Mag_field not present in dat file") print("Mag_field not present in dat file")
data_cols["omega_angle"] = metadata["omega"] s["omega_angle"] = metadata["omega"]
data_cols["n_points"] = len(data_cols["om"]) s["n_points"] = len(s["om"])
data_cols["monitor"] = data_cols["Monitor1"][0] s["monitor"] = s["Monitor1"][0]
data_cols["twotheta_angle"] = metadata["2-theta"] s["twotheta_angle"] = metadata["2-theta"]
data_cols["chi_angle"] = metadata["chi"] s["chi_angle"] = metadata["chi"]
data_cols["phi_angle"] = metadata["phi"] s["phi_angle"] = metadata["phi"]
data_cols["nu_angle"] = metadata["nu"] s["nu_angle"] = metadata["nu"]
data_cols["scan_number"] = 1 s["scan_number"] = 1
scan[data_cols["scan_number"]] = dict(data_cols) scan[s["scan_number"]] = dict(s)
else: else:
print("Unknown file extention") print("Unknown file extention")