From 463d795e1dcb3b95835fb46b8e3f43182a5bfe38 Mon Sep 17 00:00:00 2001 From: Daniel Heinesen Date: Mon, 16 Sep 2024 15:12:01 +0200 Subject: [PATCH] Removes unit changer. Renames datafile --- .../eeareader/EEATimeseriesReader.py | 28 ++++++++----------- src/pyaro_readers/eeareader/data.toml | 2 -- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/pyaro_readers/eeareader/EEATimeseriesReader.py b/src/pyaro_readers/eeareader/EEATimeseriesReader.py index df6a62e..3d86883 100644 --- a/src/pyaro_readers/eeareader/EEATimeseriesReader.py +++ b/src/pyaro_readers/eeareader/EEATimeseriesReader.py @@ -11,8 +11,6 @@ from pyaro.timeseries import ( AutoFilterReaderEngine, Data, - Filter, - Flag, NpStructuredData, Station, ) @@ -78,7 +76,7 @@ def __init__( self._set_filters(filters) self.metadata = self._read_metadata(filename) - self.datafile = self._read_cfg() + self.data_cfg = self._read_cfg() self._read_polars(filters, filename) @@ -174,19 +172,16 @@ def _read_polars(self, filters, filename) -> None: continue file_unit = self._convert_unit(df.row(0)[df.get_column_index("Unit")]) - if s in self.datafile["changeunit"]: - file_unit = self.datafile["changeunit"][s]["unit"] - df.with_columns((polars.col(PARQUET_FIELDS["values"]) * self.datafile["changeunit"][s]["factor"]).alias(PARQUET_FIELDS["values"])) for key in PARQUET_FIELDS: - array[key][ - current_idx : current_idx + file_datapoints - ] = df.get_column(PARQUET_FIELDS[key]).to_numpy() + array[key][current_idx : current_idx + file_datapoints] = ( + df.get_column(PARQUET_FIELDS[key]).to_numpy() + ) for key, value in METADATA_FILEDS.items(): - array[key][ - current_idx : current_idx + file_datapoints - ] = station_metadata[value] + array[key][current_idx : current_idx + file_datapoints] = ( + station_metadata[value] + ) current_idx += file_datapoints @@ -257,15 +252,14 @@ def _read_metadata(self, folder: str) -> dict: } return metadata - + def _read_cfg(self) -> dict: with open(DATA_TOML, "rb") as f: - data = tomllib.load(f) - return data + cfg = tomllib.load(f) + return cfg def _convert_unit(self, unit: str) -> str: - return self.datafile["units"][unit] - + return self.data_cfg["units"][unit] def _unfiltered_data(self, varname) -> Data: return self._data[varname] diff --git a/src/pyaro_readers/eeareader/data.toml b/src/pyaro_readers/eeareader/data.toml index 89164f2..d4aed9e 100644 --- a/src/pyaro_readers/eeareader/data.toml +++ b/src/pyaro_readers/eeareader/data.toml @@ -62,8 +62,6 @@ "ugso2.m-3" = "µg SO2/m3" "nm" = "nm" -[changeunit] -"SO4--" = { unit = "µg /m3", factor = 2995.82 } [pollutant] 1 = "SO2"