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

Update comm_export.py

Browse Source 
Added the fit value/ num integrated value choice
This commit is contained in:
JakHolzer 2020-09-21 11:26:47 +02:00 committed by GitHub
parent bcb4ef9849
commit 4c0b195b7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pyzebra/comm_export.py
View File

@ -30,35 +30,32 @@ def export_comm(data, path, lorentz=False):
padding = [4, 6, 10, 8] padding = [4, 6, 10, 8]
with open(str(path + extension), "w") as out_file: with open(str(path + extension), "w") as out_file:
for meas_num, meas in data["Measurements"].items(): for keys in data["Measurements"]:
print(meas_num) try:
if meas.get("fit") is None: meas_number_str = f"{keys[1:]:{align}{padding[0]}}"
print("Measurement skipped - no fit value for:", meas_num) h_str = f'{int(data["Measurements"][str(keys)]["h_index"]):{padding[1]}}'
continue k_str = f'{int(data["Measurements"][str(keys)]["k_index"]):{padding[1]}}'
l_str = f'{int(data["Measurements"][str(keys)]["l_index"]):{padding[1]}}'
meas_number_str = f"{meas_num[1:]:{align}{padding[0]}}" if data["Measurements"][str(keys)]["fit"]["export_fit"] is True:
h_str = f'{int(meas["h_index"]):{padding[1]}}' area = float(data["Measurements"][str(keys)]["fit"]["g_amp"].value)
k_str = f'{int(meas["k_index"]):{padding[1]}}' sigma_str = f'{"{:8.2f}".format(float(data["Measurements"][str(keys)]["fit"]["g_amp"].stderr)):{align}{padding[2]}}'
l_str = f'{int(meas["l_index"]):{padding[1]}}'
if meas["fit"]["export_fit"] is True:
area = float(meas["fit"]["g_amp"][0]) + float(meas["fit"]["l_amp"][0])
else: else:
area = float(meas["fit"]["int_area"]) - float(meas["fit"]["int_background"][0]) area = float(data["Measurements"][str(keys)]["fit"]["int_area"].n)
sigma_str = f'{"{:8.2f}".format(float(data["Measurements"][str(keys)]["fit"]["int_area"].s)):{align}{padding[2]}}'
if data["meta"]["zebra_mode"] == "bi": if data["meta"]["zebra_mode"] == "bi":
int_str = f'{"{:8.2f}".format(correction(area, lorentz, data["meta"]["zebra_mode"], meas["twotheta_angle"])):{align}{padding[2]}}' int_str = f'{"{:8.2f}".format(correction(area, lorentz, data["meta"]["zebra_mode"], data["Measurements"][str(keys)]["twotheta_angle"])):{align}{padding[2]}}'
angle_str1 = f'{meas["twotheta_angle"]:{padding[3]}}' angle_str1 = f'{data["Measurements"][str(keys)]["twotheta_angle"]:{padding[3]}}'
angle_str2 = f'{meas["omega_angle"]:{padding[3]}}' angle_str2 = f'{data["Measurements"][str(keys)]["omega_angle"]:{padding[3]}}'
angle_str3 = f'{meas["chi_angle"]:{padding[3]}}' angle_str3 = f'{data["Measurements"][str(keys)]["chi_angle"]:{padding[3]}}'
angle_str4 = f'{meas["phi_angle"]:{padding[3]}}' angle_str4 = f'{data["Measurements"][str(keys)]["phi_angle"]:{padding[3]}}'
elif data["meta"]["zebra_mode"] == "nb": elif data["meta"]["zebra_mode"] == "nb":
int_str = f'{"{:8.2f}".format(correction(area, lorentz, data["meta"]["zebra_mode"], meas["gamma_angle"],meas["nu_angle"])):{align}{padding[2]}}' int_str = f'{"{:8.2f}".format(correction(area, lorentz, data["meta"]["zebra_mode"], data["Measurements"][str(keys)]["gamma_angle"],data["Measurements"][str(keys)]["nu_angle"])):{align}{padding[2]}}'
angle_str1 = f'{meas["gamma_angle"]:{padding[3]}}' angle_str1 = f'{data["Measurements"][str(keys)]["gamma_angle"]:{padding[3]}}'
angle_str2 = f'{meas["omega_angle"]:{padding[3]}}' angle_str2 = f'{data["Measurements"][str(keys)]["omega_angle"]:{padding[3]}}'
angle_str3 = f'{meas["nu_angle"]:{padding[3]}}' angle_str3 = f'{data["Measurements"][str(keys)]["nu_angle"]:{padding[3]}}'
angle_str4 = f'{meas["unkwn_angle"]:{padding[3]}}' angle_str4 = f'{data["Measurements"][str(keys)]["unkwn_angle"]:{padding[3]}}'
sigma_str = f'{"{:8.2f}".format(float(meas["fit"]["g_width"][0])):{align}{padding[2]}}'
line = ( line = (
meas_number_str meas_number_str
+ h_str + h_str
@ -73,3 +70,6 @@ def export_comm(data, path, lorentz=False):
+ "\n" + "\n"
) )
out_file.write(line) out_file.write(line)
except KeyError:
print("Measurement skipped - no fit value for:", keys)