From 7eea7cef17450f0b0b32dd2abb760e4353598c8d Mon Sep 17 00:00:00 2001 From: Ali Javadi Date: Sun, 16 May 2021 20:23:08 -0400 Subject: [PATCH 1/2] remove uses of combine/extend in tomography --- qiskit/ignis/verification/tomography/basis/circuits.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qiskit/ignis/verification/tomography/basis/circuits.py b/qiskit/ignis/verification/tomography/basis/circuits.py index 4b835d8ee..90fced56e 100644 --- a/qiskit/ignis/verification/tomography/basis/circuits.py +++ b/qiskit/ignis/verification/tomography/basis/circuits.py @@ -462,20 +462,18 @@ def _tomography_circuits( # Generate preparation circuit if prep_label is not None: for j in range(num_qubits): - prep += preparation(prep_label[j], prep_qubits[j]) + prep.compose(preparation(prep_label[j], prep_qubits[j]), [j], inplace=True) prep.barrier(*qubit_registers) # Add circuit being tomographed - prep += circuit + prep.compose(circuit, inplace=True) # Generate Measurement circuit for meas_label in meas_labels: meas = QuantumCircuit(*registers) if meas_label is not None: meas.barrier(*qubit_registers) for j in range(num_qubits): - meas += measurement(meas_label[j], - meas_qubits[j], - clbits[j]) - circ = prep + meas + meas.compose(measurement(meas_label[j], meas_qubits[j], clbits[j]), [j], [j], inplace=True) + circ = prep.compose(meas) if prep_label is None: # state tomography circuit circ.name = str(meas_label) From fb09dfc09c918ea84f6801706a708ab6498e672b Mon Sep 17 00:00:00 2001 From: Ali Javadi Date: Sun, 16 May 2021 20:25:58 -0400 Subject: [PATCH 2/2] lint --- qiskit/ignis/verification/tomography/basis/circuits.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qiskit/ignis/verification/tomography/basis/circuits.py b/qiskit/ignis/verification/tomography/basis/circuits.py index 90fced56e..fc731ae3d 100644 --- a/qiskit/ignis/verification/tomography/basis/circuits.py +++ b/qiskit/ignis/verification/tomography/basis/circuits.py @@ -472,7 +472,8 @@ def _tomography_circuits( if meas_label is not None: meas.barrier(*qubit_registers) for j in range(num_qubits): - meas.compose(measurement(meas_label[j], meas_qubits[j], clbits[j]), [j], [j], inplace=True) + meas.compose(measurement(meas_label[j], meas_qubits[j], clbits[j]), + [j], [j], inplace=True) circ = prep.compose(meas) if prep_label is None: # state tomography circuit