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.

Sign up for GitHub

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

Jump to bottom

Driver/decadaf fine mode #829

Closed
wants to merge 358 commits into from
Closed

Driver/decadaf fine mode #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
358 commits
Select commit Hold shift + click to select a range
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
424989e
Update Znb20 notebook
jenshnielsen May 24, 2017
1473b00
update to example notebook
jenshnielsen May 24, 2017
68c0548
feature: Add wrappers
giulioungaretti Jan 16, 2017
97bb1a0
Clean up wrappers
giulioungaretti Feb 20, 2017
7d837a9
Fix: set default matplotlib colormap to hot to match pyqtgraph
jenshnielsen Mar 14, 2017
c72b32f
Fix: improve quality of saved pdf images in matplotlib by drawing edges
jenshnielsen Mar 14, 2017
ce54c9b
Fix: add support to wrappers for plotting pdf via matplotlib
jenshnielsen Mar 14, 2017
074692c
fix: make show_num default to plot with matplotlib
jenshnielsen Mar 15, 2017
174bf97
fix save individual plots as pdf
jenshnielsen Mar 16, 2017
57fe870
Fix add basic support for moving qt windows to a specific position
jenshnielsen Mar 17, 2017
3aa1584
fix: dont depend on qtpy
jenshnielsen Mar 21, 2017
50eab0f
fix: Allow execution of tasks in doNd[_diagonal]
WilliamHPNielsen Mar 28, 2017
84ccd84
feat: Add device annotator
WilliamHPNielsen Mar 28, 2017
36a390c
Feat/majorana features (#13)
giulioungaretti Mar 29, 2017
2d2a99e
fix: Use logging instead of print
giulioungaretti Mar 29, 2017
e0a2179
fix: Fixup git-fus
giulioungaretti Mar 29, 2017
8025d87
Fix: sort parameters in device annotator
jenshnielsen Mar 30, 2017
259530b
Fix: correctly sort instruments in device annotator (#16)
jenshnielsen Mar 31, 2017
3eb2b10
Feature/monitor (#15)
giulioungaretti Mar 31, 2017
124b057
fix: Include static, add init
giulioungaretti Apr 3, 2017
0ea1236
Fix: also catch TypeError (#18)
jenshnielsen Apr 3, 2017
a5432ef
Fix: change do1d/do2d wrappers to use num points
jenshnielsen Apr 3, 2017
79db180
wrappers plotting changes (#20)
jenshnielsen Apr 4, 2017
efcdcfd
Remove color for now it breaks 2d plots (#21)
jenshnielsen Apr 5, 2017
795f6a6
Device title (#24)
jenshnielsen Apr 5, 2017
a11b386
fix: Make do1d log its dataset ID (#23)
WilliamHPNielsen Apr 5, 2017
d8409a5
Fix: only pass color to plot.add when doing a 1d plot and raster pcol…
jenshnielsen Apr 5, 2017
da27a82
Fix: save pdf with all subplots (#25)
jenshnielsen Apr 5, 2017
2e10756
wip: fix for monitor
giulioungaretti Apr 5, 2017
ee9d46a
Revert "wip: fix for monitor"
giulioungaretti Apr 6, 2017
b19da69
move server to onw scripts
giulioungaretti Apr 6, 2017
a5c8b3d
feat: make monitor server standalone
giulioungaretti Apr 6, 2017
eef1ad2
fix: Sleep before thread starts!
giulioungaretti Apr 6, 2017
1425ef6
Fix: only raster plots if larger than 5000 datapoints (#28)
jenshnielsen Apr 8, 2017
2a4b629
Annotator improvements (#27)
jenshnielsen Apr 8, 2017
0e37a8f
Fix stupid error in wrappers (#31)
jenshnielsen May 2, 2017
738fd83
fix: Update monitor GUI
giulioungaretti May 10, 2017
01268d3
fix: Make do1d pre-flush VISA buffers (#32)
WilliamHPNielsen May 11, 2017
0006e26
fix: preflush VISA buffers (#33)
WilliamHPNielsen Jun 1, 2017
f5c5164
DoND reraise interupts so that loops of measurements can be safely st…
jenshnielsen Jun 1, 2017
79e211f
feat: Add a configreader (#35)
WilliamHPNielsen Jun 13, 2017
807d212
plot: Disable autoSIprefix for non-standard units (#36)
WilliamHPNielsen Jun 13, 2017
cc002db
add support for dond without plotting
jenshnielsen Jun 14, 2017
dd812b3
Revert "add support for dond without plotting"
jenshnielsen Jun 14, 2017
283e48a
Fix: add support for dond without plotting""
jenshnielsen Jun 14, 2017
e06abcc
Fix mistake in plot update of do2d:
jenshnielsen Jun 14, 2017
5f043e1
docs: Example notebook for QDev specifics (#39)
WilliamHPNielsen Jun 14, 2017
62eb03e
plots: Make QtPlot rescale before saving (#40)
WilliamHPNielsen Jun 14, 2017
53fbe35
plots: Make the initial empty plot have the right ranges
WilliamHPNielsen Jun 14, 2017
4896646
style: Remove obsolete TODO comment
WilliamHPNielsen Jun 14, 2017
7eaca78
Force a draw of matplotlib figures.
jenshnielsen Jun 22, 2017
257e075
fix: Make plot autoscaling more robust (#47)
WilliamHPNielsen Jun 26, 2017
e45d74a
Device annotator handle missing raw image without overwriting json
jenshnielsen Jun 27, 2017
eec0bb5
make it possible to select font and font size in annotator
jenshnielsen Jun 27, 2017
08f7ff8
Refactor/do measurement (#48)
WilliamHPNielsen Jun 28, 2017
fc4ecb9
make configreader work
WilliamHPNielsen Jun 30, 2017
8dd1259
fix multiplot label issues (#52)
WilliamHPNielsen Jul 3, 2017
30f1c0c
Faster qdac (#53)
jenshnielsen Jul 7, 2017
e638579
Resize qt window before saving (#54)
jenshnielsen Jul 19, 2017
7b6c47f
Fix multiparamplot (#55)
jenshnielsen Jul 19, 2017
ca4ed18
make it configurable if the matplot(pdf) plots should be shown (#56)
jenshnielsen Aug 2, 2017
e4dcbc1
Crosssection viewer [WIP] (#57)
jenshnielsen Aug 8, 2017
40ad3e1
fix default config reader
jenshnielsen Aug 9, 2017
ff65ef3
Save pdfs in subfolder (#60)
jenshnielsen Aug 9, 2017
10d56c4
Fix monitor for channel parameters (#61)
jenshnielsen Aug 16, 2017
bf23504
Merge branch 'ATS9360' of https://github.com/jenshnielsen/Qcodes into…
cQED-T3 Aug 21, 2017
a99e7c9
Update Znb20 notebook
jenshnielsen May 24, 2017
a78626d
update to example notebook
jenshnielsen May 24, 2017
b309c5f
feature: Add wrappers
giulioungaretti Jan 16, 2017
a11fc61
Clean up wrappers
giulioungaretti Feb 20, 2017
b38f0d1
Fix: set default matplotlib colormap to hot to match pyqtgraph
jenshnielsen Mar 14, 2017
2c4e3cd
Fix: improve quality of saved pdf images in matplotlib by drawing edges
jenshnielsen Mar 14, 2017
d7ea83e
Fix: add support to wrappers for plotting pdf via matplotlib
jenshnielsen Mar 14, 2017
2e95d30
fix: make show_num default to plot with matplotlib
jenshnielsen Mar 15, 2017
6cf4ccc
fix save individual plots as pdf
jenshnielsen Mar 16, 2017
60c305d
Fix add basic support for moving qt windows to a specific position
jenshnielsen Mar 17, 2017
a5962d5
fix: dont depend on qtpy
jenshnielsen Mar 21, 2017
192ca92
fix: Allow execution of tasks in doNd[_diagonal]
WilliamHPNielsen Mar 28, 2017
2d55baf
feat: Add device annotator
WilliamHPNielsen Mar 28, 2017
b6b41ce
Feat/majorana features (#13)
giulioungaretti Mar 29, 2017
323587d
fix: Use logging instead of print
giulioungaretti Mar 29, 2017
2aa67bd
fix: Fixup git-fus
giulioungaretti Mar 29, 2017
17475f2
Fix: sort parameters in device annotator
jenshnielsen Mar 30, 2017
98e3b0a
Fix: correctly sort instruments in device annotator (#16)
jenshnielsen Mar 31, 2017
36836b4
Feature/monitor (#15)
giulioungaretti Mar 31, 2017
b3d04d8
fix: Include static, add init
giulioungaretti Apr 3, 2017
01637b0
Fix: also catch TypeError (#18)
jenshnielsen Apr 3, 2017
8e0a0fb
Fix: change do1d/do2d wrappers to use num points
jenshnielsen Apr 3, 2017
c7cb650
wrappers plotting changes (#20)
jenshnielsen Apr 4, 2017
d19b16b
Remove color for now it breaks 2d plots (#21)
jenshnielsen Apr 5, 2017
ab44131
Device title (#24)
jenshnielsen Apr 5, 2017
ed94ce9
fix: Make do1d log its dataset ID (#23)
WilliamHPNielsen Apr 5, 2017
e2d15e2
Fix: only pass color to plot.add when doing a 1d plot and raster pcol…
jenshnielsen Apr 5, 2017
65833db
Fix: save pdf with all subplots (#25)
jenshnielsen Apr 5, 2017
c181899
wip: fix for monitor
giulioungaretti Apr 5, 2017
beb896d
Revert "wip: fix for monitor"
giulioungaretti Apr 6, 2017
ca1a179
move server to onw scripts
giulioungaretti Apr 6, 2017
a4acea5
feat: make monitor server standalone
giulioungaretti Apr 6, 2017
2719589
fix: Sleep before thread starts!
giulioungaretti Apr 6, 2017
c737f3e
Fix: only raster plots if larger than 5000 datapoints (#28)
jenshnielsen Apr 8, 2017
d55f1a2
Annotator improvements (#27)
jenshnielsen Apr 8, 2017
4b25601
Fix stupid error in wrappers (#31)
jenshnielsen May 2, 2017
d9d1704
fix: Update monitor GUI
giulioungaretti May 10, 2017
d6e46d3
fix: Make do1d pre-flush VISA buffers (#32)
WilliamHPNielsen May 11, 2017
54041f7
fix: preflush VISA buffers (#33)
WilliamHPNielsen Jun 1, 2017
9d40eb3
DoND reraise interupts so that loops of measurements can be safely st…
jenshnielsen Jun 1, 2017
34d410c
feat: Add a configreader (#35)
WilliamHPNielsen Jun 13, 2017
ffc6cd2
plot: Disable autoSIprefix for non-standard units (#36)
WilliamHPNielsen Jun 13, 2017
4d95e67
add support for dond without plotting
jenshnielsen Jun 14, 2017
1dbd91e
Revert "add support for dond without plotting"
jenshnielsen Jun 14, 2017
b249222
Fix: add support for dond without plotting""
jenshnielsen Jun 14, 2017
9f45528
Fix mistake in plot update of do2d:
jenshnielsen Jun 14, 2017
f2fbe42
docs: Example notebook for QDev specifics (#39)
WilliamHPNielsen Jun 14, 2017
3f76f74
plots: Make QtPlot rescale before saving (#40)
WilliamHPNielsen Jun 14, 2017
d8ffae6
plots: Make the initial empty plot have the right ranges
WilliamHPNielsen Jun 14, 2017
f331fbb
style: Remove obsolete TODO comment
WilliamHPNielsen Jun 14, 2017
6b4fc62
Force a draw of matplotlib figures.
jenshnielsen Jun 22, 2017
3619203
fix: Make plot autoscaling more robust (#47)
WilliamHPNielsen Jun 26, 2017
0ec5c57
Device annotator handle missing raw image without overwriting json
jenshnielsen Jun 27, 2017
9ee755a
make it possible to select font and font size in annotator
jenshnielsen Jun 27, 2017
f4b95a5
Refactor/do measurement (#48)
WilliamHPNielsen Jun 28, 2017
31c663c
make configreader work
WilliamHPNielsen Jun 30, 2017
4a5c301
fix multiplot label issues (#52)
WilliamHPNielsen Jul 3, 2017
830d7c2
Faster qdac (#53)
jenshnielsen Jul 7, 2017
e60ce1b
Resize qt window before saving (#54)
jenshnielsen Jul 19, 2017
8b0c7f4
Fix multiparamplot (#55)
jenshnielsen Jul 19, 2017
a58b769
make it configurable if the matplot(pdf) plots should be shown (#56)
jenshnielsen Aug 2, 2017
6d48274
Crosssection viewer [WIP] (#57)
jenshnielsen Aug 8, 2017
4b6a565
fix default config reader
jenshnielsen Aug 9, 2017
3ec38c1
Save pdfs in subfolder (#60)
jenshnielsen Aug 9, 2017
6de2827
Fix monitor for channel parameters (#61)
jenshnielsen Aug 16, 2017
e36f26d
Support device annotation in spyder (#63)
jenshnielsen Aug 22, 2017
88ad593
natalie_wrappers folder added
nataliejpg Aug 30, 2017
438e68a
add DS_Store to gitignore
nataliejpg Aug 30, 2017
65033ea
sort natalie_wrappers so they work and test with transmon_wrappers
nataliejpg Aug 30, 2017
b2c9429
check functions match originals everywhere, delete originals in wrapp…
nataliejpg Aug 30, 2017
dcc5c7b
add missing imports
nataliejpg Aug 30, 2017
8ebdd47
add missing imports to sweep_functions wrapper
cQED-T3 Aug 30, 2017
f4289e9
add plot_x_position to global dictionary in my init function so that …
cQED-T3 Aug 30, 2017
b260b21
add atexit close station to basic init of wrappers
nataliejpg Sep 1, 2017
514772e
add do0d to wrappers and edit measure.py to behave more like loop for…
nataliejpg Sep 1, 2017
8746109
make show_num_do plotting optional
nataliejpg Sep 1, 2017
828cc67
device annotator into wrappers folder
nataliejpg Sep 4, 2017
5c58141
configreader into wrappers folder and expose sections function in Con…
nataliejpg Sep 4, 2017
d046d2a
device image import updated
nataliejpg Sep 4, 2017
124dad6
monitor into wrapper functions
nataliejpg Sep 4, 2017
778f41c
delete monitor, configreader amd device annotator from utils as they …
nataliejpg Sep 4, 2017
e3e5bb7
merge in driver/ATS9360 and resolve merge conflicts
cQED-T3 Sep 4, 2017
4c02d42
small bug fixes due to monitor moving to wrappers and small changes t…
nataliejpg Sep 6, 2017
5b11134
remove wrappers from qcodes as they now live in their own repo
nataliejpg Sep 6, 2017
9f387b9
merge conflicts resolved
cQED-T3 Sep 6, 2017
13024e0
beginnings of vna driver extension to get spectroscopy mode working
cQED-T3 Sep 15, 2017
4b00eed
merge in ZNB_dev updates
cQED-T3 Sep 15, 2017
059aefa
debug spec mode on ZNB
cQED-T3 Sep 15, 2017
9b92b25
measuting with ZNB
cQED-T3 Oct 30, 2017
bc775d5
T3 edits to fine mode of decadac
cQED-T3 Oct 30, 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
11 changes: 11 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,15 @@ target/
*.py~
tmp/

# DS-store
*.DS_Store

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

venv/

docs/examples/data/*

*.DS_Store
1 change: 1 addition & 0 deletions docs/conf.py
View file
Open in desktop
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