From d0b5ade5e7150b50fa946490e44124d5bcaa664e Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Mon, 2 Mar 2020 14:19:56 +0100
Subject: [PATCH] new naming for .nc files using keys of statistics per var,
remove var_all_dict due to no usage inside program, check target var and
remove unused keys from statistics per var
---
src/data_handling/data_preparation.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/data_handling/data_preparation.py b/src/data_handling/data_preparation.py
index 9a006beb..89ebbe31 100644
--- a/src/data_handling/data_preparation.py
+++ b/src/data_handling/data_preparation.py
@@ -138,10 +138,12 @@ class DataPrep(object):
return xarr, meta
def _set_file_name(self):
- return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(sorted(self.variables))}.nc")
+ all_vars = sorted(self.statistics_per_var.keys())
+ return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(all_vars)}.nc")
def _set_meta_file_name(self):
- return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(sorted(self.variables))}_meta.csv")
+ all_vars = sorted(self.statistics_per_var.keys())
+ return os.path.join(self.path, f"{''.join(self.station)}_{'_'.join(all_vars)}_meta.csv")
def __repr__(self):
return f"Dataprep(path='{self.path}', network='{self.network}', station={self.station}, " \
--
GitLab