-
Notifications
You must be signed in to change notification settings - Fork 354
Refactor Keithley 2600 driver to use ParameterWithSetpoints for fast sweep
#7851
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
Merged
jenshnielsen
merged 46 commits into
microsoft:main
from
trlemon:trlemon/refactor-keithley2600-driver-fastsweep
Apr 1, 2026
+750
−310
Merged
Changes from 20 commits
Commits
Show all changes
46 commits
Select commit
Hold shift + click to select a range
1bb0298
Refactor fast sweep to use parameter with setpoints
f124599
Merge branch 'main' into trlemon/refactor-keithley2600-driver-fastsweep
trlemon 23866bb
Remove "shape" from LuaSweepParameter init
be02471
Remove unnecessary init block in LuaSweepParameter
d498c2f
Merge branch 'trlemon/refactor-keithley2600-driver-fastsweep' of http…
8c5ada5
Rename parameter for clarity
893c7bd
Add tests for new fastsweep parameters.
2e2ffe1
Merge branch 'main' into trlemon/refactor-keithley2600-driver-fastsweep
trlemon 9939e2a
Apply suggested changes from PR review
3c9417b
Merge branch 'trlemon/refactor-keithley2600-driver-fastsweep' of http…
22eb507
Add newsfragment for Keithley2600 driver updates
4fdb97b
Add note on breaking change
cba622b
Update Keithley2600 example notebook with usage on new fastweep param…
b83cadf
Merge branch 'main' into trlemon/refactor-keithley2600-driver-fastsweep
trlemon edb0b96
Add parameter for fastsweep inter delay
d81e4be
Update FastSweepSetpoints docstring
806fadf
Merge branch 'trlemon/refactor-keithley2600-driver-fastsweep' of http…
974843b
Fix typo in Keithley 2600 example notebook
8e0e833
Rename inter delay to settle delay for clarity
c59ce29
Major refactor to add 2D fast sweeps
59977c3
Rename _SweepLike class and add delay property
aba56c2
Add better documentation for _LinSweepLike object.
53a793d
Simplify get_channel helper function
c7adf9f
Fix issue causing mypy failure
83f8f71
Raise TypeError if parameter doesn't belong to Keithley2600Channel
f934866
Allow users to select which channel is measured during fastsweep.
f50342d
Merge branch 'main' into trlemon/refactor-keithley2600-driver-fastsweep
trlemon 1a5d37a
Update K2600 example nb with notes on measure_inner_channel arg
dba4da4
Fix grammar in K2600 nb example
74c426a
measure inner channel on fastsweep by default in setup_fastsweep
3761543
Merge branch 'main' into trlemon/refactor-keithley2600-driver-fastsweep
trlemon 1534a22
Add todo to fix plotting names and parameter setup
20084cc
Use infer_instrument to get correct channel name of parameter
155d6e7
Change infer_instrument to infer_channel
a93e1ab
Replace persistent setpoint params with "temporary" params
bfb2c05
Pass get_values to get_cmd in Parameter constructor in K2600 driver
7b8ded1
Update notebook example for k2600 before merging
ebe5bef
Merge branch 'main' into trlemon/refactor-keithley2600-driver-fastsweep
a71db23
Add better error handling for potential ZeroDivisionError
trlemon b484d87
Fix spelling mistake in newsfragment.
trlemon 2e59164
Update fastsweep docstring example usage.
dfd03a7
Merge branch 'main' into trlemon/refactor-keithley2600-driver-fastsweep
trlemon d7acea6
Add default case for k2600 1d and 2d lua script builder
8e27fba
Rename newsfragment to breaking for clarity
5e6166e
Use gaurd to prevent division by zero error in _build_2d_script
6c5f43e
move Keithley2600Channel to if TYPE_CHECKING block.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Refactored ``Keithley2600`` driver to use `ParameterWithSetpoints` instead | ||
| of relying on deprecated `qcodes_loop` code. Contains breaking change since | ||
| method `doFastSweep` has been replaced with `fastweep`. | ||
202 changes: 35 additions & 167 deletions
202
docs/examples/driver_examples/Qcodes example with Keithley 2600.ipynb
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.