From 3b337749b7edd07a75fa710a2945edbd068cd05b Mon Sep 17 00:00:00 2001 From: LukasK13 Date: Mon, 8 Jun 2020 11:35:48 +0200 Subject: [PATCH] Try to convert the units to the default unit --- esbo_etc/lib/helpers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/esbo_etc/lib/helpers.py b/esbo_etc/lib/helpers.py index 74aef13..2d3d302 100644 --- a/esbo_etc/lib/helpers.py +++ b/esbo_etc/lib/helpers.py @@ -98,9 +98,12 @@ def readCSV(file: str, units: list = None, format_: str = None) -> Table: if all([re.search("\\[.+\\]", x) for x in data.colnames]): # Extract units from headers and apply them on the columns # noinspection PyArgumentList - units = [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)): - data[data.colnames[i]].unit = units[i] + data[data.colnames[i]].unit = units_header[i] + if units is not None and len(units) == len(data.columns): + for i in range(len(data.columns)): + data[data.colnames[i]] = data[data.colnames[i]].to(units[i]) # Use default units elif units is not None and len(units) == len(data.columns): for i in range(len(data.columns)):