Skip to content

refactor waveform parameters #991

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

Merged
merged 6 commits into from
Sep 20, 2024
Merged

refactor waveform parameters #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cf51f4
popup window demo
annie-xd-wang Sep 18, 2024
7404298
update waveform popup window and controller
annie-xd-wang Sep 20, 2024
2615172
get updated galvo parameters when calculating waveforms
annie-xd-wang Sep 20, 2024
1d5bab9
add and use the camera_delay parameter
annie-xd-wang Sep 20, 2024
19deb3c
Minor tweaks
AdvancedImagingUTSW Sep 20, 2024
c7e8213
minor changes
annie-xd-wang Sep 20, 2024
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
7 changes: 6 additions & 1 deletion src/navigate/config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,11 +873,16 @@ def verify_waveform_constants(manager, configuration):

# other_constants
waveform_dict = configuration["waveform_constants"]
microscope_name = configuration["configuration"]["microscopes"].keys()[0]
other_constants_dict = {
"remote_focus_settle_duration": "0",
"percent_smoothing": "0",
"remote_focus_delay": "0",
"remote_focus_ramp_falling": "5",
"camera_settle_duration": "0",
"camera_delay": configuration["configuration"]["microscopes"][microscope_name][
"camera"
]["delay"],
}
if (
"other_constants" not in waveform_dict.keys()
Expand All @@ -893,7 +898,7 @@ def verify_waveform_constants(manager, configuration):
try:
float(waveform_dict["other_constants"][k])
except (ValueError, KeyError):
waveform_dict["other_constants"][k] = "0"
waveform_dict["other_constants"][k] = other_constants_dict[k]


def verify_configuration(manager, configuration):
Expand Down
Loading
Loading