newer fitter for wrappers

.gitignore

@@ -40,4 +40,4 @@ tmp/
 .idea
 
 # qcodes
-experiments.db
+*.db

examples/dataset/Example of doND wrappers.ipynb

@@ -11,7 +11,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 25,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -24,7 +24,10 @@
     "from qcodes.dataset.database import initialise_database\n",
     "from qcodes.dataset.experiment_container import new_experiment\n",
     "from qcodes.dataset.plotting import plot_by_id\n",
-    "import plottr\n",
+    "try:\n",
+    "    import plottr\n",
+    "except ModuleNotFoundError:\n",
+    "    pass\n",
     "import qcodes.config\n",
     "from qcodes.tests.instrument_mocks import DummyChannelInstrument"
    ]
@@ -46,17 +49,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "Upgrading database: : 0it [00:00, ?it/s]\n",
+      "Upgrading database: : 0it [00:00, ?it/s]\n"
+     ]
+    },
     {
      "data": {
       "text/plain": [
-       "doNd-tutorial#no sample#10@C:\\Users\\jenielse/experiments.db\n",
-       "-----------------------------------------------------------"
+       "doNd-tutorial#no sample#1@/Users/natalie/experiments.db\n",
+       "-------------------------------------------------------"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -68,7 +79,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -81,7 +92,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -100,7 +111,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -120,15 +131,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Starting experimental run with id: 27\n",
-      "plot by id took 0.19638419151306152\n"
+      "Starting experimental run with id: 1\n",
+      "plot by id took 0.037342071533203125\n"
      ]
     }
    ],
@@ -138,7 +149,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "metadata": {
     "scrolled": false
    },
@@ -147,8 +158,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Starting experimental run with id: 28\n",
-      "plot by id took 1.528921365737915\n"
+      "Starting experimental run with id: 2\n",
+      "plot by id took 0.3784291744232178\n"
      ]
     }
    ],
@@ -175,7 +186,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -197,15 +208,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
       "called before the loop\n",
-      "Starting experimental run with id: 29\n",
+      "Starting experimental run with id: 6\n",
       "called at each step\n",
       "called at each step\n",
       "called at each step\n",
@@ -217,7 +228,7 @@
       "called at each step\n",
       "called at each step\n",
       "called after the loop\n",
-      "plot by id took 0.1400294303894043\n"
+      "plot by id took 0.03285670280456543\n"
      ]
     }
    ],
@@ -228,15 +239,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
       "called before the loop\n",
-      "Starting experimental run with id: 30\n",
+      "Starting experimental run with id: 7\n",
       "called before inner loop\n",
       "called at each step\n",
       "called at each step\n",
@@ -250,7 +261,7 @@
       "called at each step\n",
       "called after inner loop\n",
       "called after the loop\n",
-      "plot by id took 0.18652963638305664\n"
+      "plot by id took 0.06169295310974121\n"
      ]
     }
    ],
@@ -272,7 +283,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -281,15 +292,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Starting experimental run with id: 31\n",
-      "plot by id took 0.15599322319030762\n"
+      "Starting experimental run with id: 8\n",
+      "plot by id took 0.03528785705566406\n"
      ]
     }
    ],
@@ -328,7 +339,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -337,15 +348,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": 21,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Starting experimental run with id: 35\n",
-      "plot by id took 0.07499814033508301\n"
+      "Starting experimental run with id: 9\n",
+      "plot by id took 0.045063018798828125\n"
      ]
     }
    ],