From 2b0844878190ba98aaab16146c149171ad7ad78a Mon Sep 17 00:00:00 2001
From: Ivana Klackova <klackova@max-exfl203.desy.de>
Date: Fri, 15 Sep 2023 16:00:54 +0200
Subject: [PATCH] Fix not working injection to test calcat
---
...haracterization_unequalClockStep_NBC.ipynb | 43 ++++++++++++-------
...cterization_unequalClockStep_Summary.ipynb | 3 +-
2 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb b/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb
index 5b9f6ddc5..9464321c2 100644
--- a/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb
+++ b/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb
@@ -38,7 +38,7 @@
},
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": null,
"metadata": {},
"outputs": [],
"source": [
@@ -77,7 +77,7 @@
},
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": null,
"metadata": {},
"outputs": [],
"source": [
@@ -111,9 +111,9 @@
"from cal_tools.step_timing import StepTimer\n",
"from cal_tools.tools import (\n",
" get_constant_from_db_and_time,\n",
- " get_dir_creation_date,\n",
" calcat_creation_time,\n",
" get_pdu_from_db,\n",
+ " get_report,\n",
" send_to_db,\n",
")\n",
"from iCalibrationDB import Conditions, Constants\n",
@@ -1559,24 +1559,36 @@
"metadata": {},
"outputs": [],
"source": [
- "# INJECTION OF CS CONSTS TO DB DOES NOT WORK YET!\n",
+ "proposal = list(filter(None, in_folder.strip('/').split('/')))[-2]\n",
+ "file_loc = f'Proposal: {proposal}, Run: {dark_run}'\n",
"\n",
+ "report = get_report(metadata_folder)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": [
"md = None\n",
"\n",
- "if db_output:\n",
- " # set the operating condition\n",
- " condition = Conditions.Dark.AGIPD(memory_cells=mem_cells, \n",
- " bias_voltage=bias_voltage,\n",
- " acquisition_rate=acq_rate, \n",
- " gain_setting=gain_setting,\n",
- " integration_time=integration_time)\n",
+ "# set the operating condition\n",
+ "condition = Conditions.Dark.AGIPD(memory_cells=mem_cells, \n",
+ " bias_voltage=bias_voltage,\n",
+ " acquisition_rate=acq_rate, \n",
+ " gain_setting=gain_setting,\n",
+ " integration_time=integration_time)\n",
"\n",
- " db_modules = get_pdu_from_db(karabo_id, karabo_da, Constants.AGIPD.SlopesCS(),\n",
- " condition, cal_db_interface,\n",
- " snapshot_at=creation_time)\n",
+ "db_modules = get_pdu_from_db(karabo_id, karabo_da, Constants.AGIPD.SlopesCS(),\n",
+ " condition, cal_db_interface,\n",
+ " snapshot_at=creation_time)\n",
"\n",
+ "if db_output:\n",
" for pdu in db_modules:\n",
" for const in [\"SlopesCS\", \"BadPixelsCS\"]:\n",
+ " dbconst = getattr(Constants.AGIPD, const)()\n",
+ " \n",
" if const == \"SlopesCS\":\n",
" dbconst.data = slope_dict_to_arr(sanitised_const)\n",
" else:\n",
@@ -1871,8 +1883,7 @@
" f[f'/SanitizedConsts/{g}/m/data'] = slopes[g]\n",
" f[f'/SanitizedConsts/{g}/b/data'] = intercepts[g]\n",
" f['/SanitizedConsts/Ratios/H-M/data'] = ratio_HM\n",
- " f['/SanitizedConsts/Ratios/M-L/data'] = ratio_ML\n",
- " "
+ " f['/SanitizedConsts/Ratios/M-L/data'] = ratio_ML "
]
}
],
diff --git a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
index 3edb987ec..c5c1ca82d 100644
--- a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
+++ b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
@@ -61,8 +61,7 @@
"\n",
"from cal_tools.ana_tools import get_range\n",
"from cal_tools.enums import BadPixels\n",
- "from cal_tools.tools import (\n",
- " get_dir_creation_date, \n",
+ "from cal_tools.tools import ( \n",
" module_index_to_qm,\n",
" calcat_creation_time\n",
")\n",
--
GitLab