Rearranged classes of primitives

Split into common, composite, and library specific
BBN-Q · Sep 20, 2016 · 70a5e01 · 70a5e01
1 parent f7e4034
commit 70a5e01
Show file tree

Hide file tree

Showing 5 changed files with 449 additions and 397 deletions.
diff --git a/QGL/PulsePrimitives/all90_primitives.py b/QGL/PulsePrimitives/all90_primitives.py
@@ -14,9 +14,8 @@
 limitations under the License.
 '''
 
-from .common_primitives import overrideDefaults, _memoize, clear_pulse_cache, Id, Z, X90, X90m, Y90, Y90m, Z90, Z90m, Utheta, Xtheta, Ytheta, Ztheta, U90, U, arb_axis_drag,\
-AC, DiAC, CNOT, CNOT_CR, flat_top_gaussian, echoCR, ZX90_CR, MEAS, MeasEcho, BLANK
-
+from .helpers import overrideDefaults, _memoize, clear_pulse_cache
+from .common_primitives import X90, X90m, Y90, Y90m
 #Setup the default 90/180 rotations
 @_memoize
 def X(qubit, **kwargs):