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

Pre release #143

Merged
merged 124 commits into from
Sep 7, 2017
Merged

Pre release #143

merged 124 commits into from
Sep 7, 2017

Conversation

terrorfisch
Copy link
Member

All my changes including (not hardware related)

  • Basic multi channel support
  • For loop pulses
  • Sympy based expressions

and (hardware related and not very compatible to any measurement framework yet)

  • the HardwareSetup class whoich bundles everything
  • support for TaborAWG
  • support for Alazar digitizers via atsaverage

WIP

pbethke and others added 30 commits January 4, 2016 14:34
@pbethke
Add abstract AWG base class, a dummy implementation for debugging and…
dd7a86c 
… tests.
@pbethke
add a tektronix awg driver (not complete) and more tests
d50320a
@pbethke
Merge branch 'multichannel' into awg_class (needed for multiple chann…
130af37 
…els)
@pbethke
fix awg interface
44e1e5d
@pbethke
change tektronix memory model
f881a20
@pbethke
fix plotting and formatting in sequencing
3843abd
@lumip
More documentation for abstract AWG class. Fixed some stuff. Tests cu…
491cade 
…rretnly fail at (de)serialization of multi-channel table pulses.
@lumip
Merge branch 'multichannel' into awg_class
3da96ff 
# Conflicts:
#	qctoolkit/pulses/plotting.py
#	qctoolkit/pulses/sequence_pulse_template.py
#	qctoolkit/pulses/sequencing.py
#	qctoolkit/pulses/table_pulse_template.py
@lumip
Added pyvisa as install requirement.
e6a106a
@lumip
Merge branch 'multichannel' into awg_class
5c50687
@lumip
Merge branch 'master' into awg_class and added missing type annotatio…
543b202 
…ns to AWG classes.

# Conflicts:
#	qctoolkit/pulses/plotting.py
@pbethke
simulation mode for tektronix driver and tests for it
d1bf4eb
@terrorfisch
Measurement window integration:
230bc33 
They now have an identifier that can be remapped for subtemplates
They end up in the EXEC instruction
@terrorfisch
Add REPJInstruction export
10c0646
@terrorfisch
Merge branch 'awg_class' into towards_an_experiment
e476a32 
Conflicts:
	qctoolkit/pulses/plotting.py
@terrorfisch
Them mapping of parameters, measurement window names and channel ids …
e1b9434 
…is now done in the class MappingTemplate

Sequence- and MultiChannelPulseTemplate check only things that are bound to their purpose
Channels now have an ID
@terrorfisch
Working Tabor control flow upload. TODO check if the uploaded pulse d…
d2274c6 
…ata is valid.

First draft for setup class and DAC
@terrorfisch
Introduce atomicity property and redesign waveform:
e766596 
-atomicity may be switched on fi. for SequencePulseTemplates
    -> it will be translated to one waveform
-measurement windows now included in waveform
-waveforms for RepeatedPulseTemplate and SequecencePulseTemplate added
@terrorfisch
First untested implementation for the alazar DAC
944acf6
@terrorfisch
backup program
e9c7c4b
@terrorfisch
Finalize AWG interface (I hope)
79a5942 
Separate tree functionality from Loop functionality
@terrorfisch
Move ChannelID to root package
cce02ec 
Add return annotations
@terrorfisch
Fix bug in parameter mapping serialization
b66cfbe
@terrorfisch
Skip tektronix unittests
8302843 
Fix DummyAWG unittests
@terrorfisch
Use sympy as expression backend. This enables symbolic comparisons be…
307ce68 
…tween expressions.
@terrorfisch
Introduce ForLoopPulseTemplate and base all looping pulse templates o…
364c36d 
…n a common base class
@terrorfisch
ParameterDict to cast constants and expressions automatically
861c060
@terrorfisch
Check that parameter declarations have a valid name
905bfa5
@terrorfisch
Merge branch 'loop_rework' into towards_an_experiment
06db2e8
@terrorfisch
Make program tests more consistent
9f6425f
@coveralls
Copy link

Coverage Status

Coverage decreased (-8.5%) to 87.261% when pulling f5a06d5 on terrorfisch:pre_release into 5e5a213 on qutech:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+1.04%) to 96.778% when pulling 0366100 on terrorfisch:pre_release into 5e5a213 on qutech:master.

@terrorfisch
Remove outdated information from concepts
a8cb49e
@terrorfisch
Add automated waveform concatenation
b47d467
@terrorfisch
Restructure some imports
dbef65b 
Fix some outdated __all__
Update doc strings
Add more imports for annotation usage with autodoc
Rename MappingTemplate to MappingPulseTemplate
@coveralls
Copy link

Coverage Status

Coverage increased (+0.9%) to 96.685% when pulling dbef65b on terrorfisch:pre_release into 5e5a213 on qutech:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.9%) to 96.686% when pulling af39023 on terrorfisch:pre_release into 5e5a213 on qutech:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.9%) to 96.664% when pulling 67ea050 on terrorfisch:pre_release into 5e5a213 on qutech:master.

@terrorfisch terrorfisch merged commit 1993456 into qutech:master Sep 7, 2017
This was referenced Oct 19, 2017
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@terrorfisch @coveralls @pbethke @lumip @pcerf