Skip to content

Commit fe9ee8a

Browse files
authored
Merge pull request #607 from AllenNeuralDynamics/feat-588-DAQ-validator
Feat 588 daq validator
2 parents c8aca03 + 951e6b6 commit fe9ee8a

File tree

14 files changed

+239
-995
lines changed

14 files changed

+239
-995
lines changed

examples/exaspim_instrument.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"light_sources": [
9393
{
9494
"device_type": "Laser",
95-
"name": null,
95+
"name": "LAS-08307",
9696
"serial_number": "LAS-08307",
9797
"manufacturer": {
9898
"name": "Oxxius",
@@ -114,7 +114,7 @@
114114
},
115115
{
116116
"device_type": "Laser",
117-
"name": null,
117+
"name": "LAS-08308",
118118
"serial_number": "LAS-08308",
119119
"manufacturer": {
120120
"name": "Oxxius",
@@ -136,7 +136,7 @@
136136
},
137137
{
138138
"device_type": "Laser",
139-
"name": null,
139+
"name": "539251",
140140
"serial_number": "539251",
141141
"manufacturer": {
142142
"name": "Oxxius",
@@ -158,7 +158,7 @@
158158
},
159159
{
160160
"device_type": "Laser",
161-
"name": null,
161+
"name": "LAS-08309",
162162
"serial_number": "LAS-08309",
163163
"manufacturer": {
164164
"name": "Oxxius",
@@ -213,7 +213,7 @@
213213
"scanning_stages": [
214214
{
215215
"device_type": "Motorized stage",
216-
"name": null,
216+
"name": "stage-x",
217217
"serial_number": "Unknown",
218218
"manufacturer": {
219219
"name": "Applied Scientific Instrumentation",
@@ -355,7 +355,7 @@
355355
"additional_devices": [
356356
{
357357
"device_type": "AdditionalImagingDevice",
358-
"name": null,
358+
"name": "TL-1",
359359
"serial_number": "01",
360360
"manufacturer": {
361361
"name": "Optotune",

examples/exaspim_instrument.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
],
3434
light_sources=[
3535
Laser(
36+
name="LAS-08307",
3637
coupling="Single-mode fiber",
3738
wavelength=405,
3839
maximum_power=200,
@@ -41,6 +42,7 @@
4142
notes="Housed in commercial laser combiner",
4243
),
4344
Laser(
45+
name="LAS-08308",
4446
coupling="Single-mode fiber",
4547
wavelength=488,
4648
maximum_power=200,
@@ -49,6 +51,7 @@
4951
notes="Housed in commercial laser combiner",
5052
),
5153
Laser(
54+
name="539251",
5255
coupling="Single-mode fiber",
5356
wavelength=561,
5457
maximum_power=200,
@@ -57,6 +60,7 @@
5760
notes="Housed in commercial laser combiner",
5861
),
5962
Laser(
63+
name="LAS-08309",
6064
coupling="Single-mode fiber",
6165
wavelength=638,
6266
maximum_power=200,
@@ -127,6 +131,7 @@
127131
],
128132
scanning_stages=[
129133
instrument.ScanningStage(
134+
name="stage-x",
130135
stage_axis_direction="Detection axis",
131136
stage_axis_name="X",
132137
travel=1000,
@@ -154,6 +159,7 @@
154159
additional_devices=[
155160
instrument.AdditionalImagingDevice(
156161
type="Tunable lens",
162+
name="TL-1",
157163
manufacturer=Manufacturer.OPTOTUNE,
158164
model="EL-16-40-TC-VIS-20D-C",
159165
serial_number="01",

0 commit comments

Comments
 (0)