Qelec branch : for travis checks - #27

Open

bhuard wants to merge 133 commits into

MatthieuDartiailh:masterfrom

Commits on May 23, 2014

Basic structures for pulse sequence handling.
unknown
committed
146f75f

Commits on May 30, 2014

WIP on pulse sequences.
MatthieuDartiailh
committed
d6b3c91

Commits on May 31, 2014

More work on pulse sequences
MatthieuDartiailh
committed
3a13e92

Commits on Jun 1, 2014

Fixing PEP8 rules.
MatthieuDartiailh
committed
a36284f

Commits on Jun 3, 2014

First tests on pulses. WIP
MatthieuDartiailh
committed
c18d77a

Commits on Jun 4, 2014

Test pulse, modulation, shape evaluations.
MatthieuDartiailh
committed
27066fb

Commits on Jun 5, 2014

Debugging the sequence compilation.
MatthieuDartiailh
committed
228af64

Commits on Jun 6, 2014

Starting to test saving a pulse sequence.
MatthieuDartiailh
committed
2a9175d

Commits on Jun 25, 2014

Update of pulse system.
MatthieuDartiailh
committed
a01d489

Commits on Jun 26, 2014

Commits on Jun 27, 2014

Commits on Jul 1, 2014

Move non-standard sequences into their own package.
MatthieuDartiailh
committed
20482b1
Finish sequence walk method.
MatthieuDartiailh
committed
14e34bc

Commits on Jul 2, 2014

Implement build_from_config class method for Pulse and Sequence + tests.
MatthieuDartiailh
committed
4d2ca3d

Commits on Jul 3, 2014

Commits on Jul 4, 2014

Add AWGContextView and ConditionalSequenceView.
MatthieuDartiailh
committed
01ed78e
Make only RootSequence context aware.
MatthieuDartiailh
committed
d644c13

Commits on Jul 7, 2014

Adding basic tests for PulsesManagerPlugin, and fixing the bugs dicovered by the tests.
MatthieuDartiailh
committed
1168533

Commits on Aug 20, 2014

Commits on Aug 24, 2014

WIP reorganizing the pulses package
MatthieuDartiailh
committed
19a2298

Commits on Aug 25, 2014

Merge branch 'master' into pulse-sequences
MatthieuDartiailh
committed
9122800

Commits on Aug 26, 2014

Commits on Aug 27, 2014

Fix test file header.
MatthieuDartiailh
committed
06d2614

Commits on Aug 29, 2014

Adding what's needed to insert new pulses in sequences.
MatthieuDartiailh
committed
e356995

Commits on Sep 5, 2014

Fix issue in pulse evaluation : last computed parameters was not correctly added to the local_vars
MatthieuDartiailh
committed
16736f6

Commits on Sep 8, 2014

WIP making sequences have optional time constraints (Moved a lot of code from Pulse to Item). Optimisation of eval-entry (minor)
MatthieuDartiailh
committed
777ec0d

Commits on Sep 9, 2014

Commits on Sep 10, 2014

Commits on Sep 16, 2014

Commits on Sep 17, 2014

Commits on Sep 23, 2014

Wip on workspace (manifest and workspace are ready dialogs are missing no debug performed).
MatthieuDartiailh
committed
f44bcef

Commits on Sep 24, 2014

WIP on pulses workspace (ready for debug)
MatthieuDartiailh
committed
b0f21f8

Commits on Sep 25, 2014

WIP debugging the GUI of pulses workspace.
MatthieuDartiailh
committed
dd2b7c3
More debugging and still a lot to do ....
MatthieuDartiailh
committed
3f61115

Commits on Sep 29, 2014

Commits on Oct 4, 2014

Commits on Jan 29, 2015

Commits on Jan 31, 2015

Commits on Feb 1, 2015

Commits on Feb 2, 2015

Wip adding an arbitrary pulse.
MatthieuDartiailh
committed
8acc00c
Fix minor issues in eval_entries. Added future as a dependency.
MatthieuDartiailh
committed
fee063d
Add future to travis build.
MatthieuDartiailh
committed
21ca76e

Commits on Feb 4, 2015

Commits on Feb 5, 2015

Commits on Feb 6, 2015

Commits on Feb 16, 2015

Commits on Feb 20, 2015

Commits on Feb 25, 2015

Change default of select after transfer in TektroAWG interface to True.
MatthieuDartiailh
committed
5c97220

Commits on Feb 27, 2015

Commits on Jun 5, 2015

Merge branch 'pulse-sequences' of https://github.com/MatthieuDartiailh/HQCMeas into qelec

unknown
authored and
unknown
committed
618e205
wip on Tabor and Alazar

unknown
authored and
unknown
committed
f12274e
wip on Alazar

unknown
authored and
unknown
committed
8adb08c
Add view for Alazar Task

unknown
authored and
unknown
committed
bf3b8ec
Finalisation driver Alazar

unknown
authored and
unknown
committed
e6e0cb9

Commits on Sep 4, 2015

Reshape of the data for demod

unknown
authored and
unknown
committed
b5c1cfd

Commits on Sep 16, 2015

bug resolved in demod_alazar

unknown
authored and
unknown
committed
f52037f

Commits on Oct 28, 2015

bug solved in pulse sequence manager

unknown
authored and
unknown
committed
82d1838

Commits on Oct 30, 2015

Nouveau programme d'acquisition pour l'alazar, codé par Sébastien Jezouin
bhuard
committed
0d9b8f0
Changement du visa du tektro par Sébastien Jezouin
bhuard
committed
e7ea347
New Alazar acquisition with several IQ demod by SJ
bhuard
committed
6c02c7d
AWG bugs fixed by SJ
bhuard
committed
c14a76e

Commits on Nov 4, 2015

Change in Alazar : same phase reference for multiple IQ demod
bhuard
committed
112cc62
Merge branch 'qelec' of https://github.com/bhuard/HQCMeas into qelec
bhuard
committed
7c7dcf7

Commits on Nov 10, 2015

Creation of a new Task allowing to save files in the HDF5 format.
bhuard
committed
0eb2ba3
Modification of DemodAlazarTask in order to be able to record raw traces in addition to the demodulated values
bhuard
committed
38642e2

Commits on Dec 4, 2015

Modification of the PNA get trace so that it works even when SDATA (complex number acquisition) does not. In that case, it records the data in the format that is currently displayed
unknown
committed
9269463
Old commits already in other branches that we think are necessary to commit in order to merge branches... ?
bhuard
committed
c9f79ce
Update demodAlazar in order to allow acquiring time traces of I and Q
unknown
committed
5ec5295
solves a bug on AWG
bhuard
committed
f3f7bd3
Merge branch 'qelec' of https://github.com/bhuard/HQCMeas into qelec
bhuard
committed
dd7c38a
Update demodAlazar in order to allow acquiring time traces of I and Q
unknown
committed
886fb97
Alazar IQ trace in progress
bhuard
committed
43ed76e
Alazar IQ trace debugged
unknown
committed
45677d2

Commits on Jun 10, 2016

IQ measurement ok, version global ok

unknown
authored and
unknown
committed
12aa173
gaussian + arbitrary shapes ok

unknown
authored and
unknown
committed
ccdb42a

Commits on Jun 14, 2016

debug pulse transfer Tabor AWG

unknown
authored and
unknown
committed
5f0d439