From 832ad5b3911d40074a966b219a7852050b646ad3 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Fri, 12 Mar 2021 13:56:40 +0100
Subject: [PATCH] Initial changes to use new stuff from base branch
---
.../AGIPD/AGIPD_Correct_and_Verify.ipynb | 37 +++++++++----------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index c4cbf1ef2..82f22b590 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -142,21 +142,14 @@
"sns.set_style(\"ticks\")\n",
"\n",
"import seaborn as sns\n",
- "from cal_tools.agipdlib import (\n",
- " AgipdCorrections,\n",
- " get_acq_rate,\n",
- " get_gain_setting,\n",
- " get_num_cells,\n",
- ")\n",
+ "from cal_tools.agipdlib import (AgipdCorrections, get_acq_rate, get_gain_mode,\n",
+ " get_gain_setting, get_num_cells)\n",
"from cal_tools.ana_tools import get_range\n",
"from cal_tools.cython import agipdalgs as calgs\n",
- "from cal_tools.enums import BadPixels\n",
+ "from cal_tools.enums import AgipdGainMode, BadPixels\n",
"from cal_tools.step_timing import StepTimer\n",
- "from cal_tools.tools import (\n",
- " CalibrationMetadata,\n",
- " get_dir_creation_date,\n",
- " map_modules_from_folder,\n",
- ")\n",
+ "from cal_tools.tools import (CalibrationMetadata, get_dir_creation_date,\n",
+ " map_modules_from_folder, module_index_to_qm)\n",
"\n",
"sns.set()\n",
"sns.set_context(\"paper\", font_scale=1.4)\n",
@@ -263,11 +256,8 @@
"else:\n",
" modules = [int(x[-2:]) for x in karabo_da]\n",
" \n",
- "def mod_name(modno):\n",
- " return f\"Q{modno // 4 + 1}M{modno % 4 + 1}\"\n",
- "\n",
"print(\"Process modules: \", ', '.join(\n",
- " [mod_name(x) for x in modules]))\n",
+ " [module_index_to_qm(x) for x in modules]))\n",
"print(f\"Detector in use is {karabo_id}\")\n",
"print(f\"Instrument {instrument}\")\n",
"print(f\"Detector instance {dinstance}\")"
@@ -376,7 +366,9 @@
" print(e)\n",
" print(\"Set gain setting to 0\")\n",
" gain_setting = 0\n",
- " "
+ "\n",
+ "# Evaluate gain mode (operation mode)\n",
+ "gain_mode = get_gain_mode(control_fn, h5path_ctrl)"
]
},
{
@@ -386,8 +378,13 @@
"outputs": [],
"source": [
"print(f\"Using {creation_time} as creation time\")\n",
- "print(f\"Operating conditions are:\\n• Bias voltage: {bias_voltage}\\n• Memory cells: {mem_cells_db}\\n\"\n",
- " f\"• Acquisition rate: {acq_rate}\\n• Gain setting: {gain_setting}\\n• Photon Energy: {photon_energy}\\n\")"
+ "print(\"Operating conditions are:\")\n",
+ "print(f\"• Bias voltage: {bias_voltage}\")\n",
+ "print(f\"• Memory cells: {mem_cells_db}\")\n",
+ "print(f\"• Acquisition rate: {acq_rate}\")\n",
+ "print(f\"• Gain setting: {gain_setting}\")\n",
+ "print(f\"• Gain mode: {gain_mode.name}\")\n",
+ "print(f\"• Photon Energy: {photon_energy}\")"
]
},
{
@@ -598,7 +595,7 @@
"timestamps = {}\n",
"\n",
"for i, (error, modno, when, k_da) in enumerate(const_out):\n",
- " qm = mod_name(modno)\n",
+ " qm = module_index_to_qm(modno)\n",
" # expose errors while applying correction\n",
" if error:\n",
" print(\"Error: {}\".format(error) )\n",
--
GitLab