Skip to content

Commit 6ae4804

Browse files
minor fixes
1 parent f17b4ec commit 6ae4804

File tree

4 files changed

+36
-35
lines changed

4 files changed

+36
-35
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ A Neurodata Without Borders (NWB) extension for storing microscopy data and asso
4141
- `SegmentationContainer`
4242
- `MicroscopyResponseSeries`
4343
- `MicroscopyResponseSeriesContainer`
44-
- Abstract Neurodata types: `ImagingSpace`, `MicroscopySeries`,`Segmentation`
44+
- Abstract Neurodata types: `ImagingSpace`, `MicroscopySeries`, `MicroscopyStaticImage`, `Segmentation`
4545

4646
## Entity Relationship Diagrams
4747

@@ -334,7 +334,7 @@ classDiagram
334334
datasets
335335
--------------------------------------
336336
pixel_size_in_um : float64[2], optional
337-
dimensions_in_pixels : float64[2], optional
337+
dimensions_in_pixels : uint32[2], optional
338338
--------------------------------------
339339
methods
340340
--------------------------------------
@@ -347,7 +347,7 @@ classDiagram
347347
datasets
348348
--------------------------------------
349349
voxel_size_in_um : float64[3], optional
350-
dimensions_in_voxels : float64[3], optional
350+
dimensions_in_voxels : uint32[3], optional
351351
--------------------------------------
352352
methods
353353
--------------------------------------

