Skip to content

Commit 80a05ce

Browse files
Update PlaneAcquisition attribute from plane_thickness_in_um to point_spread_function_in_um across documentation and tests
1 parent fc473e3 commit 80a05ce

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ classDiagram
228228
--------------------------------------
229229
attributes
230230
--------------------------------------
231-
plane_thickness_in_um : float64, optional
231+
point_spread_function_in_um : text, optional
232232
illumination_angle_in_degrees : float64, optional
233233
plane_rate_in_Hz : float64, optional
234234
}

docs/source/examples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ Example of multi-plane imaging with an electrically tunable lens:
709709
plane_acquisition = PlaneAcquisition(
710710
name=f'plane_acquisition',
711711
description=f'Plane acquisition',
712-
plane_thickness_in_um=2.0
712+
point_spread_function_in_um="32 um ± 1.6 um"
713713
)
714714
715715
for depth in depths:

docs/source/format.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ Whole plane acquisition method for microscopy.
248248
neurodata_type_inc: IlluminationPattern
249249
doc: Whole plane acquisition, common for light sheet techniques.
250250
attributes:
251-
- name: plane_thickness_in_um
252-
dtype: float64
253-
doc: Thickness of the plane in micrometers.
251+
- name: point_spread_function_in_um
252+
dtype: text
253+
doc: Estimated plane spatial profile or point spread function, expressed as mean [um] ± s.d [um].
254254
required: false
255255
- name: illumination_angle_in_degrees
256256
dtype: float64

docs/source/user_guide.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Illumination patterns define how the microscope scans or illuminates the sample:
8989
plane_acquisition = PlaneAcquisition(
9090
name='plane_acquisition',
9191
description='Widefield fluorescence imaging',
92-
plane_thickness_in_um=5.0,
92+
point_spread_function_in_um="32 um ± 1.6 um",
9393
illumination_angle_in_degrees=45.0, # for light sheet
9494
plane_rate_in_Hz=100.0 # planes per second
9595
)
@@ -144,7 +144,7 @@ Imaging spaces define the physical region being imaged:
144144
plane_acquisition = PlaneAcquisition(
145145
name='plane_acquisition',
146146
description='Light sheet imaging',
147-
plane_thickness_in_um=5.0,
147+
point_spread_function_in_um="32 um ± 1.6 um",
148148
illumination_angle_in_degrees=45.0,
149149
plane_rate_in_Hz=100.0
150150
)
@@ -238,7 +238,7 @@ Workflow for one-photon widefield imaging:
238238
plane_acquisition = PlaneAcquisition(
239239
name='plane_acquisition',
240240
description='Widefield fluorescence imaging',
241-
plane_thickness_in_um=5.0,
241+
point_spread_function_in_um="32 um ± 1.6 um",
242242
plane_rate_in_Hz=30.0
243243
)
244244

examples/one-photon_calcium_imaging_example.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
"illumination_pattern = PlaneAcquisition(\n",
241241
" name=\"plane_acquisition\",\n",
242242
" description=\"Widefield fluorescence imaging\",\n",
243-
" plane_thickness_in_um=5.0,\n",
243+
" point_spread_function_in_um=\"32 um ± 1.6 um\",\n",
244244
")\n",
245245
"imaging_space = PlanarImagingSpace(\n",
246246
" name=\"hippo_plane1\",\n",

spec/ndx-microscopy.extensions.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,11 @@ groups:
8888
neurodata_type_inc: IlluminationPattern
8989
doc: Whole plane acquisition, common for light sheet techniques.
9090
attributes:
91-
- name: plane_thickness_in_um
92-
dtype: float64
93-
doc: Thickness of the plane in micrometers.
91+
- name: point_spread_function_in_um
92+
dtype: text
93+
doc:
94+
Estimated plane spatial profile or point spread function, expressed as
95+
mean [um] ± s.d [um].
9496
required: false
9597
- name: illumination_angle_in_degrees
9698
dtype: float64

src/pynwb/ndx_microscopy/testing/_mock.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ def mock_PlaneAcquisition(
108108
*,
109109
name: Optional[str] = None,
110110
description: str = "A mock instance of a PlaneAcquisition type to be used for rapid testing.",
111-
plane_thickness_in_um: Optional[float] = 5.0,
111+
point_spread_function_in_um: Optional[str] = "32 um ± 1.6 um",
112112
illumination_angle_in_degrees: Optional[float] = 45.0,
113113
plane_rate_in_Hz: Optional[float] = 100.0,
114114
) -> ndx_microscopy.PlaneAcquisition:
115115
"""Light sheet method."""
116116
plane_acquisition = ndx_microscopy.PlaneAcquisition(
117117
name=name or name_generator("PlaneAcquisition"),
118118
description=description,
119-
plane_thickness_in_um=plane_thickness_in_um,
119+
point_spread_function_in_um=point_spread_function_in_um,
120120
illumination_angle_in_degrees=illumination_angle_in_degrees,
121121
plane_rate_in_Hz=plane_rate_in_Hz,
122122
)

src/pynwb/tests/test_constructors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_constructor_plane_acquisition():
8080
"""Test constructor for PlaneAcquisition class."""
8181
plane_acquisition = mock_PlaneAcquisition()
8282
assert plane_acquisition.description == "A mock instance of a PlaneAcquisition type to be used for rapid testing."
83-
assert plane_acquisition.plane_thickness_in_um == 5.0
83+
assert plane_acquisition.point_spread_function_in_um == "32 um ± 1.6 um"
8484
assert plane_acquisition.illumination_angle_in_degrees == 45.0
8585
assert plane_acquisition.plane_rate_in_Hz == 100.0
8686
assert isinstance(plane_acquisition, PlaneAcquisition)

0 commit comments

Comments
 (0)