From 5345e38d3cefd05c45e514a89dc3b4921f536148 Mon Sep 17 00:00:00 2001 From: Wim Pomp Date: Mon, 18 Mar 2024 16:43:26 +0100 Subject: [PATCH] - read the correct metadata for series > 0 --- ndbioimage/__init__.py | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ndbioimage/__init__.py b/ndbioimage/__init__.py index ccd37a1..c4b1247 100755 --- a/ndbioimage/__init__.py +++ b/ndbioimage/__init__.py @@ -987,7 +987,7 @@ class AbstractReader(Imread, metaclass=ABCMeta): self.open() # extract some metadata from ome instrument = self.ome.instruments[0] if self.ome.instruments else None - image = self.ome.images[0] + image = self.ome.images[self.series] pixels = image.pixels self.shape = pixels.size_y, pixels.size_x, pixels.size_c, pixels.size_z, pixels.size_t self.dtype = pixels.type.value if dtype is None else dtype @@ -1003,8 +1003,8 @@ class AbstractReader(Imread, metaclass=ABCMeta): self.deltaz_um = None if self.deltaz is None else self.deltaz.to(self.ureg.um).m else: self.deltaz = self.deltaz_um = None - if self.ome.images[0].objective_settings: - self.objective = find(instrument.objectives, id=self.ome.images[0].objective_settings.id) + if self.ome.images[self.series].objective_settings: + self.objective = find(instrument.objectives, id=self.ome.images[self.series].objective_settings.id) else: self.objective = None try: @@ -1107,7 +1107,7 @@ class AbstractReader(Imread, metaclass=ABCMeta): p = re.compile(r'(\d+):(\d+)$') try: self.track, self.detector = zip(*[[int(i) for i in p.findall(find( - self.ome.images[0].pixels.channels, id=f'Channel:{c}').detector_settings.id)[0]] + self.ome.images[self.series].pixels.channels, id=f'Channel:{c}').detector_settings.id)[0]] for c in range(self.shape['c'])]) except Exception: pass diff --git a/pyproject.toml b/pyproject.toml index 49b55ae..e7b64bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ndbioimage" -version = "2024.3.3" +version = "2024.3.4" description = "Bio image reading, metadata and some affine registration." authors = ["W. Pomp "] license = "GPLv3"