diff --git a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
index 7d4f3ecfd235c162fc9bfdd5f4ecc9b3c430c9b8..8e8f55ba4725fe2766f9c35f8146d9612d80e15a 100644
--- a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
+++ b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
@@ -96,9 +96,10 @@
" plot_badpix_3d, show_overview,\n",
" show_processed_modules)\n",
"from cal_tools.tools import (get_dir_creation_date, get_from_db, \n",
- " get_notebook_name, get_random_db_interface,\n",
+ " get_pdu_from_db, get_notebook_name,\n",
+ " get_random_db_interface, get_report,\n",
" map_gain_stages, parse_runs,\n",
- " run_prop_seq_from_path, \n",
+ " run_prop_seq_from_path,\n",
" save_const_to_h5, send_to_db)\n",
"from cal_tools.dssclib import (get_dssc_ctrl_data,\n",
" get_pulseid_checksum)\n",
@@ -159,7 +160,9 @@
"print(f\"Input: {in_folder}\")\n",
"print(f\"Output: {out_folder}\")\n",
"print(f\"Bias voltage: {bias_voltage}V\")\n",
- "file_loc = f'proposal:{prop} runs:{[ v for v in offset_runs.values()][0]}'"
+ "file_loc = f'proposal:{prop} runs:{[ v for v in offset_runs.values()][0]}'\n",
+ "\n",
+ "report = get_report(out_folder)"
]
},
{
@@ -367,6 +370,21 @@
" raise ValueError(\"0 processed memory cells. No raw data available.\")\n"
]
},
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# TODO: add db_module when received from myMDC\n",
+ "# Create the modules dict of karabo_das and PDUs\n",
+ "qm_dict = OrderedDict()\n",
+ "for i, k_da in zip(modules, karabo_da):\n",
+ " qm = f\"Q{i//4+1}M{i%4+1}\"\n",
+ " qm_dict[qm] = {\"karabo_da\": k_da,\n",
+ " \"db_module\": \"\"}"
+ ]
+ },
{
"cell_type": "code",
"execution_count": null,
@@ -379,10 +397,12 @@
"old_mdata = {}\n",
"\n",
"print('Retrieve pre-existing constants for comparison.')\n",
- "detinst = getattr(Detectors, dinstance)\n",
"for qm in offset_g.keys():\n",
- " device = getattr(detinst, qm)\n",
+ " qm_db = qm_dict[qm]\n",
+ " karabo_da = qm_db[\"karabo_da\"]\n",
" for const in clist:\n",
+ " \n",
+ " dconst =getattr(Constants.DSSC, const)()\n",
" condition = Conditions.Dark.DSSC(memory_cells=max_cells,\n",
" bias_voltage=bias_voltage,\n",
" pulseid_checksum=checksums[qm],\n",
@@ -390,8 +410,16 @@
" target_gain=tGain[qm],\n",
" encoded_gain=encodedGain[qm])\n",
"\n",
- " data, mdata = get_from_db(device,\n",
- " getattr(Constants.DSSC, const)(),\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",
+ " if not qm_db[\"db_module\"]:\n",
+ " qm_db[\"db_module\"] = get_pdu_from_db(karabo_id, karabo_da, dconst,\n",
+ " condition, cal_db_interface,\n",
+ " snapshot_at=creation_time)[0]\n",
+ " data, mdata = get_from_db(karabo_id, karabo_da,\n",
+ " dconst,\n",
" condition,\n",
" None,\n",
" cal_db_interface, creation_time=creation_time,\n",
@@ -403,9 +431,10 @@
" time = mdata.calibration_constant_version.begin_at\n",
" old_mdata[const] = time.isoformat()\n",
" os.makedirs(f'{out_folder}/old/', exist_ok=True)\n",
- " save_const_to_h5(device,\n",
+ " save_const_to_h5(qm_db[\"db_module\"], karabo_id,\n",
" getattr(Constants.DSSC, const)(),\n",
- " condition, data, file_loc, creation_time,\n",
+ " condition, data, file_loc, report,\n",
+ " creation_time,\n",
" f'{out_folder}/old/')\n",
" else:\n",
" old_mdata[const] = \"Not found\""
@@ -450,9 +479,8 @@
"md = None\n",
"for dont_use_pulseIds in [True, False]:\n",
" for qm in res.keys():\n",
- " detinst = getattr(Detectors, dinstance)\n",
- " device = getattr(detinst, qm)\n",
- "\n",
+ " karabo_da = qm_dict[qm][\"karabo_da\"]\n",
+ " db_module = qm_dict[qm][\"db_module\"]\n",
" for const in res[qm].keys():\n",
" dconst = getattr(Constants.DSSC, const)()\n",
" dconst.data = res[qm][const]\n",
@@ -470,13 +498,13 @@
" target_gain=targetgain,\n",
" encoded_gain=encodedgain)\n",
" \n",
- " if db_output:\n",
- " md = send_to_db(device, dconst, condition, file_loc, \n",
+ " if True:\n",
+ " md = send_to_db(db_module, karabo_id, dconst, condition, file_loc, report,\n",
" cal_db_interface, creation_time=creation_time, timeout=cal_db_timeout)\n",
" \n",
" if local_output and dont_use_pulseIds: # Don't save constant localy two times.\n",
- " md = save_const_to_h5(device, dconst, condition,\n",
- " dconst.data, file_loc,\n",
+ " md = save_const_to_h5(db_module, karabo_id, dconst, condition,\n",
+ " dconst.data, file_loc, report,\n",
" creation_time, out_folder)\n",
" print(f\"Calibration constant {const} is stored locally.\\n\")\n",
" \n",