Fixed version mismatch qutip (rotation)

DiCarloLab-Delft · Mar 27, 2024 · ff8e4c1 · ff8e4c1
1 parent 77d6afe
commit ff8e4c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/pycqed/analysis/tomography.py b/pycqed/analysis/tomography.py
@@ -4,6 +4,7 @@
 # except ImportError as e:
 #     logging.warning('Could not import qutip, tomo code will not work')
 import qutip as qtp
+from qutip.qip import operations
 import numpy as np
 import time
 import scipy
@@ -38,10 +39,10 @@ class TomoAnalysis_JointRO():
     # The set of single qubit rotation matrixes used in the tomography
     # measurement (will be assumed to be used on all qubits)
     rotation_matrixes = [qtp.identity(2), qtp.sigmax(),
-                         qtp.rotation(qtp.sigmax(), np.pi / 2),
-                         qtp.rotation(qtp.sigmay(), np.pi / 2),
-                         qtp.rotation(qtp.sigmax(), -np.pi / 2),
-                         qtp.rotation(qtp.sigmay(), -np.pi / 2)]
+                         operations.gates.rotation(qtp.sigmax(), np.pi / 2),
+                         operations.gates.rotation(qtp.sigmay(), np.pi / 2),
+                         operations.gates.rotation(qtp.sigmax(), -np.pi / 2),
+                         operations.gates.rotation(qtp.sigmay(), -np.pi / 2)]
     measurement_operator_labels = ['I', 'X', 'x', 'y', '-x', '-y']
     # MAKE SURE THE LABELS CORRESPOND TO THE ROTATION MATRIXES DEFINED ABOVE
 
@@ -1164,10 +1165,10 @@ def run_default_analysis(self, **kw):
         TomoAnalysis_JointRO.rotation_matrixes = [
             qtp.identity(2),
             qtp.sigmax(),
-            qtp.rotation(qtp.sigmay(), np.pi / 2),
-            qtp.rotation(qtp.sigmay(), -np.pi / 2),
-            qtp.rotation(qtp.sigmax(), np.pi / 2),
-            qtp.rotation(qtp.sigmax(), -np.pi / 2)]
+            operations.gates.rotation(qtp.sigmay(), np.pi / 2),
+            operations.gates.rotation(qtp.sigmay(), -np.pi / 2),
+            operations.gates.rotation(qtp.sigmax(), np.pi / 2),
+            operations.gates.rotation(qtp.sigmax(), -np.pi / 2)]
         TomoAnalysis_JointRO.measurement_operator_labels = ['I', 'X', 'y',
                                                             '-y', 'x', '-x']
         TomoAnalysis_JointRO.measurement_basis = [qtp.identity(2),

diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,7 @@
 # If you are installing pycqed on your computer run
 # `pip install qutip` before you install pycqed
 
+qutip-qip
 qcodes
 numpy<=1.21  # Required for 3rd party packages that still rely on (deprecated) numpy dtype aliases. Such as np.float, np.complex, etc. (sklearn, ...)
 cython
@@ -46,4 +47,5 @@ pytest
 # cmake
 # wheel
 # # Manually build from source.
-# qutechopenql @ git+https://github.com/DiCarloLab-Delft/OpenQL@82a9881bdb2c2f2b0620c14c549c436f21d1607c  # Build from commit
+# qutechopenql @ git+https://github.com/DiCarloLab-Delft/OpenQL@82a9881bdb2c2f2b0620c14c549c436f21d1607c  # Build from commit
+git+https://github.com/DiCarloLab-Delft/QCoCircuits