From dff246b674110d592bde436239dbdfb2e6c21d9a Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Thu, 27 May 2021 12:00:30 +0200
Subject: [PATCH] Fixing imports
---
.../Characterize_AGIPD_Gain_Darks_NBC.ipynb | 72 +++----------------
1 file changed, 9 insertions(+), 63 deletions(-)
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index d3cf42f65..181d4e053 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -79,7 +79,7 @@
"source": [
"import os\n",
"from collections import OrderedDict\n",
- "from datetime import datetime, timedelta\n",
+ "from datetime import timedelta\n",
"from typing import Tuple\n",
"\n",
"import dateutil.parser\n",
@@ -91,8 +91,6 @@
"import yaml\n",
"\n",
"matplotlib.use('agg')\n",
- "import itertools\n",
- "import multiprocessing\n",
"\n",
"import iCalibrationDB\n",
"import matplotlib.pyplot as plt\n",
@@ -643,57 +641,6 @@
" yaml.safe_dump({\"module_mapping\": {qm: module_pdu}}, fd)"
]
},
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "# Retrieve existing constants for comparison\n",
- "qm_x_const = [(qm, const) for const in res[qm] for qm in res]\n",
- "print('Retrieve pre-existing constants for comparison.')\n",
- "def boom(qm, const):\n",
- " qm_db = qm_dict[qm]\n",
- " this_karabo_da = qm_db[\"karabo_da\"]\n",
- " dconst = getattr(iCalibrationDB.Constants.AGIPD, const)()\n",
- "\n",
- " # This should be used in case of running notebook\n",
- " # by a different method other than myMDC which already\n",
- " # sends CalCat info.\n",
- " # TODO: Set db_module to \"\" by default in the first cell\n",
- "\n",
- " data, mdata = get_from_db(\n",
- " karabo_id, \n",
- " this_karabo_da,\n",
- " constant=dconst,\n",
- " condition=condition,\n",
- " empty_constant=None,\n",
- " cal_db_interface=cal_db_interface,\n",
- " creation_time=creation_time,\n",
- " verbosity=2,\n",
- " timeout=cal_db_timeout\n",
- " )\n",
- "\n",
- " if mdata is None or data is None:\n",
- " timestamp = \"Not found\"\n",
- " else:\n",
- " timestamp = mdata.calibration_constant_version.begin_at.isoformat()\n",
- " \n",
- " return data, timestamp\n",
- "\n",
- "old_retrieval_pool = multiprocessing.Pool()\n",
- "old_retrieval_res = old_retrieval_pool.starmap_async(boom, qm_x_const)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "old_retrieval_pool.close()"
- ]
- },
{
"cell_type": "code",
"execution_count": null,
@@ -729,8 +676,14 @@
" timestamp = \"Not found\"\n",
" else:\n",
" timestamp = mdata.calibration_constant_version.begin_at.isoformat()\n",
- " \n",
- " return data, timestamp\n",
+ " filepath = os.path.join(\n",
+ " mdata.calibration_constant_version.hdf5path,\n",
+ " mdata.calibration_constant_version.filename\n",
+ " )\n",
+ " h5path = mdata.calibration_constant_version.h5path\n",
+ "\n",
+ " return data, timestamp, filepath, h5path\n",
+ "\n",
"\n",
"old_retrieval_pool = multiprocessing.Pool()\n",
"old_retrieval_res = old_retrieval_pool.starmap_async(\n",
@@ -940,13 +893,6 @@
" old_mdata.setdefault(qm, {})[const] = timestamp"
]
},
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
{
"cell_type": "code",
"execution_count": null,
--
GitLab