Fix/frame update #52

dieris · 2016-07-07T13:17:44Z

Fixed merging of modulation instructions.

The sequence SimultaneousRB_AC works in the experiment, but fails in the test, with multiple differences against the example sequence. Not sure how to compare the differences.

Merge MODULATE commands when there is no pending frame update; merge consecutive UPDATE_FRAME commands --CAR and DR

--DR

coveralls · 2016-07-07T13:30:05Z

Coverage increased (+0.09%) to 73.818% when pulling 492abf1 on fix/frame-update into 45226f7 on master.

caryan · 2016-07-08T02:01:32Z

The test data isn't wrong it just doesn't allow for dropping initial Z rotations.

caryan · 2016-07-08T02:28:19Z

@dieris could you please give 8745a78 a try on the qubits. It implement the initial Z rotations by putting them before the trigger (held modulation commands are also implemented on a trigger).

coveralls · 2016-07-08T02:36:40Z

Coverage increased (+0.04%) to 73.767% when pulling 8745a78 on fix/frame-update into 45226f7 on master.

dieris · 2016-07-08T14:58:31Z

8745a78 still doesn't cover the case where UPDATE_FRAME follows SET_FREQ (last instruction is not WAIT). Should the order be: SET_FREQ, UPDATE_FRAME, WAIT? This happens for example if the first sequence starts with a frame update.

caryan · 2016-07-08T16:19:57Z

Indeed, again highlighting our lack of test coverage for SSB.

caryan · 2016-07-08T16:25:02Z

492abf1 should cover the non-zero SSB case too.

coveralls · 2016-07-08T16:25:25Z

Coverage decreased (-53.5%) to 20.176% when pulling 96bdd81 on fix/frame-update into 45226f7 on master.

coveralls · 2016-07-08T16:48:58Z

Coverage increased (+0.009%) to 73.734% when pulling 071ec78 on fix/frame-update into 3970877 on master.

@blakejohnson

with @blakejohnson

@blakejohnson

with @blakejohnson

@blakejohnson

with @blakejohnson

@blakejohnson

with @blakejohnson

@blakejohnson

Will only cache pulses without keyword arguments for now. with @blakejohnson

…opies also remove repeated code with helper function for pulse length updating

@blakejohnson

with @blakejohnson

@blakejohnson

with @blakejohnson

@blakejohnson

with @blakejohnson

@blakejohnson

with @blakejohnson

dieris · 2016-07-12T14:08:43Z

There is still something inconsistent. These RB_AC seqs. are nominally the same, but they work for one qubit and not for the other! The failing seqs. (wrong result) are those starting with ArbAxis for APSII3 (but they are okay for APSII7). I can't find the difference... (apart from pulse length)

See for example instructions 145 to 167 in both files, corresponding to:

[WAIT,
 ArbAxis(q)⊗ TRIG(slaveTrig)⊗ Id(digitizerTrig)⊗ Id(M-q),
 U(q),
 ArbAxis(q),
 Y(q),
 ArbAxis(q),
 Y90(q),
 ArbAxis(q),
 ArbAxis(q),
 MEAS(M-q)⊗ TRIG(digitizerTrig)⊗ Id(slaveTrig)⊗ Id(q)]

I'll do more testing on the qubits. When SSB and pulse lengths are the same, the pulses are identical at the scope.

@blakejohnson

with @blakejohnson

This reverts commit 86ad3a4.

@blakejohnson

with @blakejohnson

@blakejohnson

also allow some PatternUtil functions to check for other waveform types with @blakejohnson

@blakejohnson

with @blakejohnson

@blakejohnson

with @blakejohnson

@blakejohnson

calling `logging.getLoger` on every call was surprisingly slow with @blakejohnson

construct `APSWaveform` object for repeats and add equality testing for `APSWaveform` class

🎨 format all files with yapf

namedtuple Pulses and other performance improvements

Merge MODULATE commands when there is no pending frame update; merge consecutive UPDATE_FRAME commands --CAR and DR

--DR

…fix/frame-update

coveralls · 2016-07-14T20:05:10Z

Coverage decreased (-53.4%) to 20.33% when pulling f20e0ec on fix/frame-update into 3970877 on master.

caryan · 2016-07-15T01:27:21Z

@dieris so was there a resolution to SSB sign issue?

dieris · 2016-07-15T13:20:49Z

yes, the sign is correct. But the atomic Clifford gate fidelity for one of the qubits is just terrible (independently of mixer, APS, etc.)

CoherenceController added 2 commits June 29, 2016 16:12

Proper merging of modulate commands

7ccc140

Merge MODULATE commands when there is no pending frame update; merge consecutive UPDATE_FRAME commands --CAR and DR

Fix condition for adding a frame update

492abf1

--DR

dieris assigned caryan Jul 7, 2016

Implement initial Z rotations in APS2

8745a78

Handle frequency setting with initial frame change

071ec78

caryan force-pushed the fix/frame-update branch from 96bdd81 to 071ec78 Compare July 8, 2016 16:38

