Merge pull request #771 from henrypinkard/main

update for new version of NDTiff
micro-manager · Jun 7, 2024 · 2ed284b · 2ed284b
2 parents ba45ddc + a7f6482
commit 2ed284b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/pycromanager/_version.py b/pycromanager/_version.py
@@ -1,2 +1,2 @@
-version_info = (0, 32, 0)
+version_info = (0, 32, 1)
 __version__ = ".".join(map(str, version_info))
diff --git a/pycromanager/acquisition/java_RAMStorage.py b/pycromanager/acquisition/java_RAMStorage.py
@@ -13,7 +13,7 @@ def __init__(self, java_RAM_data_storage):
         self._java_RAM_data_storage = java_RAM_data_storage
         self._index_keys = set()
 
-    def _add_index_entry(self, data):
+    def add_index_entry(self, data):
         self._index_keys.add(frozenset(data.items()))
 
     # def get_channel_names(self):

diff --git a/pycromanager/acquisition/java_backend_acquisitions.py b/pycromanager/acquisition/java_backend_acquisitions.py
@@ -201,12 +201,12 @@ def _notification_handler_fn(acquisition, notification_push_port, connected_even
                     # check if NDTiff data storage used
                     if acquisition._directory is not None:
                         index_entry = notification.payload.encode('ISO-8859-1')
-                        axes = acquisition._dataset._add_index_entry(index_entry)
+                        axes = acquisition._dataset.add_index_entry(index_entry)
                         # swap the notification.payload from the byte array of index information to axes
                         notification.payload = axes
                     else: # RAM storage
                         axes = json.loads(notification.payload)
-                        acquisition._dataset._add_index_entry(axes)
+                        acquisition._dataset.add_index_entry(axes)
                         notification.payload = axes
                 acquisition._image_notification_queue.put(notification)
 
@@ -315,7 +315,7 @@ def __init__(
         summary_metadata = storage_java_class.get_summary_metadata()
         if directory is not None:
             # NDTiff dataset saved to disk on Java side
-            self._dataset = Dataset(dataset_path=self._dataset_disk_location, _summary_metadata=summary_metadata)
+            self._dataset = Dataset(dataset_path=self._dataset_disk_location, summary_metadata=summary_metadata)
         else:
             # Saved to RAM on Java side
             self._dataset = JavaRAMDataStorage(storage_java_class)

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 numpy
 dask[array]>=2022.2.0
 pyzmq
-ndtiff>=2.2.0
+ndtiff>=2.3.0
 docstring-inheritance
 pymmcore
 sortedcontainers