Updated load_1D.py #63

Merged
usov_i merged 5 commits from JakHolzer-edited-load_1D-vol2 into det1d 2020-09-15 14:25:25 +02:00
Showing only changes of commit 0e12f8f185 - Show all commits

View File

@ -72,19 +72,12 @@ def load_1D(filepath):
if "=" in line: if "=" in line:
variable, value = line.split("=") variable, value = line.split("=")
variable = variable.strip() variable = variable.strip()
try: if variable in META_VARS_FLOAT:
if variable in META_VARS_FLOAT: det_variables["meta"][variable] = float(value)
det_variables["meta"][variable] = float(value) elif variable in META_VARS_STR:
elif variable in META_VARS_STR: det_variables["meta"][variable] = str(value)[:-1].strip()
det_variables["meta"][variable] = str(value)[:-1].strip() elif variable in META_UB_MATRIX:
elif variable in META_UB_MATRIX: det_variables["meta"][variable] = re.findall(r"[-+]?\d*\.\d+|\d+", str(value))
det_variables["meta"][variable] = re.findall(
r"[-+]?\d*\.\d+|\d+", str(value)
)
except ValueError as error:
print(
"Some values are not in expected format (str or float), error:", str(error)
)
elif "#data" in line: elif "#data" in line:
if det_variables["file_type"] == "ccl": if det_variables["file_type"] == "ccl":