Merge pull request #72 from BBN-Q/ZX90-rad

ZX90 rad
BBN-Q · Aug 31, 2016 · b0c4276 · b0c4276
2 parents 6eed8b0 + fbb1343
commit b0c4276
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/QGL/PulsePrimitives.py b/QGL/PulsePrimitives.py
@@ -481,7 +481,7 @@ def ZX90_CR(controlQ, targetQ, **kwargs):
     return echoCR(controlQ,
                   targetQ,
                   amp=params['amp'],
-                  phase=params['phase'] / 180 * np.pi,
+                  phase=params['phase'],
                   length=params['length'],
                   riseFall=params['riseFall'])
 

diff --git a/tests/test_data/awg/TestAPS1/MISC2/MISC2-APS1.h5 b/tests/test_data/awg/TestAPS1/MISC2/MISC2-APS1.h5
diff --git a/tests/test_data/awg/TestAPS1/MISC2/MISC2-APS3.h5 b/tests/test_data/awg/TestAPS1/MISC2/MISC2-APS3.h5
diff --git a/tests/test_data/awg/TestAPS1/MISC3/MISC3-APS1.h5 b/tests/test_data/awg/TestAPS1/MISC3/MISC3-APS1.h5
diff --git a/tests/test_data/awg/TestAPS1/MISC3/MISC3-APS2.h5 b/tests/test_data/awg/TestAPS1/MISC3/MISC3-APS2.h5
diff --git a/tests/test_data/awg/TestAPS1/MISC3/MISC3-APS3.h5 b/tests/test_data/awg/TestAPS1/MISC3/MISC3-APS3.h5
diff --git a/tests/test_data/awg/TestAPS1/MISC4/MISC4-APS1.h5 b/tests/test_data/awg/TestAPS1/MISC4/MISC4-APS1.h5
diff --git a/tests/test_data/awg/TestAPS1/MISC4/MISC4-APS2.h5 b/tests/test_data/awg/TestAPS1/MISC4/MISC4-APS2.h5
diff --git a/tests/test_data/awg/TestAPS1/MISC4/MISC4-APS3.h5 b/tests/test_data/awg/TestAPS1/MISC4/MISC4-APS3.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC2/MISC2-APS1.h5 b/tests/test_data/awg/TestAPS2/MISC2/MISC2-APS1.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC2/MISC2-APS5.h5 b/tests/test_data/awg/TestAPS2/MISC2/MISC2-APS5.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC3/MISC3-APS1.h5 b/tests/test_data/awg/TestAPS2/MISC3/MISC3-APS1.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC3/MISC3-APS3.h5 b/tests/test_data/awg/TestAPS2/MISC3/MISC3-APS3.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC3/MISC3-APS5.h5 b/tests/test_data/awg/TestAPS2/MISC3/MISC3-APS5.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC4/MISC4-APS1.h5 b/tests/test_data/awg/TestAPS2/MISC4/MISC4-APS1.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC4/MISC4-APS3.h5 b/tests/test_data/awg/TestAPS2/MISC4/MISC4-APS3.h5
diff --git a/tests/test_data/awg/TestAPS2/MISC4/MISC4-APS5.h5 b/tests/test_data/awg/TestAPS2/MISC4/MISC4-APS5.h5