Skip to content

Commit a494d4e

Browse files
github-actions[bot]github-actions[bot]
committed
bump schema version [skip actions]
1 parent 0a6e247 commit a494d4e

File tree

9 files changed

+474
-26
lines changed

9 files changed

+474
-26
lines changed

‎schemas/acquisition_schema.json‎

Lines changed: 211 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,18 @@
515515
"title": "Description",
516516
"type": "string"
517517
},
518+
"measured_at": {
519+
"anyOf": [
520+
{
521+
"type": "string"
522+
},
523+
{
524+
"type": "null"
525+
}
526+
],
527+
"default": null,
528+
"title": "Measurement location"
529+
},
518530
"input": {
519531
"description": "Calibration input",
520532
"items": {
@@ -582,6 +594,9 @@
582594
},
583595
{
584596
"$ref": "#/$defs/PressureUnit"
597+
},
598+
{
599+
"$ref": "#/$defs/TorqueUnit"
585600
}
586601
],
587602
"title": "Input unit"
@@ -666,6 +681,9 @@
666681
},
667682
{
668683
"$ref": "#/$defs/PressureUnit"
684+
},
685+
{
686+
"$ref": "#/$defs/TorqueUnit"
669687
}
670688
],
671689
"title": "Output unit"
@@ -742,6 +760,34 @@
742760
"title": "CalibrationFit",
743761
"type": "object"
744762
},
763+
"CatheterConfig": {
764+
"additionalProperties": false,
765+
"description": "Configuration of a catheter",
766+
"properties": {
767+
"object_type": {
768+
"const": "Catheter config",
769+
"default": "Catheter config",
770+
"title": "Object Type",
771+
"type": "string"
772+
},
773+
"device_name": {
774+
"description": "Must match a device defined in the instrument.json",
775+
"title": "Device name",
776+
"type": "string"
777+
},
778+
"targeted_structure": {
779+
"$ref": "#/$defs/MouseAnatomyModel",
780+
"description": "Use options from MouseBloodVessels",
781+
"title": "Targeted blood vessel"
782+
}
783+
},
784+
"required": [
785+
"device_name",
786+
"targeted_structure"
787+
],
788+
"title": "CatheterConfig",
789+
"type": "object"
790+
},
745791
"Channel": {
746792
"additionalProperties": false,
747793
"description": "Configuration of a channel",
@@ -1483,6 +1529,7 @@
14831529
"discriminator": {
14841530
"mapping": {
14851531
"Air puff config": "#/$defs/AirPuffConfig",
1532+
"Catheter config": "#/$defs/CatheterConfig",
14861533
"Detector config": "#/$defs/DetectorConfig",
14871534
"Ephys assembly config": "#/$defs/EphysAssemblyConfig",
14881535
"Fiber assembly config": "#/$defs/FiberAssemblyConfig",
@@ -1541,6 +1588,9 @@
15411588
},
15421589
{
15431590
"$ref": "#/$defs/EphysAssemblyConfig"
1591+
},
1592+
{
1593+
"$ref": "#/$defs/CatheterConfig"
15441594
}
15451595
]
15461596
},
@@ -2086,6 +2136,19 @@
20862136
],
20872137
"default": null,
20882138
"title": "Excitation power unit"
2139+
},
2140+
"power_measured_at": {
2141+
"anyOf": [
2142+
{
2143+
"type": "string"
2144+
},
2145+
{
2146+
"type": "null"
2147+
}
2148+
],
2149+
"default": null,
2150+
"description": "For example: objective, patch cable, etc",
2151+
"title": "Power measurement location"
20892152
}
20902153
},
20912154
"required": [
@@ -2244,6 +2307,19 @@
22442307
],
22452308
"default": null,
22462309
"title": "Excitation power unit"
2310+
},
2311+
"power_measured_at": {
2312+
"anyOf": [
2313+
{
2314+
"type": "string"
2315+
},
2316+
{
2317+
"type": "null"
2318+
}
2319+
],
2320+
"default": null,
2321+
"description": "For example: objective, patch cable, etc",
2322+
"title": "Power measurement location"
22472323
}
22482324
},
22492325
"required": [
@@ -2660,6 +2736,29 @@
26602736
"title": "MemoryUnit",
26612737
"type": "string"
26622738
},
2739+
"MouseAnatomyModel": {
2740+
"description": "Base model for mouse anatomy",
2741+
"properties": {
2742+
"name": {
2743+
"title": "Name",
2744+
"type": "string"
2745+
},
2746+
"registry": {
2747+
"$ref": "#/$defs/Registry"
2748+
},
2749+
"registry_identifier": {
2750+
"title": "Registry Identifier",
2751+
"type": "string"
2752+
}
2753+
},
2754+
"required": [
2755+
"name",
2756+
"registry",
2757+
"registry_identifier"
2758+
],
2759+
"title": "MouseAnatomyModel",
2760+
"type": "object"
2761+
},
26632762
"MousePlatformConfig": {
26642763
"additionalProperties": false,
26652764
"description": "Configuration for mouse platforms",
@@ -2712,6 +2811,80 @@
27122811
"title": "MriScanSequence",
27132812
"type": "string"
27142813
},
2814+
"OlfactometerChannelInfo": {
2815+
"additionalProperties": false,
2816+
"description": "Configuration of a channel in an olfactometer",
2817+
"properties": {
2818+
"object_type": {
2819+
"const": "Olfactometer channel info",
2820+
"default": "Olfactometer channel info",
2821+
"title": "Object Type",
2822+
"type": "string"
2823+
},
2824+
"channel_index": {
2825+
"title": "Channel index",
2826+
"type": "integer"
2827+
},
2828+
"odorant": {
2829+
"title": "Odorant",
2830+
"type": "string"
2831+
},
2832+
"dilution": {
2833+
"anyOf": [
2834+
{
2835+
"type": "number"
2836+
},
2837+
{
2838+
"type": "string"
2839+
}
2840+
],
2841+
"title": "Odorant dilution"
2842+
},
2843+
"dilution_unit": {
2844+
"$ref": "#/$defs/ConcentrationUnit",
2845+
"default": "% v/v",
2846+
"title": "Dilution unit"
2847+
}
2848+
},
2849+
"required": [
2850+
"channel_index",
2851+
"odorant",
2852+
"dilution"
2853+
],
2854+
"title": "OlfactometerChannelInfo",
2855+
"type": "object"
2856+
},
2857+
"OlfactometerConfig": {
2858+
"additionalProperties": false,
2859+
"description": "Configuration of olfactometer",
2860+
"properties": {
2861+
"object_type": {
2862+
"const": "Olfactometer config",
2863+
"default": "Olfactometer config",
2864+
"title": "Object Type",
2865+
"type": "string"
2866+
},
2867+
"device_name": {
2868+
"description": "Must match a device defined in the instrument.json",
2869+
"title": "Device name",
2870+
"type": "string"
2871+
},
2872+
"channel_configs": {
2873+
"description": "List of channels with their odorant and concentration",
2874+
"items": {
2875+
"$ref": "#/$defs/OlfactometerChannelInfo"
2876+
},
2877+
"title": "Channel configurations",
2878+
"type": "array"
2879+
}
2880+
},
2881+
"required": [
2882+
"device_name",
2883+
"channel_configs"
2884+
],
2885+
"title": "OlfactometerConfig",
2886+
"type": "object"
2887+
},
27152888
"Origin": {
27162889
"description": "Origin positions for coordinate systems",
27172890
"enum": [
@@ -3185,6 +3358,18 @@
31853358
"title": "Description",
31863359
"type": "string"
31873360
},
3361+
"measured_at": {
3362+
"anyOf": [
3363+
{
3364+
"type": "string"
3365+
},
3366+
{
3367+
"type": "null"
3368+
}
3369+
],
3370+
"default": null,
3371+
"title": "Measurement location"
3372+
},
31883373
"input": {
31893374
"description": "Power, voltage, or percentage input strength",
31903375
"items": {
@@ -4529,6 +4714,7 @@
45294714
"Laser config": "#/$defs/LaserConfig",
45304715
"Light emitting diode config": "#/$defs/LightEmittingDiodeConfig",
45314716
"Mouse platform config": "#/$defs/MousePlatformConfig",
4717+
"Olfactometer config": "#/$defs/OlfactometerConfig",
45324718
"Speaker config": "#/$defs/SpeakerConfig"
45334719
},
45344720
"propertyName": "object_type"
@@ -4545,6 +4731,9 @@
45454731
},
45464732
{
45474733
"$ref": "#/$defs/MousePlatformConfig"
4734+
},
4735+
{
4736+
"$ref": "#/$defs/OlfactometerConfig"
45484737
}
45494738
]
45504739
},
@@ -4633,6 +4822,14 @@
46334822
"title": "TimeUnit",
46344823
"type": "string"
46354824
},
4825+
"TorqueUnit": {
4826+
"description": "Torque units",
4827+
"enum": [
4828+
"newton meter"
4829+
],
4830+
"title": "TorqueUnit",
4831+
"type": "string"
4832+
},
46364833
"Translation": {
46374834
"additionalProperties": false,
46384835
"description": "Translation",
@@ -4720,6 +4917,18 @@
47204917
"title": "Description",
47214918
"type": "string"
47224919
},
4920+
"measured_at": {
4921+
"anyOf": [
4922+
{
4923+
"type": "string"
4924+
},
4925+
{
4926+
"type": "null"
4927+
}
4928+
],
4929+
"default": null,
4930+
"title": "Measurement location"
4931+
},
47234932
"input": {
47244933
"description": "Length of time solenoid/valve is open",
47254934
"items": {
@@ -9782,8 +9991,8 @@
97829991
"type": "string"
97839992
},
97849993
"schema_version": {
9785-
"const": "2.0.36",
9786-
"default": "2.0.36",
9994+
"const": "2.1.0",
9995+
"default": "2.1.0",
97879996
"title": "Schema Version",
97889997
"type": "string"
97899998
},

‎schemas/data_description_schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,8 +1498,8 @@
14981498
"type": "string"
14991499
},
15001500
"schema_version": {
1501-
"const": "2.1.1",
1502-
"default": "2.1.1",
1501+
"const": "2.2.0",
1502+
"default": "2.2.0",
15031503
"title": "Schema Version",
15041504
"type": "string"
15051505
},

0 commit comments

Comments
 (0)