Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Standardize units of measurement to use CMIXF-12 #446

Draft
wants to merge 7 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/nwb.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ groups:
doc: Sampling rate, in Hz.
- name: unit
dtype: text
value: seconds
doc: Unit of measurement for time, which is fixed to 'seconds'.
value: s
doc: Unit of measurement for time, which is fixed to 's'.
- name: timestamps
dtype: float64
dims:
Expand All @@ -146,8 +146,8 @@ groups:
doc: Value is '1'
- name: unit
dtype: text
value: seconds
doc: Unit of measurement for timestamps, which is fixed to 'seconds'.
value: s
doc: Unit of measurement for timestamps, which is fixed to 's'.
- name: control
dtype: uint8
dims:
Expand Down
4 changes: 2 additions & 2 deletions core/nwb.behavior.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ groups:
attributes:
- name: unit
dtype: text
default_value: meters
default_value: m
doc: Base unit of measurement for working with the data. The default value
is 'meters'. Actual stored values are not necessarily stored in these units.
is 'm'. Actual stored values are not necessarily stored in these units.
To access the data in these units, multiply 'data' by 'conversion'.
required: false
- name: reference_frame
Expand Down
16 changes: 8 additions & 8 deletions core/nwb.ecephys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ groups:
attributes:
- name: unit
dtype: text
value: volts
value: V
doc: Base unit of measurement for working with the data. This value is fixed to
'volts'. Actual stored values are not necessarily stored in these units. To
'V'. Actual stored values are not necessarily stored in these units. To
access the data in these units, multiply 'data' by 'conversion' and
'channel_conversion' (if present).
- name: electrodes
Expand Down Expand Up @@ -84,8 +84,8 @@ groups:
attributes:
- name: unit
dtype: text
value: volts
doc: Unit of measurement for waveforms, which is fixed to 'volts'.
value: V
doc: Unit of measurement for waveforms, which is fixed to 'V'.
- name: timestamps
dtype: float64
dims:
Expand All @@ -103,8 +103,8 @@ groups:
doc: Value is '1'
- name: unit
dtype: text
value: seconds
doc: Unit of measurement for timestamps, which is fixed to 'seconds'.
value: s
doc: Unit of measurement for timestamps, which is fixed to 's'.

- neurodata_type_def: FeatureExtraction
neurodata_type_inc: NWBDataInterface
Expand Down Expand Up @@ -170,8 +170,8 @@ groups:
attributes:
- name: unit
dtype: text
value: seconds
doc: Unit of measurement for event times, which is fixed to 'seconds'.
value: s
doc: Unit of measurement for event times, which is fixed to 's'.
links:
- name: source_electricalseries
target_type: ElectricalSeries
Expand Down
2 changes: 1 addition & 1 deletion core/nwb.file.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ groups:
attributes:
- name: nwb_version
dtype: text
value: 2.2.5
value: 2.3.0-alpha
doc: File version string. Use semantic versioning, e.g. 1.2.1. This will be the
name of the format with trailing major, minor and patch numbers.
datasets:
Expand Down
59 changes: 37 additions & 22 deletions core/nwb.icephys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,37 @@ groups:
attributes:
- name: unit
dtype: text
value: volts
doc: Base unit of measurement for working with the data. which is fixed to 'volts'.
value: V
doc: Base unit of measurement for working with the data. which is fixed to 'V'.
Actual stored values are not necessarily stored in these units. To access the data in these units,
multiply 'data' by 'conversion'.
- name: bias_current
dtype: float32
doc: Bias current, in amps.
quantity: '?'
attributes:
- name: unit
dtype: text
value: A
doc: Unit of measurement for bias_current, which is fixed to 'A'.
- name: bridge_balance
dtype: float32
doc: Bridge balance, in ohms.
quantity: '?'
attributes:
- name: unit
dtype: text
value: Ohm
doc: Unit of measurement for bridge_balance, which is fixed to 'Ohm'.
- name: capacitance_compensation
dtype: float32
doc: Capacitance compensation, in farads.
quantity: '?'
attributes:
- name: unit
dtype: text
value: F
doc: Unit of measurement for capacitance_compensation, which is fixed to 'F'.

