Fixed plots and references in documentation.

qutech · May 6, 2016 · a1e1e8a · a1e1e8a
1 parent 21a5aa2
commit a1e1e8a
Show file tree

Hide file tree

Showing 11 changed files with 10,032 additions and 314 deletions.
diff --git a/doc/source/concepts/sequencing.rst b/doc/source/concepts/sequencing.rst
@@ -16,7 +16,7 @@ The sequencing process can be interrupted at any point, e.g., if some parameter
 
 Sequencing of Conditional Branching
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Software and hardware conditions result in different instruction sequences generated by the sequencing process: Hardware conditions will produce instructions for all possible branches with branching instructions corresponding to the triggers specified by the :class:`.HardwareCondition` instance. The selection of the correct branch is then made by the hardware. Contrary, software conditions will only produce instructions for the branch selected by the condition (the hardware will then never know of potential other execution paths). In this case, no branching instructions will be used. This enables usage of branching even on hardware that does not support jumps with the disadvantage of being not real-time capable (cf. :ref:`Read more on conditional branching <branching>`.).
+Software and hardware conditions result in different instruction sequences generated by the sequencing process: Hardware conditions will produce instructions for all possible branches with branching instructions corresponding to the triggers specified by the :class:`.HardwareCondition` instance. The selection of the correct branch is then made by the hardware. Contrary, software conditions will only produce instructions for the branch selected by the condition (the hardware will then never know of potential other execution paths). In this case, no branching instructions will be used. This enables usage of branching even on hardware that does not support jumps with the disadvantage of being not real-time capable (cf. :ref:`conditional branching <branching>`.).
 
 Implementation Details and Algorithm Walkthrough
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/doc/source/examples/00SimpleTablePulse.ipynb b/doc/source/examples/00SimpleTablePulse.ipynb
diff --git a/doc/source/examples/01SequencePulse.ipynb b/doc/source/examples/01SequencePulse.ipynb
diff --git a/doc/source/examples/02FunctionPulse.ipynb b/doc/source/examples/02FunctionPulse.ipynb
diff --git a/doc/source/examples/03Serialization.ipynb b/doc/source/examples/03Serialization.ipynb
diff --git a/doc/source/examples/04Sequencing.ipynb b/doc/source/examples/04Sequencing.ipynb
diff --git a/doc/source/examples/05Parameters.ipynb b/doc/source/examples/05Parameters.ipynb
diff --git a/doc/source/examples/06ConditionalExecution.ipynb b/doc/source/examples/06ConditionalExecution.ipynb
@@ -17,7 +17,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -53,7 +53,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -62,7 +62,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "[<qctoolkit.pulses.instructions.EXECInstruction object at 0x000000000748DAC8>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x000000000748DC18>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x000000000748DC88>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x000000000748DCF8>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x000000000748DD68>, <qctoolkit.pulses.instructions.STOPInstruction object at 0x000000000748DDA0>]\n"
+      "[<qctoolkit.pulses.instructions.EXECInstruction object at 0x0000000007870C50>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x0000000007870DA0>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x0000000007870E10>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x0000000007870E80>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x0000000007870EF0>, <qctoolkit.pulses.instructions.STOPInstruction object at 0x0000000007870F28>]\n"
      ]
     }
    ],
@@ -98,7 +98,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
@@ -107,7 +107,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "[<qctoolkit.pulses.instructions.CJMPInstruction object at 0x000000000748DF28>, <qctoolkit.pulses.instructions.STOPInstruction object at 0x000000000748DFD0>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x0000000007462DD8>, <qctoolkit.pulses.instructions.GOTOInstruction object at 0x000000000749B080>]\n"
+      "[<qctoolkit.pulses.instructions.CJMPInstruction object at 0x000000000787F080>, <qctoolkit.pulses.instructions.STOPInstruction object at 0x000000000787F160>, <qctoolkit.pulses.instructions.EXECInstruction object at 0x000000000787F128>, <qctoolkit.pulses.instructions.GOTOInstruction object at 0x000000000787F1D0>]\n"
      ]
     }
    ],
@@ -133,15 +133,6 @@
    "source": [
     "As you can see in the output, the sequencing process now procudes instructions that perform conditional jumps and returns with goto instructions. The details are omitted here, suffice it to say that the trigger is embedded in the conditional jump instruction and this sequence will loop on the hardware as long as the trigger fires."
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {