Skip to content

Faster fast flow #607

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 4 commits into from
Mar 8, 2025
Merged

Faster fast flow #607

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a939cfc
Double the fast flow pneumatic module step size just so we can get up…
i-jey Mar 7, 2025
b2fa3e3
fmt
i-jey Mar 7, 2025
7aa24a3
merge branch 'develop' into faster_fast_flow
i-jey Mar 8, 2025
6ceacca
Add in a small check to CellFinder to ensure the motor is not in moti…
i-jey Mar 8, 2025
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: 7 additions & 0 deletions ulc_mm_package/hardware/scope_routines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def flow_control_routine(
flow_controller.set_alpha(
processing_constants.FLOW_CONTROL_EWMA_ALPHA * 2
) # Double the alpha, ~halve the half life
flow_controller.pneumatic_module.min_step_size *= 2

while True:
img, timestamp = yield flow_val, syringe_can_move
Expand All @@ -269,6 +270,7 @@ def flow_control_routine(
if fast_flow:
if flow_error is not None:
if flow_error == 0:
flow_controller.pneumatic_module.min_step_size /= 2
return flow_val

@init_generator
Expand Down Expand Up @@ -497,6 +499,11 @@ def find_cells_routine(
except NoCellsFound:
cell_finder.reset()

# Defensive check, ensure the motor isn't moving (say for example,
# if CellFinder was triggered by an OOF exception and SSAF just triggered a motor move)
while mscope.motor.is_locked():
pass

while True:
"""
1. Pull syringe for pull_time seconds (unless deliberately skipped)
Expand Down