From 86d2924d356792dee863c4b39bcc5b230c9e3f6c Mon Sep 17 00:00:00 2001 From: jim Date: Fri, 28 Aug 2015 18:56:37 -0500 Subject: [PATCH] resolves #68: indexing was not returning the correct image and skipped frame entirely when there were multiple channels --- jim.py | 4 ---- nd2reader/__init__.py | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 jim.py diff --git a/jim.py b/jim.py deleted file mode 100644 index 95738e0..0000000 --- a/jim.py +++ /dev/null @@ -1,4 +0,0 @@ -import nd2reader -nd2 = nd2reader.Nd2("/var/nd2s/hawkjo.nd2") - -print(nd2) \ No newline at end of file diff --git a/nd2reader/__init__.py b/nd2reader/__init__.py index 2337034..e01360a 100644 --- a/nd2reader/__init__.py +++ b/nd2reader/__init__.py @@ -57,7 +57,8 @@ class Nd2(Nd2Parser): fov = self._calculate_field_of_view(item) channel = self._calculate_channel(item) z_level = self._calculate_z_level(item) - timestamp, raw_image_data = self._get_raw_image_data(item, channel_offset) + image_group_number = int(item / len(self.channels)) + timestamp, raw_image_data = self._get_raw_image_data(image_group_number, channel_offset) image = Image(timestamp, raw_image_data, fov, channel, z_level, self.height, self.width) except (TypeError, ValueError): return None