Missed two conflicts from rebase

notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb

@@ -434,37 +434,11 @@
     "        else:\n",
     "            continue\n",
     "        inp.append((fname_in, i, gg))\n",
-<<<<<<< HEAD
-||||||| 335796a
-    "        \n",
-    "    gg += 1\n",
-    "\n",
-    "p = partial(characterize_module, IL_MODE, max_cells,\n",
-    "           (thresholds_offset_hard, thresholds_offset_sigma,\n",
-    "            thresholds_noise_hard, thresholds_noise_sigma),\n",
-    "            rawversion, karabo_id, acq_rate, h5path, h5path_idx,\n",
-    "           control_names, karabo_id_control)\n",
-=======
     "\n",
     "with multiprocessing.Pool() as pool:\n",
     "    results = pool.starmap(characterize_module, inp)\n",
->>>>>>> bd98a3c6b5a10f7347ba8a74d0ce895565db9ca5
     "\n",
-<<<<<<< HEAD
-    "with multiprocessing.Pool() as pool:\n",
-    "    results = pool.starmap(characterize_module, inp)\n",
-    "\n",
-    "for offset, noise, gains, gains_std, gg, bp, thiscell, thisacq in results:\n",
-||||||| 335796a
-    "# Don't remove. Used for Debugging.\n",
-    "#results = list(map(p, inp))\n",
-    "results = view.map_sync(p, inp)\n",
-    "\n",
-    "for ii, r in enumerate(results):\n",
-    "    offset, noise, gains, gains_std, gg, bp, thiscell, thisacq = r\n",
-=======
     "for offset, noise, gains, gains_std, gg, bp, thiscell, thisacq in results:\n",
->>>>>>> bd98a3c6b5a10f7347ba8a74d0ce895565db9ca5
     "    all_cells.append(thiscell)\n",
     "    all_acq_rate.append(thisacq)\n",
     "    for i in modules:\n",