From d0a33de80460d50f5134ca4699fbb674d12752c1 Mon Sep 17 00:00:00 2001 From: Wim Pomp Date: Thu, 12 May 2022 09:22:20 +0200 Subject: [PATCH] - Grayscale or composite --- setup.py | 2 +- tiffwrite/__init__.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 49ccb2c..17b2997 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open('README.md', 'r') as fh: setuptools.setup( name='tiffwrite', - version='2022.5.2', + version='2022.5.3', author='Wim Pomp @ Lenstra lab NKI', author_email='w.pomp@nki.nl', description='Parallel tiff writer compatible with ImageJ.', diff --git a/tiffwrite/__init__.py b/tiffwrite/__init__.py index 3a948a1..8ce037b 100755 --- a/tiffwrite/__init__.py +++ b/tiffwrite/__init__.py @@ -440,7 +440,11 @@ class IJTiffFile: else: desc.extend((f'images={np.prod(self.shape)}', f'channels={self.shape[0]}', f'slices={self.shape[1]}', f'frames={self.shape[2]}')) - desc.extend(('hyperstack=true', 'mode=composite', 'loop=false', 'unit=micron')) + if self.shape[0] == 1: + desc.append('mode=grayscale') + else: + desc.append('mode=composite') + desc.extend(('hyperstack=true', 'loop=false', 'unit=micron')) if self.deltaz is not None: desc.append(f'spacing={self.deltaz}') if self.timeinterval is not None: @@ -449,8 +453,7 @@ class IJTiffFile: @cached_property def empty_frame(self): - ifd = self.ifds[list(self.ifds.keys())[-1]].copy() - return self.compress_frame(np.zeros((ifd[257].value[0], ifd[256].value[0]), self.dtype)) + return self.compress_frame(np.zeros(self.frame_shape, self.dtype)) @cached_property def frame_shape(self):