Skip to content

Commit

Permalink
Some more underscore-hyphen fixes. Remove comparison plotter for now
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamrow committed Dec 19, 2017
1 parent b47f89f commit 0769c2e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions QGL/PulseSequencePlotter.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def extract_waveforms(fileNames, nameDecorator='', time=False):
if all_zero_seqs(seqs):
continue
num_seqs = max(num_seqs, len(seqs))
line_names.append(AWGName + nameDecorator + '_' + k)
line_names.append((AWGName + nameDecorator + '_' + k).replace("-","_"))
k_ = line_names[-1].replace("-", "_")
for ct, seq in enumerate(seqs):
data_dicts[k_ + "_{:d}".format(ct + 1)] = {}
Expand All @@ -199,9 +199,9 @@ def plot_pulse_files_compare(metafile1, metafile2, time=False):
fileNames2 = []

with open(metafile1, 'r') as FID:
meta_info = json.load(FID)
meta_info1 = json.load(FID)

for el in meta_info["instruments"].values():
for el in meta_info1["instruments"].values():
# Accomodate seq_file per instrument and per channel
if isinstance(el, str):
fileNames1.append(el)
Expand All @@ -210,9 +210,9 @@ def plot_pulse_files_compare(metafile1, metafile2, time=False):
fileNames1.append(file)

with open(metafile2, 'r') as FID:
meta_info = json.load(FID)
meta_info2 = json.load(FID)

for el in meta_info["instruments"].values():
for el in meta_info2["instruments"].values():
# Accomodate seq_file per instrument and per channel
if isinstance(el, str):
fileNames2.append(el)
Expand Down
2 changes: 1 addition & 1 deletion QGL/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
from .ControlFlow import repeat, repeatall, qif, qwhile, qdowhile, qfunction, qwait, qsync, Barrier
from .BasicSequences import *
from .Plotting import output_file, output_notebook, show, build_waveforms, plot_waveforms
from .PulseSequencePlotter import plot_pulse_files, plot_pulse_files_compare
from .PulseSequencePlotter import plot_pulse_files
from .Tomography import state_tomo, process_tomo
from .Scheduler import schedule

0 comments on commit 0769c2e

Please sign in to comment.