Skip to content

Commit de98518

Browse files
Update PlaneAcquisition attribute from plane_thickness_in_um to point_spread_function_in_um across documentation and tests (#60)
1 parent 8754ab5 commit de98518

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
@@ -229,7 +229,7 @@ classDiagram
229229
--------------------------------------
230230
attributes
231231
--------------------------------------
232-
plane_thickness_in_um : float64, optional
232+
point_spread_function_in_um : text, optional
233233
illumination_angle_in_degrees : float64, optional
234234
plane_rate_in_Hz : float64, optional
235235
}

docs/source/examples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ Example of multi-plane imaging with an electrically tunable lens:
731731
plane_acquisition = PlaneAcquisition(
732732
name=f'plane_acquisition',
733733
description=f'Plane acquisition',
734-
plane_thickness_in_um=2.0
734+
point_spread_function_in_um="32 um ± 1.6 um"
735735
)
736736
737737
for depth in depths:

docs/source/format.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,9 @@ Whole plane acquisition method for microscopy.
281281
neurodata_type_inc: IlluminationPattern
282282
doc: Whole plane acquisition, common for light sheet techniques.
283283
attributes:
284-
- name: plane_thickness_in_um
285-
dtype: float64
286-
doc: Thickness of the plane in micrometers.
284+
- name: point_spread_function_in_um
285+
dtype: text
286+
doc: Estimated plane spatial profile or point spread function, expressed as mean [um] ± s.d [um].
287287
required: false
288288
- name: illumination_angle_in_degrees
289289
dtype: float64

docs/source/user_guide.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Illumination patterns define how the microscope scans or illuminates the sample:
101101
plane_acquisition = PlaneAcquisition(
102102
name='plane_acquisition',
103103
description='Widefield fluorescence imaging',
104-
plane_thickness_in_um=5.0,
104+
point_spread_function_in_um="32 um ± 1.6 um",
105105
illumination_angle_in_degrees=45.0, # for light sheet
106106
plane_rate_in_Hz=100.0 # planes per second
107107
)
@@ -156,7 +156,7 @@ Imaging spaces define the physical region being imaged:
156156
plane_acquisition = PlaneAcquisition(
157157
name='plane_acquisition',
158158
description='Light sheet imaging',
159-
plane_thickness_in_um=5.0,
159+
point_spread_function_in_um="32 um ± 1.6 um",
160160
illumination_angle_in_degrees=45.0,
161161
plane_rate_in_Hz=100.0
162162
)
@@ -260,7 +260,7 @@ Workflow for one-photon widefield imaging:
260260
plane_acquisition = PlaneAcquisition(
261261
name='plane_acquisition',
262262
description='Widefield fluorescence imaging',
263-
plane_thickness_in_um=5.0,
263+
point_spread_function_in_um="32 um ± 1.6 um",
264264
plane_rate_in_Hz=30.0
265265
)
266266

examples/one-photon_calcium_imaging_example.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
"illumination_pattern = PlaneAcquisition(\n",
251251
" name=\"plane_acquisition\",\n",
252252
" description=\"Widefield fluorescence imaging\",\n",
253-
" plane_thickness_in_um=5.0,\n",
253+
" point_spread_function_in_um=\"32 um ± 1.6 um\",\n",
254254
")\n",
255255
"imaging_space = PlanarImagingSpace(\n",
256256
" name=\"hippo_plane1\",\n",

spec/ndx-microscopy.extensions.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,11 @@ groups:
110110
neurodata_type_inc: IlluminationPattern
111111
doc: Whole plane acquisition, common for light sheet techniques.
112112
attributes:
113-
- name: plane_thickness_in_um
114-
dtype: float64
115-
doc: Thickness of the plane in micrometers.
113+
- name: point_spread_function_in_um
114+
dtype: text
115+
doc:
116+
Estimated plane spatial profile or point spread function, expressed as
117+
mean [um] ± s.d [um].
116118
required: false
117119
- name: illumination_angle_in_degrees
118120
dtype: float64

src/pynwb/ndx_microscopy/testing/_mock.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@ def mock_PlaneAcquisition(
126126
*,
127127
name: Optional[str] = None,
128128
description: str = "A mock instance of a PlaneAcquisition type to be used for rapid testing.",
129-
plane_thickness_in_um: Optional[float] = 5.0,
129+
point_spread_function_in_um: Optional[str] = "32 um ± 1.6 um",
130130
illumination_angle_in_degrees: Optional[float] = 45.0,
131131
plane_rate_in_Hz: Optional[float] = 100.0,
132132
) -> ndx_microscopy.PlaneAcquisition:
133133
"""Light sheet method."""
134134
plane_acquisition = ndx_microscopy.PlaneAcquisition(
135135
name=name or name_generator("PlaneAcquisition"),
136136
description=description,
137-
plane_thickness_in_um=plane_thickness_in_um,
137+
point_spread_function_in_um=point_spread_function_in_um,
138138
illumination_angle_in_degrees=illumination_angle_in_degrees,
139139
plane_rate_in_Hz=plane_rate_in_Hz,
140140
)

src/pynwb/tests/test_constructors.py

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

0 commit comments

Comments
 (0)