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.

Sign up for GitHub

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

Feat 588 daq validator #607

Merged
merged 18 commits into from
Nov 27, 2023
Merged

Feat 588 daq validator #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fc309d4
Update rig.py
Sun-flow Nov 7, 2023
2755883
checking for typing
Sun-flow Nov 9, 2023
5ec7688
Update rig.py
Sun-flow Nov 10, 2023
db8c3f5
consolidating loops
Sun-flow Nov 15, 2023
d978f21
Update rig.py
Sun-flow Nov 15, 2023
b3ea8d6
Merge branch 'main' into feat-588-DAQ-validator
Sun-flow Nov 15, 2023
ba433e6
cleanup
Sun-flow Nov 15, 2023
2e8b3e4
adding validator to instrument
Sun-flow Nov 17, 2023
d2fc0c4
exaspim example
saskiad Nov 18, 2023
d9bf60d
Removing outdated example, will be re-uploaded in new ticket
Sun-flow Nov 20, 2023
3470afb
Update rig.py
Sun-flow Nov 20, 2023
809afe4
Merge branch 'feat-588-DAQ-validator' of https://github.com/AllenNeur…
Sun-flow Nov 20, 2023
f6eaecf
feat: updates enum unit tests
jtyoung84 Nov 21, 2023
7583847
test coverage
Sun-flow Nov 21, 2023
944e5e6
linters
Sun-flow Nov 21, 2023
d1d2699
Update test_imaging.py
Sun-flow Nov 21, 2023
771e5d6
updating example to use an imaging example
Sun-flow Nov 22, 2023
951e6b6
unused imports
Sun-flow Nov 22, 2023
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
12 changes: 6 additions & 6 deletions examples/exaspim_instrument.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"light_sources": [
{
"device_type": "Laser",
"name": null,
"name": "LAS-08307",
"serial_number": "LAS-08307",
"manufacturer": {
"name": "Oxxius",
Expand All @@ -114,7 +114,7 @@
},
{
"device_type": "Laser",
"name": null,
"name": "LAS-08308",
"serial_number": "LAS-08308",
"manufacturer": {
"name": "Oxxius",
Expand All @@ -136,7 +136,7 @@
},
{
"device_type": "Laser",
"name": null,
"name": "539251",
"serial_number": "539251",
"manufacturer": {
"name": "Oxxius",
Expand All @@ -158,7 +158,7 @@
},
{
"device_type": "Laser",
"name": null,
"name": "LAS-08309",
"serial_number": "LAS-08309",
"manufacturer": {
"name": "Oxxius",
Expand Down Expand Up @@ -213,7 +213,7 @@
"scanning_stages": [
{
"device_type": "Motorized stage",
"name": null,
"name": "stage-x",
"serial_number": "Unknown",
"manufacturer": {
"name": "Applied Scientific Instrumentation",
Expand Down Expand Up @@ -355,7 +355,7 @@
"additional_devices": [
{
"device_type": "AdditionalImagingDevice",
"name": null,
"name": "TL-1",
"serial_number": "01",
"manufacturer": {
"name": "Optotune",
Expand Down
6 changes: 6 additions & 0 deletions examples/exaspim_instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
],
light_sources=[
Laser(
name="LAS-08307",
coupling="Single-mode fiber",
wavelength=405,
maximum_power=200,
Expand All @@ -41,6 +42,7 @@
notes="Housed in commercial laser combiner",
),
Laser(
name="LAS-08308",
coupling="Single-mode fiber",
wavelength=488,
maximum_power=200,
Expand All @@ -49,6 +51,7 @@
notes="Housed in commercial laser combiner",
),
Laser(
name="539251",
coupling="Single-mode fiber",
wavelength=561,
maximum_power=200,
Expand All @@ -57,6 +60,7 @@
notes="Housed in commercial laser combiner",
),
Laser(
name="LAS-08309",
coupling="Single-mode fiber",
wavelength=638,
maximum_power=200,
Expand Down Expand Up @@ -127,6 +131,7 @@
],
scanning_stages=[
instrument.ScanningStage(
name="stage-x",
stage_axis_direction="Detection axis",
stage_axis_name="X",
travel=1000,
Expand Down Expand Up @@ -154,6 +159,7 @@
additional_devices=[
instrument.AdditionalImagingDevice(
type="Tunable lens",
name="TL-1",
manufacturer=Manufacturer.OPTOTUNE,
model="EL-16-40-TC-VIS-20D-C",
serial_number="01",
Expand Down
Loading