From d248b18362e44feaff5311d4cbe03632b0264b22 Mon Sep 17 00:00:00 2001 From: Slautin Date: Fri, 23 Aug 2024 22:22:33 +0200 Subject: [PATCH 1/5] save NSID from list to dict --- SciFiReaders/readers/SID/Nsid_reader.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SciFiReaders/readers/SID/Nsid_reader.py b/SciFiReaders/readers/SID/Nsid_reader.py index de17d96..00968cf 100644 --- a/SciFiReaders/readers/SID/Nsid_reader.py +++ b/SciFiReaders/readers/SID/Nsid_reader.py @@ -157,15 +157,17 @@ def read_all(self, recursive=True, parent=None): list_of_main = self._main_dsets else: list_of_main = [] + keys = [] for key in h5_group: if isinstance(h5_group[key], h5py.Dataset): if check_if_main(h5_group[key]): list_of_main.append(h5_group[key]) + keys.append(key) # Go through each of the identified - list_of_datasets = [] - for dset in list_of_main: - list_of_datasets.append(read_h5py_dataset(dset)) + list_of_datasets = {} + for i,dset in enumerate(list_of_main): + list_of_datasets[keys[i]] = read_h5py_dataset(dset) return list_of_datasets def close(self): From 74ca670082452a9821cb58ff5d2ba3e1142f9a7e Mon Sep 17 00:00:00 2001 From: Slautin Date: Fri, 23 Aug 2024 22:29:08 +0200 Subject: [PATCH 2/5] save NSID from list to dict 2 --- SciFiReaders/readers/SID/Nsid_reader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/SciFiReaders/readers/SID/Nsid_reader.py b/SciFiReaders/readers/SID/Nsid_reader.py index 00968cf..b258a94 100644 --- a/SciFiReaders/readers/SID/Nsid_reader.py +++ b/SciFiReaders/readers/SID/Nsid_reader.py @@ -155,6 +155,7 @@ def read_all(self, recursive=True, parent=None): if recursive: list_of_main = self._main_dsets + keys = ['Channel_{0:3}'.format(i) for i in range(len(list_of_main))] else: list_of_main = [] keys = [] From b73361f7445f0c7aa9bc752952c7b971911e7e5e Mon Sep 17 00:00:00 2001 From: Slautin Date: Fri, 23 Aug 2024 22:32:15 +0200 Subject: [PATCH 3/5] save NSID from list to dict 3 --- SciFiReaders/readers/SID/Nsid_reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SciFiReaders/readers/SID/Nsid_reader.py b/SciFiReaders/readers/SID/Nsid_reader.py index b258a94..25e6891 100644 --- a/SciFiReaders/readers/SID/Nsid_reader.py +++ b/SciFiReaders/readers/SID/Nsid_reader.py @@ -155,7 +155,7 @@ def read_all(self, recursive=True, parent=None): if recursive: list_of_main = self._main_dsets - keys = ['Channel_{0:3}'.format(i) for i in range(len(list_of_main))] + keys = ['Channel_{:03}'.format(i) for i in range(len(list_of_main))] else: list_of_main = [] keys = [] From 5b706fe6981010f555b933855815d63298ecc10f Mon Sep 17 00:00:00 2001 From: Slautin Date: Fri, 23 Aug 2024 22:39:04 +0200 Subject: [PATCH 4/5] save NSID from list to dict 4 --- SciFiReaders/readers/SID/Nsid_reader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SciFiReaders/readers/SID/Nsid_reader.py b/SciFiReaders/readers/SID/Nsid_reader.py index 25e6891..d407e60 100644 --- a/SciFiReaders/readers/SID/Nsid_reader.py +++ b/SciFiReaders/readers/SID/Nsid_reader.py @@ -171,5 +171,5 @@ def read_all(self, recursive=True, parent=None): list_of_datasets[keys[i]] = read_h5py_dataset(dset) return list_of_datasets -def close(self): - self._h5_file.close() \ No newline at end of file + def close(self): + self._h5_file.close() \ No newline at end of file From a826b2f3e6b2a3bda166f5bb9bb95c333c7be98e Mon Sep 17 00:00:00 2001 From: Slautin Date: Fri, 23 Aug 2024 22:45:11 +0200 Subject: [PATCH 5/5] save NSID from list to dict test changed --- tests/readers/SID/test_nsid_reader.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/readers/SID/test_nsid_reader.py b/tests/readers/SID/test_nsid_reader.py index f4c8dab..4556ba1 100644 --- a/tests/readers/SID/test_nsid_reader.py +++ b/tests/readers/SID/test_nsid_reader.py @@ -17,16 +17,18 @@ def test_nsid_bepfm_file(self): data = reader.read() assert len(data)==3, "Data should have been length 3 but was instead {}".format(len(data)) #Check to see if these are sidpy datasets - for ind in range(3): - assert type(data[ind])==sidpy.sid.dataset.Dataset, "Expected sidpy dataset but received {}".format(type(data[ind])) - - assert data[0].shape==(3, 128, 128, 1) - assert data[1].shape == (128, 128, 61) - assert data[2].shape == (128,128,5) + for key in data: + assert type(data[key])==sidpy.sid.dataset.Dataset, "Expected sidpy dataset but received {}".format(type(data[ind])) + + data_keys = list(data.keys()) + + assert data[data_keys[0]].shape==(3, 128, 128, 1) + assert data[data_keys[1]].shape == (128, 128, 61) + assert data[data_keys[2]].shape == (128,128,5) - assert len(data[0].original_metadata.keys())==285, "Expected 285 keys but received {} for data[0]" - assert len(data[1].original_metadata.keys())==285, "Expected 285 keys but received {} for data[1]" - assert len(data[2].original_metadata.keys())==0, "Expected 0 keys but received {} for data[2]" + assert len(data[data_keys[0]].original_metadata.keys())==285, "Expected 285 keys but received {} for data[0]" + assert len(data[data_keys[1]].original_metadata.keys())==285, "Expected 285 keys but received {} for data[1]" + assert len(data[data_keys[2]].original_metadata.keys())==0, "Expected 0 keys but received {} for data[2]"