esbo_ds/ESBO-ETC
esbo_ds/ESBO-ETC
11
0
Fork 1
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Bugfix: treat dimensionless units

Browse Source
This commit is contained in:
Lukas Klass 2020-06-26 16:04:32 +02:00
parent d70ef88643
commit 095c0cc0da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esbo_etc/lib/helpers.py
View File

@ -95,10 +95,10 @@ def readCSV(file: str, units: list = None, format_: str = None) -> Table:
for i in range(len(data.columns)): for i in range(len(data.columns)):
data[data.colnames[i]] = list(map(float, data[data.colnames[i]])) data[data.colnames[i]] = list(map(float, data[data.colnames[i]]))
# Check if units are given in column headers # Check if units are given in column headers
if all([re.search("\\[.+\\]", x) for x in data.colnames]): if all([re.search("\\[.*\\]", x) for x in data.colnames]):
# Extract units from headers and apply them on the columns # Extract units from headers and apply them on the columns
# noinspection PyArgumentList # noinspection PyArgumentList
units_header = [u.Unit(re.findall("(?<=\\[).+(?=\\])", x)[0]) for x in data.colnames] units_header = [u.Unit(re.findall("(?<=\\[).*(?=\\])", x)[0]) for x in data.colnames]
for i in range(len(data.columns)): for i in range(len(data.columns)):
data[data.colnames[i]].unit = units_header[i] data[data.colnames[i]].unit = units_header[i]
if units is not None and len(units) == len(data.columns): if units is not None and len(units) == len(data.columns):