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

Correctly strip lines in read_cfl_file

Browse Source
This commit is contained in:
usov_i 2022-04-12 19:45:45 +02:00
parent 8d4f4a9b50
commit 6f1fe1a3d8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyzebra/sxtal_refgen.py
View File

@ -170,6 +170,7 @@ def read_cfl_file(fileobj):
params = {"SPGR": None, "CELL": None, "WAVE": None, "UBMAT": None, "HLIM": None, "SRANG": None} params = {"SPGR": None, "CELL": None, "WAVE": None, "UBMAT": None, "HLIM": None, "SRANG": None}
param_names = tuple(params) param_names = tuple(params)
for line in fileobj: for line in fileobj:
line = line.strip()
if "!" in line: # remove comments that start with ! sign if "!" in line: # remove comments that start with ! sign
line, _ = line.split(sep="!", maxsplit=1) line, _ = line.split(sep="!", maxsplit=1)
@ -177,7 +178,7 @@ def read_cfl_file(fileobj):
if line.startswith("UBMAT"): # next 3 lines contain the matrix if line.startswith("UBMAT"): # next 3 lines contain the matrix
param, val = "UBMAT", [] param, val = "UBMAT", []
for _ in range(3): for _ in range(3):
next_line = next(fileobj) next_line = next(fileobj).strip()
val.extend(next_line.split(maxsplit=2)) val.extend(next_line.split(maxsplit=2))
else: else:
param, val = line.split(maxsplit=1) param, val = line.split(maxsplit=1)