-
Notifications
You must be signed in to change notification settings - Fork 320
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.
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
Simultaneous ramping of magnetic field in all 3 axes #3233
Merged
astafan8
merged 56 commits into
microsoft:master
from
astafan8:linear-magnetic-field-sweep
Sep 20, 2021
Merged
Simultaneous ramping of magnetic field in all 3 axes #3233
astafan8
merged 56 commits into
microsoft:master
from
astafan8:linear-magnetic-field-sweep
Sep 20, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #3233 +/- ##
==========================================
- Coverage 66.23% 66.12% -0.12%
==========================================
Files 220 220
Lines 29272 29356 +84
==========================================
+ Hits 19388 19411 +23
- Misses 9884 9945 +61 |
dbwz8
reviewed
Jul 29, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did a quick look. Didn't see anything obviously wrong.
astafan8
changed the title
Linear magnetic field sweep
Simultaneous ramping of magnetic field in all 3 axes
Aug 3, 2021
… _raise_if_not_same_field_and_ramp_rate_units method
…eter, adjust ramp_simultaneously
…fan8/Qcodes into pr/astafan8/3233
for more information, see https://pre-commit.ci
jenshnielsen
approved these changes
Sep 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sweep AMI 3D magnet to (x,y,z) in time T or at vector ramp rate R, ramping all 3 axes together (in parallel), making a linear/vector trajectory from current field to the setpoint in 3D magnetic field space.
For working with ramp duration, see:
For working with the new vector ramp rate, see:
Note that actually simultaneous ramping is already supported with the current driver, one just needs to set the
block_during_ramp
parameter toFalse
, so that the driver does not wait for one axis to finish ramping before starting ramping next one, and then manually/explicitly wait until the ramping is done. However, the benefit of the new simultaneous ramp mode and theramp_simultaneously
method is that it automatically calculates and adjusts the ramp rates of the axes.ToDos: