Skip to content

Commit

Permalink
Merging error in Compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
Diego Ristè committed Oct 22, 2019
1 parent e3b1ae1 commit 7ed44ab
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion QGL/Compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,9 @@ def compile_to_hardware(seqs,
meas_decoupled_qs = None,
CR_chs = None,
CR_decoupled_chs = None,
add_slave_trigger=True):
add_slave_trigger=True,
extra_meta = None,
tdm_seq = False):
'''
Compiles 'seqs' to a hardware description and saves it to 'fileName'.
Other inputs:
Expand Down

0 comments on commit 7ed44ab

Please sign in to comment.