From c2f63d4935e2c261d687a7f336b11048bd1bfb42 Mon Sep 17 00:00:00 2001
From: matthewware <matthew.e.ware@gmail.com>
Date: Thu, 14 Jun 2018 21:50:22 -0400
Subject: [PATCH] Revert "Added RB axis descriptor"

This reverts commit 593dc0c3fc2a5ce2ed3c834e0f1ea5df9c415ccb.
---
 QGL/BasicSequences/RB.py      | 11 -----------
 QGL/BasicSequences/helpers.py |  9 ---------
 2 files changed, 20 deletions(-)

diff --git a/QGL/BasicSequences/RB.py b/QGL/BasicSequences/RB.py
index ed380d93..6075445d 100644
--- a/QGL/BasicSequences/RB.py
+++ b/QGL/BasicSequences/RB.py
@@ -2,11 +2,7 @@
 from ..Compiler import compile_to_hardware
 from ..PulseSequencePlotter import plot_pulse_files
 from ..Cliffords import clifford_seq, clifford_mat, inverse_clifford
-<<<<<<< Updated upstream
 from .helpers import create_cal_seqs, cal_descriptor
-=======
-from .helpers import create_cal_seqs, basic_RB_descriptor, cal_descriptor
->>>>>>> Stashed changes
 
 import os
 from csv import reader
@@ -84,14 +80,7 @@ def SingleQubitRB(qubit, seqs, purity=False, showPlot=False, add_cals=True):
         seqsBis += create_cal_seqs((qubit, ), 2)
         axis_descriptor.append(cal_descriptor((qubit,), 2))
 
-<<<<<<< Updated upstream
     metafile = compile_to_hardware(seqsBis, 'RB/RB', axis_descriptor = axis_descriptor, extra_meta = {'sequences':seqs})
-=======
-    metafile = compile_to_hardware(seqsBis, 'RB/RB', axis_descriptor=[
-        basic_RB_descriptor(len(seqs)),
-        cal_descriptor((qubit,), 2)
-    ])
->>>>>>> Stashed changes
 
     if showPlot:
         plot_pulse_files(metafile)
diff --git a/QGL/BasicSequences/helpers.py b/QGL/BasicSequences/helpers.py
index 3c183193..572c250d 100644
--- a/QGL/BasicSequences/helpers.py
+++ b/QGL/BasicSequences/helpers.py
@@ -64,12 +64,3 @@ def delay_descriptor(delays, desired_units="us"):
         'partition': 1
     }
     return axis_descriptor
-
-def basic_RB_descriptor(num_seqs, desired_units="number"):
-    axis_descriptor = {
-        'name': 'sequence',
-        'unit': desired_units,
-        'points': list(range(num_seqs)),
-        'partition': 1
-    }
-    return axis_descriptor