From 6317f1d4f1d97fc8daf2a4874a80ea9144135eb4 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas.kluyver@xfel.eu>
Date: Mon, 12 Dec 2022 17:43:30 +0100
Subject: [PATCH] Inject LPD constants along with memory cell order as string
---
notebooks/LPD/LPDChar_Darks_NBC.ipynb | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index a96a7ab6d..7b77d0416 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -227,6 +227,8 @@
" im = np.array(infile[\"{}/data\".format(instrument_src, channel)][first_image:last_image, ...])\n",
" cellid = np.squeeze(np.array(infile[\"{}/cellId\".format(instrument_src, channel)][first_image:last_image, ...]))\n",
" infile.close()\n",
+ " \n",
+ " cellid_pattern = cellid[count[0]]\n",
"\n",
" im, g = splitOffGainLPD(im[:, 0, ...])\n",
" im = im.astype(np.float32)\n",
@@ -286,6 +288,8 @@
"badpix_g = OrderedDict()\n",
"data_g = OrderedDict()\n",
"ntest_g = OrderedDict()\n",
+ "# Should be the same cell order for all modules & all gain stages\n",
+ "cellid_patterns_g = {}\n",
"\n",
"gg = 0\n",
"old_cap = None\n",
@@ -302,6 +306,7 @@
" badpix_g[cap] = OrderedDict()\n",
" data_g[cap] = OrderedDict()\n",
" ntest_g[cap] = OrderedDict()\n",
+ " cellid_patterns_g[cap] = {}\n",
"\n",
" for i in modules:\n",
" qm = module_index_to_qm(i)\n",
@@ -316,7 +321,7 @@
" results = pool.starmap(characterize_module, inp)\n",
"\n",
"for ir, r in enumerate(results):\n",
- " offset, noise, i, gg, cap, bp, data, normal = r\n",
+ " offset, noise, i, gg, cap, bp, data, normal, cellid_pattern = r\n",
" qm = module_index_to_qm(i)\n",
" if qm not in offset_g[cap]:\n",
" offset_g[cap][qm] = np.zeros(\n",
@@ -325,6 +330,11 @@
" badpix_g[cap][qm] = np.zeros_like(offset_g[cap][qm], dtype=np.uint32)\n",
" data_g[cap][qm] = np.full((ntrains, 3), np.nan)\n",
" ntest_g[cap][qm] = np.zeros_like(offset_g[cap][qm])\n",
+ " cellid_patterns_g[cap][qm] = cellid_pattern\n",
+ " else:\n",
+ " if cellid_patterns_g[cap][qm] != cellid_pattern:\n",
+ " raise ValueError(\"Inconsistent cell ID pattern between gain stages\")\n",
+ " \n",
"\n",
" offset_g[cap][qm][..., gg] = offset\n",
" noise_g[cap][qm][..., gg] = noise\n",
@@ -387,10 +397,14 @@
" old_mdata[cap][qm] = {}\n",
" qm_db = qm_dict[qm]\n",
" karabo_da = qm_db[\"karabo_da\"]\n",
+ " cellid_pattern = cellid_patterns_g[cap][qm]\n",
+ " mem_cell_order = \",\".join([str(c) for c in cellid_pattern]) + \",\"\n",
"\n",
" condition = Conditions.Dark.LPD(memory_cells=max_cells,\n",
" bias_voltage=bias_voltage,\n",
- " capacitor=cap)\n",
+ " capacitor=cap,\n",
+ " memory_cell_order=mem_cell_order,\n",
+ " )\n",
" for const in clist:\n",
" constant = getattr(Constants.LPD, const)()\n",
" if not qm_db[\"db_module\"]:\n",
@@ -469,6 +483,8 @@
"\n",
" karabo_da = qm_dict[qm][\"karabo_da\"]\n",
" db_module = qm_dict[qm][\"db_module\"]\n",
+ " cellid_pattern = cellid_patterns_g[cap][qm]\n",
+ " mem_cell_order = \",\".join([str(c) for c in cellid_pattern]) + \",\"\n",
"\n",
" # Do not store empty constants\n",
" # In case of 0 trains data_g is initiated with nans and never refilled.\n",
@@ -480,9 +496,12 @@
" dconst.data = res[cap][qm][const]\n",
"\n",
" # set the operating condition\n",
+ "\n",
" condition = Conditions.Dark.LPD(memory_cells=max_cells,\n",
- " bias_voltage=bias_voltage,\n",
- " capacitor=cap)\n",
+ " bias_voltage=bias_voltage,\n",
+ " capacitor=cap,\n",
+ " memory_cell_order=mem_cell_order,\n",
+ " )\n",
"\n",
" if db_output:\n",
" md = send_to_db(db_module, karabo_id, dconst, condition,\n",
--
GitLab