Pass generic entangling sequence function

Author: Leonardo Ranzani

QGL/BasicSequences/RB.py

@@ -261,7 +261,7 @@ def TwoQubitRB(q1: Channels.LogicalChannel,
                cliff_type: str = 'std',
                showPlot: bool = False,
                suffix: str = "",
-               add_cals: bool = True,parametric: bool = False) -> str:
+               add_cals: bool = True,entangling_seq = None ) -> str:
     """
     Two qubit randomized benchmarking using 90 and 180 single qubit generators
     and ZX90.
@@ -303,7 +303,7 @@ def TwoQubitRB(q1: Channels.LogicalChannel,
     seqsBis = []
     for seq in seqs:
         seqsBis.append(reduce(operator.add,
-                              [TwoQubitClifford(q2, q1, c, kind=cliff_type,parametric)
+                              [TwoQubitClifford(q2, q1, c, kind=cliff_type,entangling_seq)
                                              for c in seq]))
 
     #Add the measurement to all sequences

QGL/Cliffords.py

@@ -376,36 +376,40 @@ def Cx2(c1, c2, q1, q2, kind='std'):
     #Create the pulse block
     return seq1 * seq2
 
-def entangling_seq(gate, q1, q2,parametric=False):
+def entangling_seq(gate, q1, q2):
     """
     Helper function to create the entangling gate sequence
     """
-    if parametric==False:
-        if gate == "CNOT":
-            return ZX90_CR(q2, q1)
-        elif gate == "iSWAP":
-            return [ZX90_CR(q2, q1) , Y90m(q1) * Y90m(q2), ZX90_CR(q2, q1)]
-        elif gate == "SWAP":
-            return [ZX90_CR(q2, q1), Y90m(q1) * Y90m(q2), ZX90_CR(
+    if gate == "CNOT":
+        return ZX90_CR(q2, q1)
+    elif gate == "iSWAP":
+        return [ZX90_CR(q2, q1) , Y90m(q1) * Y90m(q2), ZX90_CR(q2, q1)]
+    elif gate == "SWAP":
+        return [ZX90_CR(q2, q1), Y90m(q1) * Y90m(q2), ZX90_CR(
                 q2, q1), (X90(q1) + Y90m(q1)) * X90(q2), ZX90_CR(q2, q1)]
-    else:
-        if gate == "CNOT":
-            return [X90(q1),Z90(q1)*Z90m(q2),iSWAP(q1,q2),X90(q2),iSWAP(q1,q2),Z90(q1)]
-        elif gate == "iSWAP":
-            return [iSWAP(q1,q2)]
-        elif gate == "SWAP":
-            return [X90(q1),Z90(q1) * Z90m(q2),iSWAP(q1,q2),X90(q2),iSWAP(q1,q2),Z90(q1),
+
+def entangling_seq2(gate, q1, q2):
+
+    if gate == "CNOT":
+        return [X90(q1),Z90(q1)*Z90m(q2),iSWAP(q1,q2),X90(q2),iSWAP(q1,q2),Z90(q1)]
+    elif gate == "iSWAP":
+        return [iSWAP(q1,q2)]
+    elif gate == "SWAP":
+        return [X90(q1),Z90(q1) * Z90m(q2),iSWAP(q1,q2),X90(q2),iSWAP(q1,q2),Z90(q1),
                 Y90(q2),X(q2),Z90m(q1) * Z90m(q2),iSWAP(q1,q2),Y90(q1),X(q1)]
 
-def TwoQubitClifford(q1, q2, cliffNum, kind='std',parametric=False):
+def TwoQubitClifford(q1, q2, cliffNum, kind='std',entangling_sequence = None):
 
     if kind.upper() not in clifford_map.keys():
         raise ValueError(f"Unknown clifford type: must be one of {clifford.map.keys()}.")
 
+    if entangling_sequence == None:
+        entangling_sequence = entangling_seq
+
     c = C2Seqs[cliffNum]
     seq = [Cx2(c[0][0], c[0][1], q1, q2, kind=kind)]
     if c[1]:
-        seq += entangling_seq(c[1], q1, q2,parametric)
+        seq += entangling_sequence(c[1], q1, q2)
     if c[2]:
         seq += [Cx2(c[2][0], c[2][1], q1, q2, kind=kind)]
     return seq