Check for "fit" key instead of handling KeyError

This commit is contained in:
usov_i 2020-09-25 10:35:20 +02:00
parent a502248891
commit f79b4cbeee

View File

@ -31,14 +31,19 @@ def export_comm(data, path, lorentz=False):
with open(str(path + extension), "w") as out_file: with open(str(path + extension), "w") as out_file:
for keys, meas in data["Measurements"].items(): for keys, meas in data["Measurements"].items():
try: if "fit" not in meas:
print("Measurement skipped - no fit value for:", keys)
continue
meas_number_str = f"{keys[1:]:{align}{padding[0]}}" meas_number_str = f"{keys[1:]:{align}{padding[0]}}"
h_str = f'{int(meas["h_index"]):{padding[1]}}' h_str = f'{int(meas["h_index"]):{padding[1]}}'
k_str = f'{int(meas["k_index"]):{padding[1]}}' k_str = f'{int(meas["k_index"]):{padding[1]}}'
l_str = f'{int(meas["l_index"]):{padding[1]}}' l_str = f'{int(meas["l_index"]):{padding[1]}}'
if meas["fit"]["export_fit"] is True: if meas["fit"]["export_fit"] is True:
area = float(meas["fit"]["g_amp"].value) area = float(meas["fit"]["g_amp"].value)
sigma_str = f'{"{:8.2f}".format(float(meas["fit"]["g_amp"].stderr)):{align}{padding[2]}}' sigma_str = (
f'{"{:8.2f}".format(float(meas["fit"]["g_amp"].stderr)):{align}{padding[2]}}'
)
else: else:
area = float(meas["fit"]["int_area"].n) area = float(meas["fit"]["int_area"].n)
sigma_str = ( sigma_str = (
@ -74,6 +79,3 @@ 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)