- neurodata_type_def: IZeroClampSeries
neurodata_type_inc: CurrentClampSeries
Expand Down Expand Up @@ -92,8 +107,8 @@ groups:
attributes:
- name: unit
dtype: text
value: amperes
doc: Base unit of measurement for working with the data. which is fixed to 'amperes'.
value: A
doc: Base unit of measurement for working with the data. which is fixed to 'A'.
Actual stored values are not necessarily stored in these units. To access the data in these units,
multiply 'data' by 'conversion'.

Expand All @@ -108,8 +123,8 @@ groups:
attributes:
- name: unit
dtype: text
value: amperes
doc: Base unit of measurement for working with the data. which is fixed to 'amperes'.
value: A
doc: Base unit of measurement for working with the data. which is fixed to 'A'.
Actual stored values are not necessarily stored in these units. To access the data in these units,
multiply 'data' by 'conversion'.
- name: capacitance_fast
Expand All @@ -119,62 +134,62 @@ groups:
attributes:
- name: unit
dtype: text
value: farads
doc: Unit of measurement for capacitance_fast, which is fixed to 'farads'.
value: F
doc: Unit of measurement for capacitance_fast, which is fixed to 'F'.
- name: capacitance_slow
dtype: float32
doc: Slow capacitance, in farads.
quantity: '?'
attributes:
- name: unit
dtype: text
value: farads
doc: Unit of measurement for capacitance_fast, which is fixed to 'farads'.
value: F
doc: Unit of measurement for capacitance_fast, which is fixed to 'F'.
- name: resistance_comp_bandwidth
dtype: float32
doc: Resistance compensation bandwidth, in hertz.
quantity: '?'
attributes:
- name: unit
dtype: text
value: hertz
doc: Unit of measurement for resistance_comp_bandwidth, which is fixed to 'hertz'.
value: Hz
doc: Unit of measurement for resistance_comp_bandwidth, which is fixed to 'Hz'.
- name: resistance_comp_correction
dtype: float32
doc: Resistance compensation correction, in percent.
quantity: '?'
attributes:
- name: unit
dtype: text
value: percent
doc: Unit of measurement for resistance_comp_correction, which is fixed to 'percent'.
value: '%'
doc: Unit of measurement for resistance_comp_correction, which is fixed to '%'.
- name: resistance_comp_prediction
dtype: float32
doc: Resistance compensation prediction, in percent.
quantity: '?'
attributes:
- name: unit
dtype: text
value: percent
doc: Unit of measurement for resistance_comp_prediction, which is fixed to 'percent'.
value: '%'
doc: Unit of measurement for resistance_comp_prediction, which is fixed to '%'.
- name: whole_cell_capacitance_comp
dtype: float32
doc: Whole cell capacitance compensation, in farads.
quantity: '?'
attributes:
- name: unit
dtype: text
value: farads
doc: Unit of measurement for whole_cell_capacitance_comp, which is fixed to 'farads'.
value: F
doc: Unit of measurement for whole_cell_capacitance_comp, which is fixed to 'F'.
- name: whole_cell_series_resistance_comp
dtype: float32
doc: Whole cell series resistance compensation, in ohms.
quantity: '?'
attributes:
- name: unit
dtype: text
value: ohms
doc: Unit of measurement for whole_cell_series_resistance_comp, which is fixed to 'ohms'.
value: Ohm
doc: Unit of measurement for whole_cell_series_resistance_comp, which is fixed to 'Ohm'.

- neurodata_type_def: VoltageClampStimulusSeries
neurodata_type_inc: PatchClampSeries
Expand All @@ -185,8 +200,8 @@ groups:
attributes:
- name: unit
dtype: text
value: volts
doc: Base unit of measurement for working with the data. which is fixed to 'volts'.
value: V
doc: Base unit of measurement for working with the data. which is fixed to 'V'.
Actual stored values are not necessarily stored in these units. To access the data in these units,
multiply 'data' by 'conversion'.

