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

Output center of the scan range

Browse Source
This commit is contained in:
usov_i 2021-02-12 17:12:19 +01:00
parent ac76d4b2c3
commit 82f3c53380
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pyzebra/ccl_io.py
View File

@ -182,10 +182,10 @@ def parse_1D(fileobj, data_type):
s = defaultdict(list) s = defaultdict(list)
match = re.search('Scanning Variables: (.*), Steps: (.*)', next(fileobj)) match = re.search("Scanning Variables: (.*), Steps: (.*)", next(fileobj))
s["variable_name"] = match.group(1) s["variable_name"] = match.group(1)
match = re.search('(.*) Points, Mode: (.*), Preset (.*)', next(fileobj)) match = re.search("(.*) Points, Mode: (.*), Preset (.*)", next(fileobj))
if match.group(2) != "Monitor": if match.group(2) != "Monitor":
raise Exception("Unknown mode in dat file.") raise Exception("Unknown mode in dat file.")
s["monitor"] = float(match.group(3)) s["monitor"] = float(match.group(3))
@ -274,8 +274,11 @@ def export_1D(data, path, area_method=AREA_METHODS[0], lorentz=False, hkl_precis
ang_str = "" ang_str = ""
for angle, _ in CCL_ANGLES[zebra_mode]: for angle, _ in CCL_ANGLES[zebra_mode]:
# TODO: output peak center in case of a scanning variable? if angle == scan["variable_name"]:
ang_str = ang_str + f"{np.mean(scan[angle]):8}" angle_center = (np.min(scan[angle]) + np.max(scan[angle])) / 2
else:
angle_center = scan[angle]
ang_str = ang_str + f"{angle_center:8}"
ref = file_content[".comm"] if hkl_are_integers else file_content[".incomm"] ref = file_content[".comm"] if hkl_are_integers else file_content[".incomm"]
ref.append(idx_str + hkl_str + area_str + ang_str + "\n") ref.append(idx_str + hkl_str + area_str + ang_str + "\n")