Update load_1D.py

This commit is contained in:
JakHolzer 2020-09-11 13:52:58 +02:00 committed by Ivan Usov
parent 74151dd667
commit 3fd7b59328

View File

@ -1,5 +1,6 @@
import re import re
import numpy as np import numpy as np
from decimal import Decimal
META_VARS_STR = ( META_VARS_STR = (
"instrument", "instrument",
@ -81,6 +82,7 @@ def load_1D(filepath):
elif "#data" in line: elif "#data" in line:
if det_variables["file_type"] == "ccl": if det_variables["file_type"] == "ccl":
decimal = list()
data = infile.readlines() data = infile.readlines()
position = -1 position = -1
for lines in data: for lines in data:
@ -95,8 +97,11 @@ def load_1D(filepath):
measurement_number = int(lines.split()[0]) measurement_number = int(lines.split()[0])
d = {} d = {}
d["h_index"] = float(lines.split()[1]) d["h_index"] = float(lines.split()[1])
decimal.append(bool(Decimal(d["h_index"]) % 1 == 0))
d["k_index"] = float(lines.split()[2]) d["k_index"] = float(lines.split()[2])
decimal.append(bool(Decimal(d["k_index"]) % 1 == 0))
d["l_index"] = float(lines.split()[3]) d["l_index"] = float(lines.split()[3])
decimal.append(bool(Decimal(d["l_index"]) % 1 == 0))
if det_variables["meta"]["zebra_mode"] == "bi": if det_variables["meta"]["zebra_mode"] == "bi":
d["twotheta_angle"] = float(lines.split()[4]) # gamma d["twotheta_angle"] = float(lines.split()[4]) # gamma
d["omega_angle"] = float(lines.split()[5]) # omega d["omega_angle"] = float(lines.split()[5]) # omega
@ -157,5 +162,9 @@ def load_1D(filepath):
det_variables["Measurements"]["time"] = time det_variables["Measurements"]["time"] = time
else: else:
print("Unknown file extention") print("Unknown file extention")
if all(decimal):
det_variables["meta"]["indices"] = "hkl"
else:
det_variables["meta"]["indices"] = "real"
return det_variables return det_variables