Expand Down
21 changes: 7 additions & 14 deletions core/nwb.misc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ groups:
attributes:
- name: unit
dtype: text
default_value: see 'feature_units'
default_value: n/a
doc: Since there can be different units for different features, store the units
in 'feature_units'. The default value for this attribute is "see 'feature_units'".
in 'feature_units'. The default value for this attribute is "n/a".
required: false
- name: feature_units
dtype: text
dims:
- num_features
shape:
- null
doc: Units of each feature.
doc: Units of measurement of each feature.
quantity: '?'
- name: features
dtype: text
Expand Down Expand Up @@ -115,13 +115,6 @@ groups:
- null
- null
doc: Data decomposed into frequency bands.
attributes:
- name: unit
dtype: text
default_value: no unit
doc: Base unit of measurement for working with the data. Actual stored values are
not necessarily stored in these units. To access the data in these units,
multiply 'data' by 'conversion'.
- name: metric
dtype: text
doc: The metric used, e.g. phase, amplitude, power.
Expand Down Expand Up @@ -247,8 +240,8 @@ groups:
required: false
- name: unit
dtype: text
value: volts
doc: Unit of measurement. This value is fixed to 'volts'.
value: V
doc: Unit of measurement. This value is fixed to 'V'.
required: false
- name: waveform_sd
neurodata_type_inc: VectorData
Expand All @@ -274,6 +267,6 @@ groups:
required: false
- name: unit
dtype: text
value: volts
doc: Unit of measurement. This value is fixed to 'volts'.
value: V
doc: Unit of measurement. This value is fixed to 'V'.
required: false
2 changes: 1 addition & 1 deletion core/nwb.namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ namespaces:
- doc: This source module contains neurodata_type for retinotopy data.
source: nwb.retinotopy.yaml
title: Retinotopy
version: 2.2.5
version: 2.3.0-alpha
4 changes: 2 additions & 2 deletions core/nwb.ogen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ groups:
attributes:
- name: unit
dtype: text
value: watts
doc: Unit of measurement for data, which is fixed to 'watts'.
value: W
doc: Unit of measurement for data, which is fixed to 'W'.
links:
- name: site
target_type: OptogeneticStimulusSite
Expand Down
12 changes: 6 additions & 6 deletions core/nwb.ophys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ groups:
required: false
- name: unit
dtype: text
default_value: meters
doc: Base unit of measurement for working with the data. The default value is 'meters'.
default_value: m
doc: Base unit of measurement for working with the data. The default value is 'm'.
required: false
- name: origin_coords
dtype: float32
Expand All @@ -243,8 +243,8 @@ groups:
attributes:
- name: unit
dtype: text
default_value: meters
doc: Measurement units for origin_coords. The default value is 'meters'.
default_value: m
doc: Measurement units for origin_coords. The default value is 'm'.
- name: grid_spacing
dtype: float32
dims:
Expand All @@ -259,8 +259,8 @@ groups:
attributes:
- name: unit
dtype: text
default_value: meters
doc: Measurement units for grid_spacing. The default value is 'meters'.
default_value: m
doc: Measurement units for grid_spacing. The default value is 'm'.
- name: reference_frame
dtype: text
doc: Describes reference frame of origin_coords and grid_spacing.
Expand Down
8 changes: 4 additions & 4 deletions core/nwb.retinotopy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ groups:
doc: Size of viewing area, in meters.
- name: unit
dtype: text
doc: Unit that axis data is stored in (e.g., degrees).
doc: Unit of measurement for axis data, e.g., "o" for degrees.
- name: axis_1_power_map
dtype: float32
dims:
Expand Down Expand Up @@ -69,7 +69,7 @@ groups:
doc: Size of viewing area, in meters.
- name: unit
dtype: text
doc: Unit that axis data is stored in (e.g., degrees).
doc: Unit of measurement for axis data, e.g., "o" for degrees.
- name: axis_2_phase_map
dtype: float32
dims:
Expand Down Expand Up @@ -97,7 +97,7 @@ groups:
doc: Size of viewing area, in meters.
- name: unit
dtype: text
doc: Unit that axis data is stored in (e.g., degrees).
doc: Unit of measurement for axis data, e.g., "o" for degrees.
- name: axis_2_power_map
dtype: float32
dims:
Expand Down Expand Up @@ -127,7 +127,7 @@ groups:
doc: Size of viewing area, in meters.
- name: unit
dtype: text
doc: Unit that axis data is stored in (e.g., degrees).
doc: Unit of measurement for axis data, e.g., "o" for degrees.
- name: axis_descriptions
dtype: text
dims:
Expand Down
2 changes: 1 addition & 1 deletion docs/format/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def setup(app):
# built documents.
#
# The short X.Y version.
version = 'v2.2.5'
version = 'v2.3.0-alpha'
# The full version, including alpha/beta/rc tags.
release = version

Expand Down
Loading