Skip to content

Commit

Permalink
Z-Stacking features, Video generation features, others (#361)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmcoreymv
jmcoreymv authored Apr 19, 2024
1 parent 4f9f427 commit 141dc3c
Show file tree
Hide file tree
Showing 17 changed files with 1,388 additions and 685 deletions.
5 changes: 1 addition & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ data/current.json
calls.txt
logs/LVP_Log*
logs/profile/*
capture/**/*.tiff
capture/**/*.tsv
capture/Autofocus Characterization/
capture/Backlash Characterization/
capture/
script_testing.py
venv*/
build/
Expand Down
329 changes: 217 additions & 112 deletions data/objectives.json
View file
Original file line number Diff line number Diff line change
@@ -1,122 +1,227 @@
{
"2.5x": {
"description": "2.5x",
"magnification": 2.5,
"system_magnification": 0.598,
"focal_length": 80.0,
"aperture": 0,
"DOF": 0,
"AF_min": 0,
"AF_max": 0,
"AF_range": 0,
"z_fine": 0,
"z_coarse": 0,
"xy_fine": 0,
"xy_coarse": 0
"1.25x Oly": {
"description": "1.25x Plan Apochromat Olympus",
"magnification": 1.25,
"focal_length": 144.0,
"aperture": 0.04,
"DOF": 1,
"working_distance": 5,
"AF_min": 300,
"AF_max": 1000,
"AF_range": 3000,
"z_fine": 100,
"z_coarse": 1000,
"xy_fine": 300,
"xy_coarse": 3000
},
"4x": {
"description": "4x",
"magnification": 4,
"system_magnification": 1.063,
"focal_length": 45.0,
"aperture": 0.1,
"DOF": 55.5,
"AF_min": 20.0,
"AF_max": 72.0,
"AF_range": 150.0,
"z_fine": 27.75,
"z_coarse": 277.5,
"xy_fine": 100.0,
"xy_coarse": 1000.0
"2.5x Meiji": {
"description": "2.5x Plan Semi Apochromat Meiji",
"magnification": 2.5,
"focal_length": 80.0,
"aperture": 0.07,
"DOF": 100,
"working_distance": 5.7,
"AF_min": 50,
"AF_max": 350,
"AF_range": 1000,
"z_fine": 35,
"z_coarse": 350,
"xy_fine": 200,
"xy_coarse": 2000
},
"10x": {
"description": "10x",
"magnification": 10,
"system_magnification": 2.656,
"focal_length": 18.0,
"aperture": 0.25,
"DOF": 8.5,
"AF_min": 8.0,
"AF_max": 36.0,
"AF_range": 75.0,
"z_fine": 4.25,
"z_coarse": 42.5,
"xy_fine": 40.0,
"xy_coarse": 400.0
"4x Oly": {
"description": "4x U Plan Fl Olympus",
"magnification": 4,
"focal_length": 45.0,
"aperture": 0.13,
"DOF": 55.5,
"working_distance": 17,
"AF_min": 20.0,
"AF_max": 72.0,
"AF_range": 150.0,
"z_fine": 27.75,
"z_coarse": 277.5,
"xy_fine": 100.0,
"xy_coarse": 1000.0
},
"20x": {
"description": "20x",
"magnification": 20,
"system_magnification": 5.311,
"focal_length": 9.0,
"aperture": 0.4,
"DOF": 5.8,
"AF_min": 2.0,
"AF_max": 18.0,
"AF_range": 40.0,
"z_fine": 2.9,
"z_coarse": 29.0,
"xy_fine": 20.0,
"xy_coarse": 200.0
"10x Oly": {
"description": "10x U Plan Fl Olympus",
"magnification": 10,
"focal_length": 18.0,
"aperture": 0.3,
"DOF": 8.5,
"working_distance": 10,
"AF_min": 8.0,
"AF_max": 36.0,
"AF_range": 75.0,
"z_fine": 4.25,
"z_coarse": 42.5,
"xy_fine": 40.0,
"xy_coarse": 400.0
},
"40x": {
"description": "40x",
"magnification": 40,
"system_magnification": 10.622,
"focal_length": 4.5,
"aperture": 0.65,
"DOF": 1.0,
"AF_min": 1.0,
"AF_max": 9.0,
"AF_range": 20.0,
"z_fine": 0.5,
"z_coarse": 5.0,
"xy_fine": 10.0,
"xy_coarse": 100.0
"10x Phase": {
"description": "10x Achromat IPC Phase, 1mm glass, Olympus",
"magnification": 10,
"focal_length": 18.0,
"aperture": 0.25,
"DOF": 8.5,
"working_distance": 8.8,
"AF_min": 8.0,
"AF_max": 36.0,
"AF_range": 75.0,
"z_fine": 4.25,
"z_coarse": 42.5,
"xy_fine": 40.0,
"xy_coarse": 400.0
},
"60x": {
"description": "60x",
"magnification": 60,
"system_magnification": 15.933,
"focal_length": 3.0,
"aperture": 0.85,
"DOF": 0.4,
"AF_min": 0.5,
"AF_max": 6.0,
"AF_range": 15.0,
"z_fine": 0.2,
"z_coarse": 2.0,
"xy_fine": 5.0,
"xy_coarse": 50.0
"20x Oly": {
"description": "20x LWD U Plan Fl, 0.17mm glass, Olympus",
"magnification": 20,
"focal_length": 9.0,
"aperture": 0.5,
"DOF": 5.8,
"working_distance": 2.1,
"AF_min": 2.0,
"AF_max": 18.0,
"AF_range": 40.0,
"z_fine": 2.9,
"z_coarse": 29.0,
"xy_fine": 20.0,
"xy_coarse": 200.0
},
"100x": {
"description": "100x",
"magnification": 100,
"system_magnification": 23.900,
"focal_length": 2.0,
"aperture": 0.95,
"DOF": 0.19,
"AF_min": 0.2,
"AF_max": 4.0,
"AF_range": 10.0,
"z_fine": 0.11,
"z_coarse": 1.1,
"xy_fine": 2.0,
"xy_coarse": 20.0
"20x w/collar": {
"description": "20x LWD U Plan Fl with collar, Olympus",
"magnification": 20,
"focal_length": 9.0,
"aperture": 0.45,
"DOF": 5.8,
"working_distance": 6.6,
"AF_min": 2.0,
"AF_max": 18.0,
"AF_range": 40.0,
"z_fine": 2.9,
"z_coarse": 29.0,
"xy_fine": 20.0,
"xy_coarse": 200.0
},
"100x (oil)": {
"description": "100x (oil)",
"magnification": 111,
"system_magnification": 26.556,
"focal_length": 1.8,
"aperture": 0.95,
"DOF": 0.19,
"AF_min": 0.2,
"AF_max": 4.0,
"AF_range": 10.0,
"z_fine": 0.11,
"z_coarse": 1.1,
"xy_fine": 2.0,
"xy_coarse": 20.0
"20x Phase": {
"description": "20x LWD Achromat IPC Phase, 1mm glass, Olympus",
"magnification": 20,
"focal_length": 9.0,
"aperture": 0.4,
"DOF": 5.8,
"working_distance": 3.2,
"AF_min": 2.0,
"AF_max": 18.0,
"AF_range": 40.0,
"z_fine": 2.9,
"z_coarse": 29.0,
"xy_fine": 20.0,
"xy_coarse": 200.0
},
"40x w/collar": {
"description": "40x LWD U Plan Fl Olympus",
"magnification": 40,
"focal_length": 4.5,
"aperture": 0.60,
"DOF": 1.0,
"working_distance": 2.7,
"AF_min": 1.0,
"AF_max": 9.0,
"AF_range": 20.0,
"z_fine": 0.5,
"z_coarse": 5.0,
"xy_fine": 10.0,
"xy_coarse": 100.0
},
"40x Phase": {
"description": "40x LWD Achromat Phase, 1mm glass, Olympus",
"magnification": 40,
"focal_length": 4.5,
"aperture": 0.55,
"DOF": 1.0,
"working_distance": 2.2,
"AF_min": 1.0,
"AF_max": 9.0,
"AF_range": 20.0,
"z_fine": 0.5,
"z_coarse": 5.0,
"xy_fine": 10.0,
"xy_coarse": 100.0
},
"60x w/collar": {
"description": "60x U Plan UPLFLN60x Olympus",
"magnification": 60,
"focal_length": 3.0,
"aperture": 0.90,
"DOF": 0.4,
"working_distance": 0.2,
"AF_min": 0.5,
"AF_max": 6.0,
"AF_range": 15.0,
"z_fine": 0.2,
"z_coarse": 2.0,
"xy_fine": 5.0,
"xy_coarse": 50.0
},
"60x Meiji": {
"description": "60x Plan Achromat",
"magnification": 60,
"focal_length": 3.333333,
"aperture": 0.80,
"DOF": 0.4,
"working_distance": 0.23,
"AF_min": 0.5,
"AF_max": 6.0,
"AF_range": 15.0,
"z_fine": 0.2,
"z_coarse": 2.0,
"xy_fine": 5.0,
"xy_coarse": 50.0
},
"100x U Plan Oly": {
"description": "100x U Plan (oil) Olympus",
"magnification": 100,
"focal_length": 1.8,
"aperture": 1.30,
"DOF": 0.19,
"working_distance": 0.2,
"AF_min": 0.2,
"AF_max": 4.0,
"AF_range": 10.0,
"z_fine": 0.11,
"z_coarse": 1.1,
"xy_fine": 4.0,
"xy_coarse": 40.0
},
"100x M Plan Oly": {
"description": "100x M Plan Fl (dry) Olympus",
"magnification": 100,
"focal_length": 1.8,
"aperture": 0.95,
"DOF": 0.19,
"working_distance": 0.2,
"AF_min": 0.2,
"AF_max": 4.0,
"AF_range": 10.0,
"z_fine": 0.11,
"z_coarse": 1.1,
"xy_fine": 4.0,
"xy_coarse": 40.0
},
"100x Meiji": {
"description": "100x Plan Apochromat(oil) MA983 Meiji",
"magnification": 100,
"focal_length": 2.0,
"aperture": 1.25,
"DOF": 0.19,
"working_distance": 0.2,
"AF_min": 0.2,
"AF_max": 4.0,
"AF_range": 10.0,
"z_fine": 0.11,
"z_coarse": 1.1,
"xy_fine": 4.0,
"xy_coarse": 40.0
}
}
15 changes: 1 addition & 14 deletions data/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,7 @@
"x": 5500.0,
"y": 4000.0
},
"objective": {
"desc": "20x",
"magnification": 20,
"aperture": 0.4,
"DOF": 5.8,
"AF_min": 2.0,
"AF_max": 18.0,
"AF_range": 40.0,
"z_fine": 2.9,
"z_coarse": 29.0,
"xy_fine": 20.0,
"xy_coarse": 200.0,
"ID": "20x"
},
"objective_id": "20x Oly",
"frame": {
"width": 1900,
"height": 1900
Expand Down
Loading

0 comments on commit 141dc3c

Please sign in to comment.