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

Pre release #143

Merged
merged 124 commits into from
Sep 7, 2017
Merged

Pre release #143

Changes from 1 commit
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
dd7a86c
Add abstract AWG base class, a dummy implementation for debugging and…
pbethke Jan 4, 2016
d50320a
add a tektronix awg driver (not complete) and more tests
pbethke Jan 13, 2016
130af37
Merge branch 'multichannel' into awg_class (needed for multiple chann…
pbethke Jan 13, 2016
44e1e5d
fix awg interface
pbethke Mar 14, 2016
f881a20
change tektronix memory model
pbethke Mar 14, 2016
3843abd
fix plotting and formatting in sequencing
pbethke Mar 14, 2016
491cade
More documentation for abstract AWG class. Fixed some stuff. Tests cu…
lumip Jun 3, 2016
3da96ff
Merge branch 'multichannel' into awg_class
lumip Jun 10, 2016
e6a106a
Added pyvisa as install requirement.
lumip Jun 10, 2016
5c50687
Merge branch 'multichannel' into awg_class
lumip Jun 10, 2016
543b202
Merge branch 'master' into awg_class and added missing type annotatio…
lumip Jul 29, 2016
d1bf4eb
simulation mode for tektronix driver and tests for it
pbethke Nov 3, 2016
230bc33
Measurement window integration:
terrorfisch Nov 22, 2016
10c0646
Add REPJInstruction export
terrorfisch Nov 23, 2016
e476a32
Merge branch 'awg_class' into towards_an_experiment
terrorfisch Nov 23, 2016
e1b9434
Them mapping of parameters, measurement window names and channel ids …
terrorfisch Dec 6, 2016
d2274c6
Working Tabor control flow upload. TODO check if the uploaded pulse d…
terrorfisch Jan 17, 2017
e766596
Introduce atomicity property and redesign waveform:
terrorfisch Feb 15, 2017
944acf6
First untested implementation for the alazar DAC
terrorfisch Feb 15, 2017
e9c7c4b
backup program
terrorfisch Feb 15, 2017
79a5942
Finalize AWG interface (I hope)
terrorfisch Feb 21, 2017
cce02ec
Move ChannelID to root package
terrorfisch Feb 21, 2017
b66cfbe
Fix bug in parameter mapping serialization
terrorfisch Feb 21, 2017
8302843
Skip tektronix unittests
terrorfisch Feb 21, 2017
307ce68
Use sympy as expression backend. This enables symbolic comparisons be…
terrorfisch Feb 21, 2017
364c36d
Introduce ForLoopPulseTemplate and base all looping pulse templates o…
terrorfisch Mar 2, 2017
861c060
ParameterDict to cast constants and expressions automatically
terrorfisch Mar 2, 2017
905bfa5
Check that parameter declarations have a valid name
terrorfisch Mar 2, 2017
06db2e8
Merge branch 'loop_rework' into towards_an_experiment
terrorfisch Mar 2, 2017
9f6425f
Make program tests more consistent
terrorfisch Mar 2, 2017
b33434d
Add a tiny bit missing documentation
terrorfisch Mar 2, 2017
6996d10
Annotation fixes
terrorfisch Mar 3, 2017
bc6103e
Make program and tabor tests pass.
terrorfisch Mar 3, 2017
127e4d8
Add test for voltage->binary conversion
terrorfisch Mar 3, 2017
ed2f583
Fix plotting
terrorfisch Mar 9, 2017
54288c2
FunctionPulseTemplate/FunctionWaveform update:
terrorfisch Mar 9, 2017
8621947
Fix MultiChannelWaveform compare_key
terrorfisch Mar 9, 2017
eee5d68
Replace pytabor make_combined_wave with more efficient and adapted va…
terrorfisch Mar 9, 2017
f1358bb
Simplify DummyAWG
terrorfisch Mar 9, 2017
637b391
Misc non hardware changes
pcerf Mar 9, 2017
89b3d26
Make measurement window collection more efficient. Consider complete …
terrorfisch Mar 9, 2017
40f3c94
Tabor AWG works in advanced sequencing mode
terrorfisch Mar 9, 2017
5b62448
Add files I used while testing the setup to use in documentation late…
terrorfisch Mar 9, 2017
d6313b5
Fic duration evaluation in function pulse template
terrorfisch Mar 9, 2017
9b6252d
Skip tests if pytabor or pyvisa are not found
terrorfisch Mar 9, 2017
ad19bde
Merge branch 'towards_an_experiment' of https://github.com/terrorfisc…
terrorfisch Mar 9, 2017
7e355bb
Update travis dependencies
terrorfisch Mar 9, 2017
b87e68b
Fix a few tests.
terrorfisch Mar 9, 2017
cc22426
Add dummy TaborAWG
terrorfisch Mar 9, 2017
3e72ef9
Update travis to use conda environment
terrorfisch Mar 9, 2017
38c1d72
Move to correct module
terrorfisch Mar 9, 2017
016fd37
Make use of dummy if instrument not found
terrorfisch Mar 9, 2017
3737452
Fix more dummy dependencies
terrorfisch Mar 9, 2017
9994a91
Make dummy packages even smarter
terrorfisch Mar 9, 2017
6e9d26f
more and better pyvisa dummy
terrorfisch Mar 9, 2017
c744b11
Fix error message
pcerf Apr 11, 2017
3cfc749
Multi channel plotting fix
terrorfisch Apr 11, 2017
93c5807
Implement single waveform mode
terrorfisch Apr 11, 2017
a5ea809
Merge remote-tracking branch 'origin/make_unit_tests_great_again' int…
pcerf Apr 11, 2017
57294ec
Parameter constraints and comparable expressions
terrorfisch Apr 12, 2017
c308c2e
Begin of table pulse overhaul
terrorfisch Apr 12, 2017
385144d
Make expression naming more consistent and add repr and str tests
terrorfisch Apr 19, 2017
83f85b7
Fix most unittests
terrorfisch Apr 19, 2017
91ed64a
Extend dummy device capabilities
terrorfisch Apr 19, 2017
e75f613
Missing type annotations
terrorfisch Apr 19, 2017
d34c546
Introduce AtomicMultiChannelPulseTemplate
terrorfisch May 19, 2017
13eabe8
Extend tests
terrorfisch May 19, 2017
19f1424
Remove sample generator from tests
terrorfisch May 19, 2017
555aae6
Update examples 01 to 04
terrorfisch Jul 12, 2017
e414a35
Bug fixes: Mainly not updated function signatures
terrorfisch Jul 12, 2017
6d1ffb3
save all:
terrorfisch Aug 1, 2017
83ab807
Enable channelID sorting for mixed types (int, str)
terrorfisch Aug 2, 2017
ceefabf
Make names of classes associated with TablePulseTemplate all start wi…
terrorfisch Aug 2, 2017
8ba157a
Add PointPulseTemplate
terrorfisch Aug 2, 2017
2658e77
Remove BranchPulseTemplate
terrorfisch Aug 2, 2017
3eefb8e
Remove unneeded coverage checker
terrorfisch Aug 2, 2017
3b976a8
Remove simple square pulse example from package
terrorfisch Aug 2, 2017
115e7e3
Remove qcmatlab (MATLAB interface)
terrorfisch Aug 2, 2017
a8fd315
Remove type_check (not used at all, what was it for in the first place?)
terrorfisch Aug 2, 2017
f7a5da5
Remove qcmatlab tests
terrorfisch Aug 2, 2017
ead2cfd
Add missing type annotations
terrorfisch Aug 2, 2017
d1011a9
First draft of hardware example
terrorfisch Aug 3, 2017
12e1faa
Remove qcmatlab from setup.py
terrorfisch Aug 3, 2017
cb5a157
Remove implicit float conversion of parameter
terrorfisch Aug 3, 2017
01c7e0c
Optimize Alazar arming if driver is already configured
terrorfisch Aug 14, 2017
c678289
Do not import matlplotlib if plotting is not used
terrorfisch Aug 14, 2017
fe56986
ForLoopPulseTemplate casts range variables to int if possible
terrorfisch Aug 14, 2017
19e4e83
Give MappingPulseTemplates identifiers
terrorfisch Aug 14, 2017
6bc3efe
FIX BUG: permanent delete of loop variable
terrorfisch Aug 16, 2017
bfa411d
Fix AtomicMultiChannelPulseTemplate serialization
terrorfisch Aug 16, 2017
bdbe898
Remove MultiChannelPulseTemplate for now. To be added again later on
terrorfisch Aug 16, 2017
30b2b80
Move "flatten" funtionality from tabor specific part to program and a…
terrorfisch Aug 17, 2017
834250c
FIX: Removing channels from HardwareSetup
terrorfisch Aug 17, 2017
8773c6f
FIX RepetitionPulseTemplate sequencing
terrorfisch Aug 17, 2017
83d1475
Extend examples
terrorfisch Aug 17, 2017
2a676e4
Fix docstring error and warning
terrorfisch Aug 17, 2017
f59443b
Add AtomicMultiChannelPT serialization tests
terrorfisch Aug 17, 2017
7c9f157
Restructure __init__ files to be more user friendly
terrorfisch Aug 17, 2017
74acba2
Fix broken imports and make dummy module load central
terrorfisch Aug 17, 2017
4dbe763
Remove dead code
terrorfisch Aug 18, 2017
f739d71
Make tests pass
terrorfisch Aug 18, 2017
6975fdf
Remove dead code
terrorfisch Aug 21, 2017
bfbe262
Increase test coverage
terrorfisch Aug 21, 2017
363f6b9
Move DummyAWG to tests
terrorfisch Aug 22, 2017
72ad000
Extend setup tests
terrorfisch Aug 23, 2017
f5a06d5
Extend hardware tests
terrorfisch Aug 23, 2017
b985f97
Add missing alazar tests
terrorfisch Aug 23, 2017
bf620bb
Move tektronix tests to different file
terrorfisch Aug 23, 2017
87fd09f
Remove Tektronix AWG support for now
terrorfisch Aug 23, 2017
c57d749
Extend tabor tests significantly
terrorfisch Aug 24, 2017
0366100
Possible fix for failing test that works locally
terrorfisch Aug 24, 2017
a8cb49e
Remove outdated information from concepts
terrorfisch Aug 30, 2017
b47d467
Add automated waveform concatenation
terrorfisch Aug 31, 2017
dbef65b
Restructure some imports
terrorfisch Aug 31, 2017
b7d0a5f
Update SimpleTablePulse example
terrorfisch Aug 31, 2017
338a3a1
Update doc requirements
terrorfisch Aug 31, 2017
94d43b6
FIX bug in PointPulseTemplate + test
terrorfisch Aug 31, 2017
9eb7906
Make sequencing handle numpy.ndarray correctly and extend plotting in…
terrorfisch Aug 31, 2017
af39023
Add, rename and reorder some examples
terrorfisch Aug 31, 2017
1ae48cc
FIX obvious bugs in tabor driver
terrorfisch Sep 5, 2017
0a6c97c
Extend examples, make constraints Expressions and clarify some except…
terrorfisch Sep 7, 2017
679ec9b
Better J FID example
terrorfisch Sep 7, 2017
8da45ca
Update doc source
terrorfisch Sep 7, 2017
67ea050
Tabor FIX (again)
terrorfisch Sep 7, 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
Prev Previous commit
Next Next commit
Remove simple square pulse example from package
  • Loading branch information
@terrorfisch
terrorfisch committed Aug 2, 2017
commit 3b976a8be90bcc439d98e71f38ca0d318ff3f678
81 changes: 0 additions & 81 deletions qctoolkit/examples/simple_square_pulse.py
View file
Open in desktop

This file was deleted.