Skip to content

Commit cfd91b0

Browse files
Merge pull request #51 from SilverLabUCL/update-extension-yamls
update extension yamls (+ therefore signatures) adapt to newer `tifffile`
2 parents f89d062 + 8027996 commit cfd91b0

16 files changed

+11003
-22913
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def read(*names, **kwargs):
6060
'numpy',
6161
'pandas>=0.20',
6262
'ruamel.yaml',
63-
'tifffile',
63+
'tifffile[all]', # [all] needed in newer versions of tifffile to ensure imagecodecs is included.
6464
],
6565
extras_require={
6666
'test': ['pytest', 'tox'],

src/silverlabnwb/generate_extended_schema.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def generate_extended_schema():
4141
'normalised Z, '
4242
'\'Pockels\' i.e. laser power in %, '
4343
'and z offset for drive motors',
44+
name='pockels',
4445
shape=(None, 4),
4546
attributes=[pockels_column_names_attr],
4647
neurodata_type_def='ZplanePockelsDataset')

src/silverlabnwb/silverlab.metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
groups:
22
- neurodata_type_def: SilverLabMetaData
33
neurodata_type_inc: LabMetaData
4-
doc: A place to store silverlab specific metadata
4+
doc: A place to store Silver lab specific metadata
55
attributes:
66
- name: silverlab_api_version
77
dtype: text

src/silverlabnwb/silverlab.namespace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespaces:
22
- doc: Extensions for acousto-optic lens data
3-
full_name: Silverlab data extension to NWB format for acousto-optic lens experiments
3+
full_name: Silver lab data extension to NWB format for acousto-optic lens experiments
44
name: silverlab_extended_schema
55
schema:
66
- namespace: core

src/silverlabnwb/silverlab.ophys.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
groups:
22
- neurodata_type_def: SilverLabOptophysiology
33
neurodata_type_inc: LabMetaData
4-
doc: Silverlab optophysiology specifications
4+
doc: A place to store Silver lab specific optophysiology data
55
attributes:
66
- name: cycle_time
77
dtype: float
@@ -14,7 +14,7 @@ groups:
1414
dtype: int
1515
shape:
1616
- 2
17-
doc: ' the 2d imaging frame size in voxels'
17+
doc: the 2d imaging frame size in voxels
1818
- name: imaging_mode
1919
dtype: text
2020
doc: the acquisition mode for the experiment; pointing = single-voxel ROIs, miniscan
@@ -25,8 +25,8 @@ groups:
2525
shape:
2626
- null
2727
- 4
28-
doc: "pockels data set, recording calibration data for focusing at different z-planesin\
29-
\ four columns: Z offset from focal plane (micrometres), normalised Z,'Pockels'\
28+
doc: "pockels data set, recording calibration data for focusing at different z-planes\
29+
\ in four columns: Z offset from focal plane (micrometres), normalised Z, 'Pockels'\
3030
\ i.e. laser power in %, and z offset for drive motors"
3131
attributes:
3232
- name: columns

tests/data/161215_15_34_21.sig2

Lines changed: 199 additions & 216 deletions
Large diffs are not rendered by default.

tests/data/161215_15_58_52.sig2

Lines changed: 199 additions & 216 deletions
Large diffs are not rendered by default.

tests/data/161222_16_18_47.sig2

Lines changed: 168 additions & 185 deletions
Large diffs are not rendered by default.

tests/data/170317_10_11_01.sig2

Lines changed: 6071 additions & 18150 deletions
Large diffs are not rendered by default.

tests/data/170322_14_06_43.sig2

Lines changed: 3669 additions & 3435 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)