Skip to content

Commit 0d4538f

Browse files
committed
Merge branch 'release-v2.2.0' of https://github.com/AllenNeuralDynamics/aind-data-schema into release-v2.2.0
2 parents 38baff1 + d7e6109 commit 0d4538f

13 files changed

+2159
-162
lines changed

schemas/acquisition_schema.json

Lines changed: 1270 additions & 41 deletions
Large diffs are not rendered by default.

schemas/data_description_schema.json

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,10 @@
164164
"description": "Registries",
165165
"enum": [
166166
"Addgene (ADDGENE)",
167+
"Digital Object Identifier (DOI)",
167168
"Edinburgh Mouse Atlas Project (EMAPA)",
168169
"Mouse Genome Informatics (MGI)",
170+
"NCBI GenBank (GENBANK)",
169171
"National Center for Biotechnology Information (NCBI)",
170172
"Open Researcher and Contributor ID (ORCID)",
171173
"Research Organization Registry (ROR)",
@@ -301,6 +303,26 @@
301303
"title": "_Allen_Institute_For_Neural_Dynamics",
302304
"type": "object"
303305
},
306+
"_Barseq": {
307+
"additionalProperties": false,
308+
"description": "Model BARseq",
309+
"properties": {
310+
"name": {
311+
"const": "Barcoded anatomy resolved by sequencing",
312+
"default": "Barcoded anatomy resolved by sequencing",
313+
"title": "Name",
314+
"type": "string"
315+
},
316+
"abbreviation": {
317+
"const": "BARseq",
318+
"default": "BARseq",
319+
"title": "Abbreviation",
320+
"type": "string"
321+
}
322+
},
323+
"title": "_Barseq",
324+
"type": "object"
325+
},
304326
"_Behavior": {
305327
"additionalProperties": false,
306328
"description": "Model behavior",
@@ -773,6 +795,26 @@
773795
"title": "_Johns_Hopkins_University",
774796
"type": "object"
775797
},
798+
"_Mapseq": {
799+
"additionalProperties": false,
800+
"description": "Model MAPseq",
801+
"properties": {
802+
"name": {
803+
"const": "Multiplexed analysis of projections by sequencing",
804+
"default": "Multiplexed analysis of projections by sequencing",
805+
"title": "Name",
806+
"type": "string"
807+
},
808+
"abbreviation": {
809+
"const": "MAPseq",
810+
"default": "MAPseq",
811+
"title": "Abbreviation",
812+
"type": "string"
813+
}
814+
},
815+
"title": "_Mapseq",
816+
"type": "object"
817+
},
776818
"_Massachusetts_Institute_Of_Technology": {
777819
"description": "Model Massachusetts Institute of Technology",
778820
"properties": {
@@ -1498,8 +1540,8 @@
14981540
"type": "string"
14991541
},
15001542
"schema_version": {
1501-
"const": "2.2.0",
1502-
"default": "2.2.0",
1543+
"const": "2.2.1",
1544+
"default": "2.2.1",
15031545
"title": "Schema Version",
15041546
"type": "string"
15051547
},
@@ -1683,9 +1725,11 @@
16831725
"items": {
16841726
"discriminator": {
16851727
"mapping": {
1728+
"BARseq": "#/$defs/_Barseq",
16861729
"EM": "#/$defs/_Em",
16871730
"EMG": "#/$defs/_Emg",
16881731
"ISI": "#/$defs/_Isi",
1732+
"MAPseq": "#/$defs/_Mapseq",
16891733
"MRI": "#/$defs/_Mri",
16901734
"SPIM": "#/$defs/_Spim",
16911735
"STPT": "#/$defs/_Stpt",
@@ -1704,6 +1748,9 @@
17041748
"propertyName": "abbreviation"
17051749
},
17061750
"oneOf": [
1751+
{
1752+
"$ref": "#/$defs/_Barseq"
1753+
},
17071754
{
17081755
"$ref": "#/$defs/_Behavior"
17091756
},
@@ -1740,6 +1787,9 @@
17401787
{
17411788
"$ref": "#/$defs/_Mri"
17421789
},
1790+
{
1791+
"$ref": "#/$defs/_Mapseq"
1792+
},
17431793
{
17441794
"$ref": "#/$defs/_Merfish"
17451795
},

0 commit comments

Comments
 (0)