Skip to content
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

driver/Alazar Ats9360 ADC - cleaned up #491

Closed
wants to merge 209 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
209 commits
Select commit Hold shift + click to select a range
293637a
Merge branch 'master' into ATS9870-dev-branch
nataliejpg Jul 26, 2016
c0a1dff
Merge branch 'ATS9870-dev-branch' of https://github.com/qdev-dk/Qcode…
nataliejpg Jul 28, 2016
6e85d14
Merge branch 'ATS9870-dev-branch' of https://github.com/qdev-dk/Qcode…
nataliejpg Jul 28, 2016
18aa323
feature: initial commit for ATS9360 alazar driver.
nataliejpg Aug 2, 2016
256b35a
style: Remove some print statememnts from ATS.py
nataliejpg Aug 2, 2016
9b0d84b
tidy up ATS.py comments and create test acquisition conroller for ATS…
nataliejpg Aug 3, 2016
5f02af0
more edits on acquisition_controller
nataliejpg Aug 4, 2016
b242aa0
First steps to filter acquisition controller and docstrings
nataliejpg Aug 8, 2016
3a27d43
feat: variety of QDev acquisition controllers created, not complete
nataliejpg Aug 11, 2016
23cde4e
refactor/style: comments and docstings tidy up and temporary test ref…
nataliejpg Aug 15, 2016
f29f4ab
Merge with master and fix conflicts
nataliejpg Oct 17, 2016
654984a
fix: tweak ATS9360.py to work with damaz updates
nataliejpg Oct 26, 2016
2d2b82b
fix: tweak ATS.py to hopefully match damaz updates
nataliejpg Oct 26, 2016
2356bd2
fix: Add mistakenly deleted ATS example notebook back
nataliejpg Oct 26, 2016
4a0f1ed
update Alazar example notebook to work with 9360
nataliejpg Oct 26, 2016
66fd9a9
fix: validators bug
nataliejpg Oct 26, 2016
66c421f
first steps to building acquisition controllers for ATS9360 to work w…
nataliejpg Oct 31, 2016
a04a377
basic controller done, starting on hd controllers
nataliejpg Nov 1, 2016
fc47d1a
Make changes to ATS9360 and acq contr so that it can be configured co…
nataliejpg Nov 1, 2016
e8190ec
Change lower limit of freq allowed to 1 MHz
nataliejpg Nov 1, 2016
dd2843f
feat: create hard parameter so that basic controller can be used in t…
nataliejpg Nov 2, 2016
6582867
basic controller now works with loop and returns samples
nataliejpg Nov 2, 2016
23ddd34
bug: made a to do of a bug introduces by me when using ATS9360 with A…
nataliejpg Nov 2, 2016
50f795f
acquisition controllers added for seq mode 0 measurements
nataliejpg Nov 4, 2016
e686982
gitignore update
nataliejpg Nov 4, 2016
7ecc2b2
add filter options
nataliejpg Nov 4, 2016
3612360
unneeded filter test contollers deleted
nataliejpg Nov 7, 2016
b4922ba
update example
nataliejpg Nov 7, 2016
0cf7354
update ATS9360 to be able to configure AUX I/O settings
nataliejpg Nov 7, 2016
328adeb
clean up and debug acq controllers somewhat
nataliejpg Nov 7, 2016
e81085f
refactor acquisition controllers and cover all options
nataliejpg Nov 7, 2016
fbf124b
Make AUX I/O params have default values
nataliejpg Nov 8, 2016
5797269
fix rate/sample bug
nataliejpg Nov 8, 2016
0946868
update single contoller shapes so that it can be plotted in do1d
nataliejpg Nov 8, 2016
951f78b
setpoint and buffer -> records debugging
nataliejpg Nov 8, 2016
07130bf
update notebook
nataliejpg Nov 8, 2016
341acfd
to dos added
nataliejpg Nov 8, 2016
8da2b42
start work on signal to volts
nataliejpg Nov 8, 2016
fcf7fcb
filter testing in samples controller
nataliejpg Nov 8, 2016
61c6419
pep8 formatting
nataliejpg Nov 8, 2016
95403dd
Merge branch 'driver/ATS9360' of https://github.com/nataliejpg/Qcodes…
nataliejpg Nov 8, 2016
ec757db
make defaults such that getting board info is easier
nataliejpg Nov 9, 2016
9276dab
create separate tools file and somewhat clear up fitting and filtering
nataliejpg Nov 9, 2016
d7a3459
debugging so that limiting int_delay and int_time work as well as sam…
nataliejpg Nov 9, 2016
c4cec94
get filtering to work well
nataliejpg Nov 10, 2016
aca9a10
tidy up sample controller
nataliejpg Nov 14, 2016
3d1c76b
undoing typos introduces in previous commit
nataliejpg Nov 14, 2016
bdb74c3
fix int_delay and int_time bug in sample controller
nataliejpg Nov 14, 2016
e0d0a25
debugging silly mistakes
nataliejpg Nov 14, 2016
85f9f44
sample controller working
nataliejpg Nov 15, 2016
1b9f439
update docstrings and clean up basic controller
nataliejpg Nov 15, 2016
c798204
extend fixes to rec and single controllers
nataliejpg Nov 15, 2016
fb888a4
general tidying
nataliejpg Nov 15, 2016
75d840b
testing with alazar done
nataliejpg Nov 15, 2016
1eef436
change buggy buffer dtype requirement in all acq controllers, debuggi…
nataliejpg Nov 17, 2016
51462ca
removed dot filter frome helpers
nataliejpg Nov 18, 2016
d2376ca
add example notebook from experiment
nataliejpg Nov 21, 2016
eed9830
update example notebook, rename acq controllers and delete uneccesary…
nataliejpg Nov 21, 2016
253ca70
merge in master
nataliejpg Nov 21, 2016
e42200e
update to dos lists
nataliejpg Nov 21, 2016
efb0733
rename acq controllers
nataliejpg Nov 21, 2016
569c1f0
actually renaming acq controllers
nataliejpg Nov 21, 2016
779d119
attempt to fix sample_rate bug
nataliejpg Nov 23, 2016
9199a21
begin refactor of sample controller
nataliejpg Nov 24, 2016
32b10db
Merge branch 'master' into driver/ATS9360
giulioungaretti Nov 25, 2016
5e9ab45
delete detailed excess aqc controllers
nataliejpg Nov 30, 2016
261b86a
Merge branch 'driver/ATS9360' of https://github.com/nataliejpg/Qcodes…
nataliejpg Dec 5, 2016
d955535
fuuuuuck
nataliejpg Nov 25, 2016
44e0326
fix: Add missing __init__
Nov 27, 2016
c7490e6
feat: Add makefile option to build locally
giulioungaretti Nov 27, 2016
2d7fbec
docs: Polish decadac
giulioungaretti Nov 27, 2016
8892e31
fix: Don't append if file does not exist. (#408)
giulioungaretti Dec 5, 2016
d66c609
Update CONTRIBUTING.rst
WilliamHPNielsen Dec 7, 2016
0b65033
feature: Write metadata by default
peendebak Dec 7, 2016
8cae1ac
chore: Update requirements and simlify readme (#417)
giulioungaretti Dec 13, 2016
e2de376
driver: enhancement to support setting external reference (#412)
AdriaanRol Dec 16, 2016
1a4508b
driver: Add Microwave source driver SMR40 (#419)
eendebakpt Dec 19, 2016
fb2c40f
Doc: RST fixes (#420)
jenshnielsen Dec 19, 2016
7c27a06
fix: Improved IVVI driver speed (#320)
Rubenknex Dec 20, 2016
b8c5059
Fix: Limit sip to 4.18.1
jenshnielsen Jan 3, 2017
450976d
Travis: install sphinx for docs build
jenshnielsen Jan 3, 2017
ca555b2
travis: also install read the docs theme
jenshnielsen Jan 3, 2017
56f3182
Travis: also add jsonschema and sphinx package
jenshnielsen Jan 3, 2017
c01ba93
made a mess of branches, rebase and add back in various acq controllers
nataliejpg Jan 3, 2017
d38fcd1
Merge branch 'driver/ATS9360' of https://github.com/nataliejpg/Qcodes…
nataliejpg Jan 11, 2017
05eba59
tidy up a bit and move demof filter halpers to own folder
nataliejpg Jan 12, 2017
8ea8d1c
testing basic controller
nataliejpg Jan 13, 2017
0d42a18
merge master
nataliejpg Jan 13, 2017
1c83e5f
fixing and refactoring
nataliejpg Jan 13, 2017
9659228
in the refactoring process
nataliejpg Jan 13, 2017
6a8db5d
leave samp.py a mess but change samp_controller.py so that it's useable
nataliejpg Jan 16, 2017
5a4260b
extending demodulation frequencies of samples_controller
nataliejpg Jan 17, 2017
375ef00
debugging
nataliejpg Jan 17, 2017
3687ea0
working samp controller minus int_time and delay being new param type…
nataliejpg Jan 17, 2017
8be1ae7
samples controller messily doing multi demodulation
nataliejpg Jan 18, 2017
488be13
int_time and delay sort of working:
nataliejpg Jan 19, 2017
e237acb
samples controller working without setpoints
nataliejpg Jan 19, 2017
3318a85
samples_controller sort of done and starting on ave_controller
nataliejpg Jan 20, 2017
c2220e8
docstrings and tidying on samples, basic and ave controllers, write a…
nataliejpg Jan 23, 2017
ad52584
test with alazar, minor typo fix and finish example notebook
nataliejpg Jan 23, 2017
f1b92ad
tweaks while testing on actual setup
nataliejpg Jan 24, 2017
fa219ec
change init with demod freqs to init with number of demod_freqs
nataliejpg Jan 24, 2017
cab3d5a
typos and get around the uses of the demod freqs before set through g…
nataliejpg Jan 24, 2017
cf8fcbd
actually getting get_max_demod_freq to work if no demodulation freque…
nataliejpg Jan 24, 2017
fa08a42
pep8 and tidy up
nataliejpg Feb 6, 2017
b8689c8
add docstrings and refactor demod_freq parameter to be homemade AcqVa…
nataliejpg Feb 6, 2017
3ecce9a
remove fit fn from acq helpers and TODOs for trying it in controllers…
nataliejpg Feb 7, 2017
e8f9644
delete old versions of controllers and rename new versions to replace…
nataliejpg Feb 7, 2017
f1ddc48
tweak and comment out demod setpoint logic for until setpoints are fixed
nataliejpg Feb 7, 2017
dab7ff0
move samples_divisor into init of acq controllers so no need to impor…
nataliejpg Feb 7, 2017
1c44788
updating docstrings, making rec_num and buf_num parameters where nece…
nataliejpg Feb 7, 2017
d8cae49
complete rec_samp and buf_rec controllers and change post processing …
nataliejpg Feb 8, 2017
1f4ea7e
updating notebook to reflect driver changes, nb untested on an alazar
nataliejpg Feb 13, 2017
c00d8cd
Revert "Change lower limit of freq allowed to 1 MHz"
jenshnielsen Feb 13, 2017
72cbaf4
Fix: remove conflict leftover
jenshnielsen Feb 13, 2017
91c1f43
Fix: sync AWG example notebook with master
jenshnielsen Feb 13, 2017
4afbfe3
Merge remote-tracking branch 'origin/master' into ATS9360
jenshnielsen Feb 13, 2017
c627937
Fix mock scipy for docs build
jenshnielsen Feb 14, 2017
e851987
Fix: correct rst syntax ATS9360
jenshnielsen Feb 14, 2017
42ea288
fix: acq_helpers correct doc syntax
jenshnielsen Feb 14, 2017
bf2a211
fix: rst syntax in basic controller
jenshnielsen Feb 14, 2017
f91f4bf
fix ATS.py cleanup rts syntax
jenshnielsen Feb 14, 2017
2d00dcf
fix ATS9870 improve rts syntax
jenshnielsen Feb 14, 2017
b8e3a2c
Fix: Ats controllers fix rst
jenshnielsen Feb 14, 2017
b89071f
Fix: SampleSweep to multiparamter
jenshnielsen Feb 14, 2017
27b6341
Fix: AveragedAcqParam to multiparameter
jenshnielsen Feb 14, 2017
1282036
Fix: BuffersRecordsAcqParam to multiparameter
jenshnielsen Feb 14, 2017
58291b3
Fix: RecordsSamplesAcqParam to MultiParameter
jenshnielsen Feb 14, 2017
fcd9a77
Fix: RecordsAcqParam to Multiparameter
jenshnielsen Feb 14, 2017
718531e
Fix: SamplesAcqParam -> MultiParameter
jenshnielsen Feb 14, 2017
dfd48ab
feature: Use unit in label
giulioungaretti Feb 14, 2017
cd2c75b
fix: typos spotted reading the code
jenshnielsen Feb 14, 2017
bfaa86c
Fix: deduplicate parameter
jenshnielsen Feb 15, 2017
9d606ca
fix: more parameter refactoring
jenshnielsen Feb 15, 2017
bff5ba1
Fix: more deduplication
jenshnielsen Feb 15, 2017
91e9e82
Fix: more deduplication
jenshnielsen Feb 15, 2017
32521aa
Fix: add 2d and 3d parameters
jenshnielsen Feb 15, 2017
b27b448
use generalised parameters
jenshnielsen Feb 15, 2017
55c750f
Pep8
jenshnielsen Feb 15, 2017
e2b96f2
Fix: no need to use setattr here
jenshnielsen Feb 15, 2017
c6b257f
Fix: pep8
jenshnielsen Feb 15, 2017
d2e4605
feature: Use units in labels
giulioungaretti Feb 20, 2017
0b6e391
Fix: Partial fix for #499 propagate units to subarray
jenshnielsen Feb 20, 2017
b3c7de3
Fix: This is a setpoint array by definition
jenshnielsen Feb 20, 2017
220831a
fix: test_loop rename setpoint arrays
jenshnielsen Feb 21, 2017
c30f00c
fix: test_measure rename setpoint arrays
jenshnielsen Feb 21, 2017
d1aa251
Fix: Add setpoint_units to Array and Multiparameter
jenshnielsen Feb 21, 2017
c5b00f3
Fix: add handling of setpoint units to loops
jenshnielsen Feb 21, 2017
f52a61f
Merge remote-tracking branch 'jenshnielsen/fix499' into ATS9360
jenshnielsen Feb 21, 2017
bfaca96
Merge remote-tracking branch 'jenshnielsen/array_parameter_setpoints'…
jenshnielsen Feb 21, 2017
4185d8e
Merge remote-tracking branch 'jenshnielsen/setpoint_array' into ATS9360
jenshnielsen Feb 21, 2017
8789063
Merge remote-tracking branch 'origin/feature/useunits' into ATS9360
jenshnielsen Feb 21, 2017
53aa76b
Add notebook to figure out api
jenshnielsen Feb 21, 2017
d5bac79
Fix: Alazar add new controller that aims to be more general
jenshnielsen Feb 23, 2017
810dc25
Fix: correct calls to cdll with numpy arrays
jenshnielsen Feb 23, 2017
731d98b
Fix: use ctypes api directly
jenshnielsen Feb 24, 2017
1fa1c34
fix: some comments
jenshnielsen Feb 28, 2017
f26977f
Fix: Simplify memory allocation in ATS driver
jenshnielsen Feb 28, 2017
8ca333d
Fix: comments and typos
jenshnielsen Feb 28, 2017
25ba6ea
Add support for both internal and external clock
jenshnielsen Feb 28, 2017
9619f57
Fix: Acqusition parameters correct setpoints
jenshnielsen Feb 28, 2017
0fdc9d6
Fix: ATS9360 controller wip improvements
jenshnielsen Feb 28, 2017
cdaad8c
Fix: add init file
jenshnielsen Feb 28, 2017
6ef072e
Fix: correctly init instrument in AlazarParameter
jenshnielsen Mar 2, 2017
9759ea5
Fix: Alazar mark internal/external sample rate as up to date when not…
jenshnielsen Mar 2, 2017
46ed0e9
Fix more work on acq controller fixing issues and making more stuff p…
jenshnielsen Mar 2, 2017
be421dc
fix typo
jenshnielsen Mar 2, 2017
de840b6
fix: correct changing of inttime/intdelay
jenshnielsen Mar 2, 2017
ff6fbbd
Wip getting this working with multidim arrays
jenshnielsen Mar 3, 2017
88b822b
fix: more informative error message
jenshnielsen Mar 6, 2017
55397d8
fix: correct tuple shape
jenshnielsen Mar 6, 2017
2b9c1f8
fix: records per sample should be configurable in sequence mode
jenshnielsen Mar 6, 2017
7ea1e1a
Fix: bug fix
jenshnielsen Mar 6, 2017
01cf358
Fix update setpoints when updating records
jenshnielsen Mar 6, 2017
c3cc1aa
Fix: correct array shape
jenshnielsen Mar 7, 2017
a2be56b
Fix: correct setpoints handling
jenshnielsen Mar 7, 2017
38214dc
Update example notebook
jenshnielsen Mar 7, 2017
3354987
Merge branch 'master' into ATS9360
jenshnielsen Mar 8, 2017
be15682
Revert "Fix: Simplify memory allocation in ATS driver"
jenshnielsen Mar 8, 2017
98c7b66
Docs: update example notebook
jenshnielsen Mar 8, 2017
534199e
Fix: add check to ensure that we don't overflow buffer size
jenshnielsen Mar 8, 2017
5cf798b
Doc improve some docstrings
jenshnielsen Mar 14, 2017
2a8547f
Merge branch 'master' into ATS9360
jenshnielsen Mar 15, 2017
42c1f24
Fix: Units -> unit
jenshnielsen Mar 15, 2017
a15d5d2
fix: correct typos
jenshnielsen Mar 15, 2017
5e94b58
Fix: rst typo
jenshnielsen Mar 15, 2017
36edf4c
fix: add effectivesamplerate parameter
jenshnielsen Mar 15, 2017
cfc0e91
Merge branch 'ATS9360' of https://github.com/jenshnielsen/Qcodes into…
jenshnielsen Mar 15, 2017
359cfaa
Fix use effective_sample_rate parameter
jenshnielsen Mar 15, 2017
36ee0d8
fix: update some comments
jenshnielsen Mar 15, 2017
ea99497
Merge branch 'ATS9360' of github.com:jenshnielsen/Qcodes into ATS9360
jenshnielsen Mar 15, 2017
054ce7f
Merge branch 'ATS9360' of https://github.com/jenshnielsen/Qcodes into…
jenshnielsen Mar 15, 2017
c645afc
Fix: use effective sample rate
jenshnielsen Mar 15, 2017
e4c3b22
Fix: cast to void point before using as such
nataliejpg Mar 18, 2017
330894f
Merge branch 'master' into ATS9360
jenshnielsen May 4, 2017
26626e6
Merge branch 'master' into ATS9360
jenshnielsen May 29, 2017
79e9bf5
Merge branch 'master' into ATS9360
jenshnielsen Jun 14, 2017
79e4e6b
ATS typo fix
jenshnielsen Jun 15, 2017
d5670d0
remove special case controllers
jenshnielsen Jun 15, 2017
e7f8d9c
fix: allocated_buffers and set_base_setpoints
nataliejpg Jul 17, 2017
df94001
Merge pull request #4 from nataliejpg/driver/ATS9360_bugfix
jenshnielsen Jul 17, 2017
fe3ca73
Merge branch 'master' into ATS9360
jenshnielsen Aug 16, 2017
1936dfd
Merge branch 'master' into ATS9360
jenshnielsen Aug 22, 2017
1a18c22
remove unused acq tools and fix voltage conversion in helpers
jenshnielsen Aug 22, 2017
a1604c7
Avoid calling get_idn 3 times during a capture. This reduces capture …
jenshnielsen Oct 25, 2017
58deb93
Merge remote-tracking branch 'origin/master' into ATS9360
jenshnielsen Oct 25, 2017
e496a1a
_latest is no longer callable
jenshnielsen Oct 30, 2017
5b5431e
Merge remote-tracking branch 'origin/master' into ATS9360
jenshnielsen Nov 2, 2017
061613d
Merge remote-tracking branch 'origin/master' into ATS9360
jenshnielsen Nov 6, 2017
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
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@ target/
*.py~
tmp/

# DS-store
*.DS_Store

# Sublime text automation
*.sublime-project
*.sublime-workspace

venv/

docs/examples/data/*

.idea/
Expand Down
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@
except ImportError as e:
print(e)
autodoc_mock_imports.append('pyspcm')
autodoc_mock_imports.append('scipy')
autodoc_mock_imports.append('zhinst')
autodoc_mock_imports.append('zhinst.utils')
autodoc_mock_imports.append('keysightSD1')
Expand Down
Loading