Skip to content

Set galvo voltage to zero upon exit#557

Merged
AdvancedImagingUTSW merged 8 commits into
developfrom
set-galvo-voltage-to-zero
Aug 2, 2023
Merged

Set galvo voltage to zero upon exit#557
AdvancedImagingUTSW merged 8 commits into
developfrom
set-galvo-voltage-to-zero

Conversation

@mehr0096
Copy link
Copy Markdown
Contributor

@mehr0096 mehr0096 commented Jul 28, 2023

No description provided.

AdvancedImagingUTSW and others added 6 commits July 25, 2023 16:39
@AdvancedImagingUTSW
added close task for each open galvo
cd88f89 
added close task for each open galvo
@AdvancedImagingUTSW
created function in galvo base and microscope
e5ac862 
created function in galvo_base and microscope to change parameters in waveform dictionary
@AdvancedImagingUTSW
changed order of turning off galvo and camera
fd11757
@AdvancedImagingUTSW
set galvo analog channel to zero
24476d7 
created a turn off function by setting analog channel that galvo was located in to zero.
@mehr0096
Merge branch 'develop' into set-galvo-voltage-to-zero
3b67561
@AdvancedImagingUTSW
removed comments
7d61d7f
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 28, 2023 •
edited
Loading

Codecov Report

Merging #557 (e11ba2f) into develop (d39e4ec) will decrease coverage by 0.03%.
Report is 1 commits behind head on develop.
The diff coverage is 14.28%.

@@             Coverage Diff             @@
##           develop     #557      +/-   ##
===========================================
- Coverage    46.84%   46.82%   -0.03%     
===========================================
  Files          162      162              
  Lines        15901    15914      +13     
===========================================
+ Hits          7449     7451       +2     
- Misses        8452     8463      +11
Flag Coverage Δ
unittests 46.82% <14.28%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...oller/sub_controllers/waveform_popup_controller.py 8.88% <0.00%> (ø)
src/aslm/model/microscope.py 84.38% <0.00%> (-0.64%) ⬇️
src/aslm/model/devices/galvo/galvo_ni.py 81.39% <11.11%> (-18.61%) ⬇️
src/aslm/model/devices/galvo/galvo_base.py 86.88% <50.00%> (-1.26%) ⬇️

... and 1 file with indirect coverage changes

@mehr0096 mehr0096 linked an issue Jul 28, 2023 that may be closed by this pull request
Turn the galvos off on program exit #514
Closed
AdvancedImagingUTSW
AdvancedImagingUTSW reviewed Aug 2, 2023
View reviewed changes
Comment thread src/aslm/controller/sub_controllers/waveform_popup_controller.py
@AdvancedImagingUTSW
Copy link
Copy Markdown
Collaborator

AdvancedImagingUTSW commented Aug 2, 2023

I'll have to try this out on a physical system, but by eye, it looks okay. The only thing that I think could be improved upon is the GUI precision settings. Ideally, these should not be hard-coded by microscope name, but rather configured in the configuration.yaml file. @zacsimile, @annie-xd-wang, do you agree?

@zacsimile
Copy link
Copy Markdown
Collaborator

zacsimile commented Aug 2, 2023 •
edited
Loading

Yes, but that was a black change, not supposed to be a part of this commit. Let's make a new issue for this and solve this in a different PR.

Btw, this is tested on Jinlong/dushyant's setup.

@zacsimile
Copy link
Copy Markdown
Collaborator

zacsimile commented Aug 2, 2023

Just confirmed this works on the v2 as well.

AdvancedImagingUTSW
AdvancedImagingUTSW approved these changes Aug 2, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator

@AdvancedImagingUTSW AdvancedImagingUTSW left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given the confirmation that this works by @zacsimile, we can proceed with the merge.

@AdvancedImagingUTSW AdvancedImagingUTSW merged commit fc11f8d into develop Aug 2, 2023
@AdvancedImagingUTSW AdvancedImagingUTSW deleted the set-galvo-voltage-to-zero branch December 15, 2023 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zacsimile zacsimile zacsimile left review comments

@AdvancedImagingUTSW AdvancedImagingUTSW AdvancedImagingUTSW approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Turn the galvos off on program exit

4 participants

@mehr0096 @AdvancedImagingUTSW @zacsimile @JinlongL