Merge branch 'NWBEP0004_reviews_2' of https://github.com/catalystneuro/ndx-microscopy into NWBEP0004_reviews_2

Author: alessandratrapani

spec/ndx-microscopy.extensions.yaml

@@ -310,6 +310,15 @@ groups:
           VolumetricImagingSpace object containing metadata about the region of physical space this imaging data
           was recorded from.
 
+  - neurodata_type_def: MicroscopyStaticImageContainer
+    neurodata_type_inc: NWBDataInterface
+    default_name: MicroscopyStaticImageContainer
+    doc: A container of many MicroscopyStaticImage objects.
+    groups:
+      - neurodata_type_inc: MicroscopyStaticImage
+        doc: MicroscopyStaticImage object containing imaging data for a single channel scan.
+        quantity: "+"
+
   - neurodata_type_def: MicroscopySeries
     neurodata_type_inc: TimeSeries
     doc:
@@ -378,29 +387,22 @@ groups:
     default_name: MultiPlaneMicroscopyContainer
     doc:
       Imaging data acquired over several depths, regularly or irregularly spaced; for instance, when using an
-      electrically tunable lens. Each depth scan is stored in a separate PlanarMicroscopySeries or PlanarMicroscopyStaticImage object.
+      electrically tunable lens. Each depth scan is stored in a separate PlanarMicroscopySeries object.
     groups:
       - neurodata_type_inc: PlanarMicroscopySeries
         doc: PlanarMicroscopySeries object(s) containing imaging data for a single depth scan.
-        quantity: "*"
-      - neurodata_type_inc: PlanarMicroscopyStaticImage
-        doc: PlanarMicroscopyStaticImage object(s) containing imaging data for a single depth scan.
-        quantity: "*"
+        quantity: "+"
 
   - neurodata_type_def: MultiChannelMicroscopyContainer
     neurodata_type_inc: NWBDataInterface
     default_name: MultiChannelMicroscopyContainer
     doc:
       Imaging data acquired over several channels; for instance, when using multiple excitation wavelengths
-      or multiple indicators. Each channel is stored in a separate PlanarMicroscopySeries, VolumetricMicroscopySeries,
-      PlanarMicroscopyStaticImage or VolumetricMicroscopyStaticImage.
+      or multiple indicators. Each channel is stored in a separate PlanarMicroscopySeries or VolumetricMicroscopySeries.
     groups:
       - neurodata_type_inc: MicroscopySeries
         doc: MicroscopySeries object containing imaging data for a single channel scan.
-        quantity: "*"
-      - neurodata_type_inc: MicroscopyStaticImage
-        doc: MicroscopyStaticImage object containing imaging data for a single channel scan.
-        quantity: "*"
+        quantity: "+"
 
   - neurodata_type_def: SegmentationContainer
     neurodata_type_inc: NWBDataInterface

src/pynwb/ndx_microscopy/__init__.py

@@ -58,6 +58,7 @@
 MicroscopyStaticImage = get_class("MicroscopyStaticImage", extension_name)
 PlanarMicroscopyStaticImage = get_class("PlanarMicroscopyStaticImage", extension_name)
 VolumetricMicroscopyStaticImage = get_class("VolumetricMicroscopyStaticImage", extension_name)
+MicroscopyStaticImageContainer = get_class("MicroscopyStaticImageContainer", extension_name)
 MicroscopySeries = get_class("MicroscopySeries", extension_name)
 PlanarMicroscopySeries = get_class("PlanarMicroscopySeries", extension_name)
 VolumetricMicroscopySeries = get_class("VolumetricMicroscopySeries", extension_name)
@@ -97,6 +98,7 @@
     "MicroscopyStaticImage",
     "PlanarMicroscopyStaticImage",
     "VolumetricMicroscopyStaticImage",
+    "MicroscopyStaticImageContainer",
     "MultiPlaneMicroscopyContainer",
     "MultiChannelMicroscopyContainer",
     "MicroscopyResponseSeries",

src/pynwb/ndx_microscopy/testing/_mock.py

@@ -419,17 +419,29 @@ def mock_PlanarMicroscopyStaticImage(
     return planar_microscopy_static_image
 
 
+def mock_MicroscopyStaticImageContainer(
+    *,
+    microscopy_static_images: Optional[List[ndx_microscopy.MicroscopyStaticImage]] = None,
+    name: Optional[str] = None,
+) -> ndx_microscopy.MicroscopyStaticImageContainer:
+    container_name = name or name_generator("MicroscopyStaticImageContainer")
+
+    microscopy_static_image_container = ndx_microscopy.MicroscopyStaticImageContainer(
+        name=container_name,
+        microscopy_static_images=microscopy_static_images,
+    )
+    return microscopy_static_image_container
+
+
 def mock_MultiPlaneMicroscopyContainer(
     *,
     planar_microscopy_series: Optional[List[ndx_microscopy.PlanarMicroscopySeries]] = None,
-    planar_microscopy_static_images: Optional[List[ndx_microscopy.PlanarMicroscopyStaticImage]] = None,
     name: Optional[str] = None,
 ) -> ndx_microscopy.MultiPlaneMicroscopyContainer:
     container_name = name or name_generator("MultiPlaneMicroscopyContainer")
     multi_plane_microscopy_container = ndx_microscopy.MultiPlaneMicroscopyContainer(
         name=container_name,
         planar_microscopy_series=planar_microscopy_series,
-        planar_microscopy_static_images=planar_microscopy_static_images,
     )
 
     return multi_plane_microscopy_container
@@ -438,15 +450,13 @@ def mock_MultiPlaneMicroscopyContainer(
 def mock_MultiChannelMicroscopyContainer(
     *,
     microscopy_series: Optional[List[ndx_microscopy.MicroscopySeries]] = None,
-    microscopy_static_images: Optional[List[ndx_microscopy.MicroscopyStaticImage]] = None,
     name: Optional[str] = None,
 ) -> ndx_microscopy.MultiChannelMicroscopyContainer:
     container_name = name or name_generator("MultiChannelMicroscopyContainer")
 
     multi_channel_microscopy_container = ndx_microscopy.MultiChannelMicroscopyContainer(
         name=container_name,
         microscopy_series=microscopy_series,
-        microscopy_static_images=microscopy_static_images,
     )
     return multi_channel_microscopy_container
 

src/pynwb/tests/test_constructors.py

@@ -221,7 +221,7 @@ def test_constructor_planar_microscopy_static_image():
     )
 
 
-def test_constructor_multi_plane_microscopy_container_with_series():
+def test_constructor_multi_plane_microscopy_container():
     from ndx_ophys_devices.testing import mock_Indicator
 
     microscopy_channel = mock_MicroscopyChannel(indicator=mock_Indicator(name="Indicator1"))
@@ -278,7 +278,7 @@ def test_constructor_multi_channel_microscopy_container_with_series():
     assert multi_channel_microscopy_container.name == "MultiChannelPlanarMicroscopySeriesContainer"
 
 
-def test_constructor_multi_channel_microscopy_container_with_static_images():
+def test_constructor_microscopy_static_images_container():
     from ndx_ophys_devices.testing import mock_Indicator
 
     microscopy_channel = mock_MicroscopyChannel(indicator=mock_Indicator(name="Indicator1"))