caryan added 13 commits July 10, 2016 15:20

🎨 format all files with yapf

0d4222e

Pulses -> namedtuple

93a333c

with @blakejohnson

CompositePulse -> namedtuple

a6674f6

with @blakejohnson

Fix the damage...

26829cf

with @blakejohnson

Bring back ignoredStrParams for TAPulse

3df1d2c

with @blakejohnson

Turn on pulse caching

5c8cf67

Will only cache pulses without keyword arguments for now. with @blakejohnson

copy pulse dictionary when updating Pulse to avoid clobbering other c…

293b8a3

…opies also remove repeated code with helper function for pulse length updating

add pulse function to cache key

5ed41e9

with @blakejohnson

create new Pulse objects when concatenating and merging

9ec2faf

import copy

ae89b5f

🐛 updating wrong object when concatenating marker pulses

f259e23

with @blakejohnson

CompositePulses are now iterable too

2615131

with @blakejohnson

print length of waveform not number of sequences

79fb19c

with @blakejohnson

🚧 attempts at namedtuple APSWaveform

86ad3a4

with @blakejohnson

caryan and others added 18 commits July 12, 2016 11:22

Revert ":construction: attempts at namedtuple APSWaveform"

5dca93a

This reverts commit 86ad3a4.

🐛 zero length pulses are ok

d635d04

with @blakejohnson

APSWaveform class rather than dynamically add to Waveform

ef3aa82

also allow some PatternUtil functions to check for other waveform types with @blakejohnson

🐎 remove unnecessary calls to str

b8de490

with @blakejohnson

🐎 PulseBlock list comprehension -> generator expression

91ce316

with @blakejohnson

🐎 make logger module global

6572c90

calling `logging.getLoger` on every call was surprisingly slow with @blakejohnson

🐎 ditch np.allclose and list comprehensions -> generator expressions

5c2246f

✅ fix unrolling tests

4a9ba51

construct `APSWaveform` object for repeats and add equality testing for `APSWaveform` class

🐛 use _replace to modify Pulse label

565f3de

🐎 generator expression for instruction data array creation

1cd1d62

Merge pull request #58 from BBN-Q/feature/yapf-formatting

6b6035d

🎨 format all files with yapf

import QGL.drivers for update_wf_library

1a221fd

Merge pull request #60 from BBN-Q/feature/namedtuples

374474f

namedtuple Pulses and other performance improvements

Proper merging of modulate commands

7263365

Merge MODULATE commands when there is no pending frame update; merge consecutive UPDATE_FRAME commands --CAR and DR

Fix condition for adding a frame update

14e4005

--DR

Implement initial Z rotations in APS2

3bcc58b

Handle frequency setting with initial frame change

ddb3e57

Merge branch 'fix/frame-update' of https://github.com/BBN-Q/QGL into …

f20e0ec

…fix/frame-update

Fix indentation

15660a9

dieris merged commit 397d2bd into master Jul 14, 2016

caryan deleted the fix/frame-update branch July 17, 2016 18:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/frame update #52

Fix/frame update #52

dieris commented Jul 7, 2016

coveralls commented Jul 7, 2016 •

edited

Loading

caryan commented Jul 8, 2016

caryan commented Jul 8, 2016

coveralls commented Jul 8, 2016 •

edited

Loading

dieris commented Jul 8, 2016 •

edited by caryan

Loading

caryan commented Jul 8, 2016

caryan commented Jul 8, 2016 •

edited

Loading

coveralls commented Jul 8, 2016

coveralls commented Jul 8, 2016 •

edited

Loading

dieris commented Jul 12, 2016 •

edited

Loading

coveralls commented Jul 14, 2016 •

edited

Loading

caryan commented Jul 15, 2016

dieris commented Jul 15, 2016

Fix/frame update #52

Fix/frame update #52

Conversation

dieris commented Jul 7, 2016

coveralls commented Jul 7, 2016 • edited Loading

caryan commented Jul 8, 2016

caryan commented Jul 8, 2016

coveralls commented Jul 8, 2016 • edited Loading

dieris commented Jul 8, 2016 • edited by caryan Loading

caryan commented Jul 8, 2016

caryan commented Jul 8, 2016 • edited Loading

coveralls commented Jul 8, 2016

coveralls commented Jul 8, 2016 • edited Loading

dieris commented Jul 12, 2016 • edited Loading

coveralls commented Jul 14, 2016 • edited Loading

caryan commented Jul 15, 2016

dieris commented Jul 15, 2016

coveralls commented Jul 7, 2016 •

edited

Loading

coveralls commented Jul 8, 2016 •

edited

Loading

dieris commented Jul 8, 2016 •

edited by caryan

Loading

caryan commented Jul 8, 2016 •

edited

Loading

coveralls commented Jul 8, 2016 •

edited

Loading

dieris commented Jul 12, 2016 •

edited

Loading

coveralls commented Jul 14, 2016 •

edited

Loading