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

Ats9870 dev branch2 #338

Merged
merged 64 commits into from
Sep 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
9166634
first commit of the alazar driver, work in progress
damazter Feb 17, 2016
46edef6
Merge branch 'master' of https://github.com/qdev-dk/Qcodes into ATS98…
damazter Feb 18, 2016
522c3af
started work on acquire function, not completed
damazter Feb 18, 2016
adb3c90
Merge branch 'master' of https://github.com/qdev-dk/Qcodes into ATS98…
damazter Feb 22, 2016
b364da9
finished acquire method (still untested)
damazter Mar 9, 2016
e47fc46
Merge branch 'master' of https://github.com/qdev-dk/Qcodes into ATS98…
damazter Mar 9, 2016
665901a
typo and added idea in comments
damazter Mar 10, 2016
2637f51
the ATS parent class should work now. It is still untested, but all t…
damazter Mar 24, 2016
00c03ec
added signal_to_volt and get_sample_speed
damazter Mar 24, 2016
8694caa
added file with acquisitioncontroller example
damazter Mar 24, 2016
ae1d458
added preliminary list of parameters to add
damazter Mar 24, 2016
53e65ec
the __init__ of this driver now works,
damazter Mar 24, 2016
0c91e8b
implemented validations of values and automate the guessing of valida…
damazter Mar 28, 2016
888b01e
rename trigger_range to external_trigger_range
damazter Mar 28, 2016
71640bf
added all remaining parameters
damazter Mar 29, 2016
6b0aac7
first working & lightly tested version
damazter Mar 29, 2016
7854340
acquisition parameters are now automatically fetched from the driver
damazter Mar 29, 2016
6e16aa5
change default value of uptodateflag in Alazarparameter
damazter Apr 17, 2016
3444592
added empty docstrings for config and acquire
damazter Apr 17, 2016
48818b1
rename dll variable to remove 9870 reference
damazter Apr 17, 2016
05b6ee8
lint & refactor alazar base and 9870
alexcjohnson Apr 27, 2016
480df83
refactor ATS _call_dll
alexcjohnson Apr 28, 2016
762a4fa
a little more cleanup in ATS
alexcjohnson Apr 28, 2016
cafca5f
Merge branch 'master' into ATS9870-dev-branch
alexcjohnson Apr 28, 2016
6e59e06
ATS board finding
alexcjohnson Apr 28, 2016
7d53106
Merge branch 'master' into ATS9870-dev-branch
elrama- Jul 27, 2016
c9ae0ab
Minor changes (mostly typos) for ATS instrument to be properly created
elrama- Jul 27, 2016
78b6ef2
Fix on config method for ATS
elrama- Jul 27, 2016
48cf48f
Quick correction and first draft of an example
elrama- Jul 28, 2016
2544758
refactor: revert previous change
damazter Aug 8, 2016
b30a072
refactor: change TODO style
damazter Aug 8, 2016
8655bcd
fix: server_name was not forwarded to base instrument class
damazter Aug 9, 2016
032b9f3
fix: idn for alazar driver
damazter Aug 9, 2016
fee97b8
Merge branch 'ATS9870-dev-branch' of https://github.com/qdev-dk/Qcode…
damazter Aug 9, 2016
50ff3c2
refactor: change self.get_sample_speed into self.get_sample_rate
damazter Aug 9, 2016
dcad784
feat: check if board kind matches the driver type
damazter Aug 9, 2016
1ba4644
bug: change default trigger settings such that it will work by default
damazter Aug 10, 2016
56b66bf
bug: making this work with loops, not complete
damazter Aug 11, 2016
a51dc49
bug: simplifying example document, not complete
damazter Aug 11, 2016
c4839f0
feat: make the driver work with loops
damazter Aug 11, 2016
d991e65
feat: update example notebook
damazter Aug 11, 2016
fc9809d
fix: ATS9870 samples_per_record requirements were incorrect
damazter Aug 15, 2016
2957f53
feat: improve the idn
damazter Aug 15, 2016
97035dd
fix: snapshot of alazarparameters
damazter Aug 15, 2016
526c1d6
fix: ATS example notebook now works
damazter Aug 15, 2016
e63d505
fix: ATS example notebook is now good
damazter Aug 16, 2016
7403f26
fix: comments and reference by name instead of id
damazter Aug 16, 2016
6638cd2
fix: check value of allocated_buffers
damazter2 Sep 5, 2016
744b350
Merge branch 'master' into ATS9870-dev-branch2
damazter2 Sep 20, 2016
2ef46df
fix: adapt to new find_inst structure of pr #323
damazter2 Sep 20, 2016
391a797
fix: changed division to integer division in record index calculation
damazter2 Sep 20, 2016
2129579
fix: allocated_buffers in example measurement
damazter2 Sep 20, 2016
2c04666
refactor: remove acquisition_controller from acquisitionkwargs
damazter2 Sep 21, 2016
c81aff6
refactor: rename set_acquisitionkwargs into update_acquisitionkwargs
damazter2 Sep 21, 2016
3eb915a
docs: add docstring for Mupltiples validator class
damazter2 Sep 21, 2016
6fe2f4e
docs: add all needed docstrings
damazter2 Sep 21, 2016
35489d5
refactor: self.alazar to self._alazar
damazter2 Sep 21, 2016
34668df
docs: add docstring
damazter2 Sep 21, 2016
b5226ee
docs: add docstrings
damazter2 Sep 21, 2016
8e86fc7
fix: change the example notebook to reflact the changes made in the l…
damazter2 Sep 21, 2016
9bbfaca
refactor: DFT_AcquisitionController to Demodulation_AcquisitionContro…
damazter2 Sep 22, 2016
65328f0
docs: add _alazar to class docstring
damazter2 Sep 22, 2016
7e126b0
Merge branch 'master' into ATS9870-dev-branch2
damazter2 Sep 22, 2016
819470d
refactor: use multiples validator from the qcodes core instead of a l…
damazter2 Sep 22, 2016
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
Loading