docs/source/examples.rst

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -872,11 +872,19 @@ Example of multi-plane imaging with an electrically tunable lens:
872872
response_series_list = []
873873
depths = [-100, -50, 0, 50, 100] # Depths in µm
874874
875-
# Create illumination pattern
875+
# Create illumination pattern and channel once — shared across all planes
876876
plane_acquisition = PlaneAcquisition(
877-
name=f'plane_acquisition',
878-
description=f'Plane acquisition',
879-
point_spread_function_in_um="32 um ± 1.6 um"
877+
name='plane_acquisition',
878+
description='Plane acquisition',
879+
point_spread_function_in_um="32 um ± 1.6 um",
880+
)
881+
882+
microscopy_channel = MicroscopyChannel(
883+
name='gcamp_channel',
884+
description='GCaMP6f channel',
885+
excitation_wavelength_in_nm=920.0,
886+
emission_wavelength_in_nm=510.0,
887+
indicator=indicator,
880888
)
881889
882890
for depth in depths:
@@ -887,25 +895,16 @@ Example of multi-plane imaging with an electrically tunable lens:
887895
width = 512
888896
data = np.random.rand(frames, height, width)
889897
890-
# Create imaging space for this depth with illumination pattern
898+
# Create imaging space for this depth
891899
plane_space = PlanarImagingSpace(
892900
name=f'plane_depth_{depth}',
893901
description=f'Imaging plane at {depth} µm depth',
894902
pixel_size_in_um=[1.0, 1.0],
895903
dimensions_in_pixels=[height, width],
896904
anatomical_target='Visual cortex',
897-
illumination_pattern=plane_acquisition # Include the illumination pattern
905+
illumination_pattern=plane_acquisition,
898906
)
899907
900-
# Create microscopy channel for this plane
901-
microscopy_channel = MicroscopyChannel(
902-
name=f'gcamp_channel_{depth}',
903-
description=f'GCaMP6f channel at {depth} µm depth',
904-
excitation_wavelength_in_nm=920.0,
905-
emission_wavelength_in_nm=510.0,
906-
indicator=indicator
907-
)
908-
909908
# Create imaging series for this plane
910909
plane_series = PlanarMicroscopySeries(
911910
name=f'imaging_depth_{depth}',

docs/source/getting_started.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ Data Series
6363
----------
6464
- **PlanarMicroscopySeries**: 2D time series data
6565
- **VolumetricMicroscopySeries**: 3D time series data
66-
- **MultiPlaneMicroscopyContainer**: Multiple imaging planes
67-
- **MultiChannelMicroscopyContainer**: Multiple channel imaging data
66+
- **PlanarMicroscopyStaticImage**: Single 2D static image (e.g. anatomical reference)
67+
- **VolumetricMicroscopyStaticImage**: Single 3D static image
68+
- **MultiPlaneMicroscopyContainer**: Multiple imaging planes (time series or static images)
69+
- **MultiChannelMicroscopyContainer**: Multiple channel imaging data, optionally nesting ``MultiPlaneMicroscopyContainer``
6870

6971
Quick Start Example
7072
================

docs/source/user_guide.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Other optical components (filters, sources, detectors) are provided by the ndx-o
196196
indicator = Indicator(
197197
name="indicator",
198198
description="Green indicator",
199-
label="GCamp6f",
199+
label="GCaMP6f",
200200
viral_vector_injection=viral_vector_injection,
201201
)
202202
@@ -218,8 +218,8 @@ Other optical components (filters, sources, detectors) are provided by the ndx-o
218218
microscopy_channel = MicroscopyChannel(
219219
name='gcamp_channel',
220220
description='GCaMP6f channel',
221-
excitation_wavelength_in_nm=488.0,
222-
emission_wavelength_in_nm=520.0,
221+
excitation_wavelength_in_nm=920.0,
222+
emission_wavelength_in_nm=510.0,
223223
indicator=indicator # Link to indicator from MicroscopyExperimentMetadata
224224
)
225225
@@ -334,6 +334,8 @@ Basic workflow for 2D imaging:
334334

335335
.. code-block:: python
336336
337+
from ndx_ophys_devices import Indicator, ViralVector, ViralVectorInjection
338+
337339
# 1. Set up microscope model and instance
338340
microscope_model = MicroscopeModel(
339341
name='2p-model',
@@ -388,8 +390,6 @@ Basic workflow for 2D imaging:
388390
)
389391
390392
# 4. Create experiment metadata with indicators and rig
391-
from ndx_ophys_devices import Indicator, ViralVector, ViralVectorInjection
392-
393393
viral_vector = ViralVector(
394394
name="viral_vector",
395395
description="AAV viral vector for optogenetic stimulation",
@@ -420,7 +420,7 @@ Basic workflow for 2D imaging:
420420
indicator = Indicator(
421421
name="indicator",
422422
description="Green indicator",
423-
label="GCamp6f",
423+
label="GCaMP6f",
424424
viral_vector_injection=viral_vector_injection,
425425
)
426426
@@ -455,8 +455,8 @@ Basic workflow for 2D imaging:
455455
microscopy_channel = MicroscopyChannel(
456456
name='gcamp_channel',
457457
description='GCaMP6f channel',
458-
excitation_wavelength_in_nm=488.0,
459-
emission_wavelength_in_nm=520.0,
458+
excitation_wavelength_in_nm=920.0,
459+
emission_wavelength_in_nm=510.0,
460460
indicator=indicator # Link to indicator from MicroscopyExperimentMetadata
461461
)
462462
@@ -481,6 +481,8 @@ Workflow for one-photon widefield imaging:
481481

482482
.. code-block:: python
483483
484+
from ndx_ophys_devices import Indicator, ViralVector, ViralVectorInjection
485+
484486
# 1. Set up microscope model and instance
485487
microscope_model = MicroscopeModel(
486488
name='1p-model',
@@ -512,8 +514,6 @@ Workflow for one-photon widefield imaging:
512514
)
513515
514516
# 4. Create experiment metadata with indicators and rig
515-
from ndx_ophys_devices import Indicator, ViralVector, ViralVectorInjection
516-
517517
viral_vector = ViralVector(
518518
name="viral_vector",
519519
description="AAV viral vector for optogenetic stimulation",
@@ -544,7 +544,7 @@ Workflow for one-photon widefield imaging:
544544
indicator = Indicator(
545545
name="indicator",
546546
description="Green indicator",
547-
label="GCamp6f",
547+
label="GCaMP6f",
548548
viral_vector_injection=viral_vector_injection,
549549
)
550550
@@ -604,6 +604,8 @@ Workflow for volumetric imaging with targeted scanning:
604604

605605
.. code-block:: python
606606
607+
from ndx_ophys_devices import Indicator, ViralVector, ViralVectorInjection
608+
607609
# 1. Set up microscope model and instance
608610
microscope_model = MicroscopeModel(
609611
name='volume-model',
@@ -635,8 +637,6 @@ Workflow for volumetric imaging with targeted scanning:
635637
)
636638
637639
# 4. Create experiment metadata with indicators and rig
638-
from ndx_ophys_devices import Indicator, ViralVector, ViralVectorInjection
639-
640640
viral_vector = ViralVector(
641641
name="viral_vector",
642642
description="AAV viral vector for optogenetic stimulation",
@@ -667,7 +667,7 @@ Workflow for volumetric imaging with targeted scanning:
667667
indicator = Indicator(
668668
name="indicator",
669669
description="Green indicator",
670-
label="GCamp6f",
670+
label="GCaMP6f",
671671
viral_vector_injection=viral_vector_injection,
672672
)
673673
@@ -944,7 +944,7 @@ Data Organization
944944
1. **Naming Conventions**
945945
- Use descriptive, consistent names
946946
- Include relevant metadata in descriptions
947-
- Document coordinate systems and reference frames
947+
- Use ``anatomical_target`` to document the brain region being imaged
948948

949949
2. **Data Structure**
950950
- Group related data appropriately

0 commit comments

Comments
 (0)