From 07828e41c9b41b93669ff11b5cc709a9ee187013 Mon Sep 17 00:00:00 2001 From: CPD Date: Mon, 17 Mar 2025 08:27:49 +0100 Subject: [PATCH] Keep data loaded when get_data is called --- cpdctrl/utility/data.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cpdctrl/utility/data.py b/cpdctrl/utility/data.py index 0cb5dd9..61ae863 100644 --- a/cpdctrl/utility/data.py +++ b/cpdctrl/utility/data.py @@ -129,10 +129,17 @@ class DataCollector: file.write(self.to_csv(sep=sep)) def get_data(self) -> tuple[np.ndarray, dict]: + """ + Load the full data and return it together with the metadata + Returns + ------- + tuple[np.ndarray, dict] + The full data and the metadata + """ if self.fulldata is None: - return DataCollector.load_data_from_dir(self.dirpath) - else: - return self.fulldata, self.metadata + self.fulldata, new_mdata = DataCollector.load_data_from_dir(self.dirpath) + self.metadata |= new_mdata + return self.fulldata, self.metadata @staticmethod def get_csv(data, metadata, sep=","):