Skip to content

Commit 7237857

Browse files
authored
Merge pull request #603 from AllenNeuralDynamics/feat-behavior-items
Feat behavior items
2 parents e23f69e + dd0a151 commit 7237857

31 files changed

+211
-45
lines changed

examples/aibs_smartspim_instrument.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/imaging/instrument.py",
3-
"schema_version": "0.9.3",
3+
"schema_version": "0.9.4",
44
"instrument_id": "SmartSPIM2-2",
55
"modification_date": "2023-10-04",
66
"instrument_type": "SmartSPIM",
@@ -24,13 +24,15 @@
2424
"registry_identifier": null
2525
},
2626
"model": "CleanTop",
27+
"path_to_cad": null,
2728
"notes": null,
2829
"length": 35,
2930
"width": 29,
3031
"table_size_unit": "inch",
3132
"vibration_control": true
3233
}
3334
],
35+
"enclosure": null,
3436
"objectives": [
3537
{
3638
"device_type": "Objective",
@@ -46,6 +48,7 @@
4648
"registry_identifier": "04gsnvb07"
4749
},
4850
"model": "TL4X-SAP",
51+
"path_to_cad": null,
4952
"notes": "Thorlabs TL4X-SAP with LifeCanvas dipping cap and correction optics.",
5053
"numerical_aperture": 0.2,
5154
"magnification": 3.6,
@@ -68,6 +71,7 @@
6871
"registry_identifier": "03natb733"
6972
},
7073
"model": "C14440-20UP",
74+
"path_to_cad": null,
7175
"notes": null,
7276
"detector_type": "Camera",
7377
"data_interface": "USB",
@@ -100,6 +104,7 @@
100104
"registry_identifier": null
101105
},
102106
"model": "Stradus",
107+
"path_to_cad": null,
103108
"notes": "All lasers controlled via Vortran VersaLase System",
104109
"wavelength": 488,
105110
"wavelength_unit": "nanometer",
@@ -124,6 +129,7 @@
124129
"registry_identifier": "031tysd23"
125130
},
126131
"model": "Obis",
132+
"path_to_cad": null,
127133
"notes": "All lasers controlled via Vortran VersaLase System",
128134
"wavelength": 561,
129135
"wavelength_unit": "nanometer",
@@ -145,6 +151,7 @@
145151
"registry_identifier": null
146152
},
147153
"model": "Stradus",
154+
"path_to_cad": null,
148155
"notes": "All lasers controlled via Vortran VersaLase System",
149156
"wavelength": 647,
150157
"wavelength_unit": "nanometer",
@@ -169,6 +176,7 @@
169176
"registry_identifier": null
170177
},
171178
"model": "FF03-525/50-25",
179+
"path_to_cad": null,
172180
"notes": null,
173181
"filter_type": "Band pass",
174182
"diameter": 25,
@@ -195,6 +203,7 @@
195203
"registry_identifier": null
196204
},
197205
"model": "FF01-600/52-25",
206+
"path_to_cad": null,
198207
"notes": null,
199208
"filter_type": "Band pass",
200209
"diameter": 25,
@@ -221,6 +230,7 @@
221230
"registry_identifier": null
222231
},
223232
"model": "ET690/50m",
233+
"path_to_cad": null,
224234
"notes": null,
225235
"filter_type": "Band pass",
226236
"diameter": 25,
@@ -249,6 +259,7 @@
249259
"registry_identifier": null
250260
},
251261
"model": "LS-100",
262+
"path_to_cad": null,
252263
"notes": "Focus stage",
253264
"travel": 100,
254265
"travel_unit": "millimeter",
@@ -265,6 +276,7 @@
265276
"registry_identifier": null
266277
},
267278
"model": "L12-20F-4",
279+
"path_to_cad": null,
268280
"notes": "Cylindrical lens #1",
269281
"travel": 41,
270282
"travel_unit": "millimeter",
@@ -281,6 +293,7 @@
281293
"registry_identifier": null
282294
},
283295
"model": "L12-20F-4",
296+
"path_to_cad": null,
284297
"notes": "Cylindrical lens #2",
285298
"travel": 41,
286299
"travel_unit": "millimeter",
@@ -297,6 +310,7 @@
297310
"registry_identifier": null
298311
},
299312
"model": "L12-20F-4",
313+
"path_to_cad": null,
300314
"notes": "Cylindrical lens #3",
301315
"travel": 41,
302316
"travel_unit": "millimeter",
@@ -313,6 +327,7 @@
313327
"registry_identifier": null
314328
},
315329
"model": "L12-20F-4",
330+
"path_to_cad": null,
316331
"notes": "Cylindrical lens #4",
317332
"travel": 41,
318333
"travel_unit": "millimeter",
@@ -331,6 +346,7 @@
331346
"registry_identifier": null
332347
},
333348
"model": "LS-50",
349+
"path_to_cad": null,
334350
"notes": "Sample stage Z",
335351
"travel": 50,
336352
"travel_unit": "millimeter",
@@ -349,6 +365,7 @@
349365
"registry_identifier": null
350366
},
351367
"model": "LS-50",
368+
"path_to_cad": null,
352369
"notes": "Sample stage X",
353370
"travel": 50,
354371
"travel_unit": "millimeter",
@@ -367,6 +384,7 @@
367384
"registry_identifier": null
368385
},
369386
"model": "LS-50",
387+
"path_to_cad": null,
370388
"notes": "Sample stage Y",
371389
"travel": 50,
372390
"travel_unit": "millimeter",
@@ -388,6 +406,7 @@
388406
"registry_identifier": null
389407
},
390408
"model": "EL-16-40-TC",
409+
"path_to_cad": null,
391410
"notes": null,
392411
"type": "Other"
393412
},
@@ -402,6 +421,7 @@
402421
"registry_identifier": null
403422
},
404423
"model": "EL-16-40-TC",
424+
"path_to_cad": null,
405425
"notes": null,
406426
"type": "Other"
407427
},
@@ -416,6 +436,7 @@
416436
"registry_identifier": null
417437
},
418438
"model": "Large-uncoated-glass",
439+
"path_to_cad": null,
419440
"notes": null,
420441
"type": "Sample Chamber"
421442
}

examples/aibs_smartspim_procedures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/procedures.py",
3-
"schema_version": "0.9.6",
3+
"schema_version": "0.9.7",
44
"subject_id": "651286",
55
"subject_procedures": [],
66
"specimen_procedures": [

0 commit comments

Comments
 (0)