Merge remote-tracking branch 'origin/master'

# Conflicts: # examples/demo_cos2phi_qubit.ipynb # examples/demo_hilbertspace.ipynb
scqubits · Jul 30, 2023 · 64cf6b2 · 64cf6b2
2 parents 867b6c2 + 441a6a1
commit 64cf6b2
Show file tree

Hide file tree

Showing 5 changed files with 767 additions and 23,107 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/examples/demo-jaynes-cummings.ipynb b/examples/demo-jaynes-cummings.ipynb
@@ -2,7 +2,11 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "pycharm": {
+     "name": "#%% md\n"
+    }
+   },
    "source": [
     "# scqubits example: Jaynes-Cummings model\n",
     "J. Koch and P. Groszkowski\n",
@@ -22,7 +26,7 @@
     },
     "init_cell": true,
     "pycharm": {
-     "is_executing": false
+     "name": "#%%\n"
     },
     "scrolled": true
    },
@@ -36,7 +40,11 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "pycharm": {
+     "name": "#%% md\n"
+    }
+   },
    "source": [
     "## The Jaynes-Cummings model\n",
     "\n",
@@ -56,26 +64,34 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {},
+   "metadata": {
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   },
    "outputs": [],
    "source": [
     "# exact eigenenergies for comparing with numerics\n",
     "\n",
-    "def energies(omega_r, omega_q, g, n_cutoff):\n",
-    "    delta = omega_r - omega_q\n",
-    "    energies1 = (np.arange(1, n_cutoff) - 0.5) * omega_r\n",
+    "def energies(frequency_r, frequency_q, g, n_cutoff):\n",
+    "    delta = frequency_r - frequency_q\n",
+    "    energies1 = (np.arange(1, n_cutoff) - 0.5) * frequency_r\n",
     "    energies2 = np.sqrt(delta**2/4 + np.arange(1, n_cutoff) * g**2)\n",
     "    energies_plus = energies1 + energies2\n",
     "    energies_minus = energies1 - energies2\n",
-    "    energies_0 = np.asarray([[-0.5 * omega_q]])\n",
+    "    energies_0 = np.asarray([[-0.5 * frequency_q]])\n",
     "    all_energies = np.append(energies_0, energies_minus)\n",
     "    all_energies = np.append(all_energies, energies_plus)\n",
     "    return np.sort(all_energies)"
    ]
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "pycharm": {
+     "name": "#%% md\n"
+    }
+   },
    "source": [
     "### Set up the subsystems"
    ]
@@ -94,15 +110,15 @@
    },
    "outputs": [],
    "source": [
-    "omega_q = 1.0\n",
-    "omega_r = 0.8\n",
+    "frequency_q = 1.0\n",
+    "frequency_r = 0.8\n",
     "g = 0.1\n",
     "\n",
     "\n",
-    "qubit = scq.GenericQubit(E=omega_q)\n",
+    "qubit = scq.GenericQubit(E=frequency_q)\n",
     "\n",
     "osc = scq.Oscillator(\n",
-    "    E_osc=omega_r,\n",
+    "    E_osc=frequency_r,\n",
     "    truncated_dim=10  # up to 9 photons\n",
     ")"
    ]
@@ -150,6 +166,9 @@
     "ExecuteTime": {
      "end_time": "2020-03-31T11:43:54.772581Z",
      "start_time": "2020-03-31T11:43:54.765597Z"
+    },
+    "pycharm": {
+     "name": "#%%\n"
     }
    },
    "outputs": [
@@ -197,6 +216,9 @@
     "ExecuteTime": {
      "end_time": "2020-03-31T11:44:06.327709Z",
      "start_time": "2020-03-31T11:44:06.314743Z"
+    },
+    "pycharm": {
+     "name": "#%%\n"
     }
    },
    "outputs": [
@@ -216,22 +238,36 @@
   {
    "cell_type": "code",
    "execution_count": 7,
-   "metadata": {},
+   "metadata": {
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   },
    "outputs": [
     {
      "data": {
-      "text/plain": [
-       "array([-0.5       ,  0.25857864,  0.54142136,  1.02679492,  1.37320508])"
-      ]
+      "text/plain": "array([-0.5       ,  0.25857864,  0.54142136,  1.02679492,  1.37320508])"
      },
      "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "energies(omega_r, omega_q, g, 3)"
+    "energies(frequency_r, frequency_q, g, 3)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "outputs": [],
+   "source": [],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
   }
  ],
  "metadata": {
@@ -305,4 +341,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}