vfv and InputFileMixin: use cached_property

lens-biophotonics · May 5, 2023 · 0f12b83 · 0f12b83
1 parent 8bb3e95
commit 0f12b83
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/zetastitcher/fuse/virtual_fused_volume.py b/zetastitcher/fuse/virtual_fused_volume.py
@@ -6,7 +6,7 @@
 import threading
 
 from queue import Queue
-from functools import lru_cache
+from functools import cached_property
 
 import numpy as np
 
@@ -90,8 +90,7 @@ def overlay_debug_enabled(self):
     def overlay_debug_enabled(self, value):
         self._debug = value
 
-    @property
-    @lru_cache()
+    @cached_property
     def shape(self):
         """Shape of the whole stitched volume.
 

diff --git a/zetastitcher/io/inputfile_mixin.py b/zetastitcher/io/inputfile_mixin.py
@@ -1,14 +1,10 @@
 import numpy as np
+from functools import cached_property
 
 
 class InputFileMixin:
     def __init__(self):
         self.path = None
-        self.xsize = None
-        self.ysize = None
-        self.nfrms = None
-        self.dtype = None
-        self.nchannels = 1
 
     def __del__(self):
         self.close()
@@ -19,6 +15,26 @@ def __enter__(self):
     def __exit__(self, *args):
         self.close()
 
+    @cached_property
+    def xsize(self):
+        pass
+
+    @cached_property
+    def ysize(self):
+        pass
+
+    @cached_property
+    def nfrms(self):
+        pass
+
+    @cached_property
+    def dtype(self):
+        pass
+
+    @cached_property
+    def nchannels(self):
+        return 1
+
     def close(self):
         pass