Added support for multiple amplitudes to multifreq

QGL/PulsePrimitives.py

@@ -339,8 +339,8 @@ def arb_axis_drag(qubit,
 
 
 def DiatomicPulse(qubit, a, b, c):
-  return (Ztheta(qubit, angle=c) + X90(qubit) + 
-          Ztheta(qubit, angle=b) + X90(qubit) + 
+  return (Ztheta(qubit, angle=c) + X90(qubit) +
+          Ztheta(qubit, angle=b) + X90(qubit) +
           Ztheta(qubit, angle=a))
 
 def ZYZPulse(qubit, a, b, c):
@@ -586,6 +586,10 @@ def PARAM(chan, **kwargs):
     params['frequency'] = tuple(chan.autodyne_freq)
   else:
     params['frequency'] = tuple(kwargs['frequency'])
+  if 'amp_factor' not in kwargs:
+     params['amp_factor'] = tuple(chan.amp_factor)
+  else:
+     params['amp_factor'] = tuple(kwargs['amp_factor'])
   params['baseShape'] = params.pop('shape_fun')
   params['shape_fun'] = PulseShapes.multifrequency
   amp = params.pop('amp')
@@ -599,4 +603,3 @@ def PARAM(chan, **kwargs):
 
   return Pulse("PARAM", chan, params,
           amp, phase, 0.0, ignoredStrParams=ignoredStrParams)
-

QGL/PulseShapes.py

@@ -196,19 +196,23 @@ def autodyne(frequency=10e6, baseShape=constant, **params):
     return shape
 
 
-def multifrequency(frequency=[10e6], baseShape=constant, **params):
+def multifrequency(amp_factor = [1],frequency=[10e6], baseShape=constant, **params):
     """
     A pulse with more than one frequency baked in.
     """
     if not isinstance(frequency, Iterable):
         frequency = (frequency,)
+    if not isinstance(amp_factor, Iterable):
+        amp_factor = (amp_factor,)
     if isinstance(baseShape, str):
         shape = globals()[baseShape](**params)
     else:
         shape = baseShape(**params)
     timePts = np.linspace(0, params['length'], len(shape))
-    for freq in frequency:
-        shape *= np.exp(-1j * 2 * np.pi * freq * timePts)
+    mod = np.zeros(len(shape),dtype = np.complex128)
+    for a,freq in zip(amp_factor,frequency):
+        mod += a*np.exp(-1j * 2 * np.pi * freq * timePts)
+    shape *= mod
     return shape