From 1b7030d9d492f50cf7d4ab46f4d54f4d0fdc1b16 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Tue, 9 Mar 2021 14:43:57 +0100
Subject: [PATCH] Adding back operation_mode parameter (only used for warning
so far)
---
notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index d715b75b2..b1298821c 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -26,6 +26,7 @@
"run_high = 9985 # run number in which high gain data was recorded, required\n",
"run_med = 9984 # run number in which medium gain data was recorded, required\n",
"run_low = 9983 # run number in which low gain data was recorded, required\n",
+ "operation_mode = \"ADAPTIVE_GAIN\" # Detector operation mode, optional (defaults to \"ADAPTIVE_GAIN\")\n",
"\n",
"karabo_id = \"HED_DET_AGIPD500K2G\" # karabo karabo_id\n",
"karabo_da = ['-1'] # a list of data aggregators names, Default [-1] for selecting all data aggregators\n",
@@ -151,10 +152,16 @@
"control_names = [f'{in_folder}/r{r:04d}/RAW-R{r:04d}-{karabo_da_control}-S00000.h5'\n",
" for r in (run_high, run_med, run_low)]\n",
"\n",
+ "if operation_mode not in (\"ADAPTIVE_GAIN\", \"FIXED_GAIN\"):\n",
+ " print(f\"WARNING: unknown operation_mode \\\"{operation_mode}\\\" parameter set\")\n",
"run_gain_modes = [get_gain_mode(fn, h5path_ctrl) for fn in control_names]\n",
"if all(gm == AgipdGainMode.ADAPTIVE_GAIN for gm in run_gain_modes):\n",
" fixed_gain_mode = False\n",
+ " if operation_mode == \"FIXED_GAIN\":\n",
+ " print(\"WARNING: operation_mode parameter is FIXED_GAIN, slow data indicates adaptive gain\")\n",
"elif run_gain_modes == [AgipdGainMode.FIXED_HIGH_GAIN, AgipdGainMode.FIXED_MEDIUM_GAIN, AgipdGainMode.FIXED_LOW_GAIN]:\n",
+ " if operation_mode == \"ADAPTIVE_GAIN\":\n",
+ " print(\"WARNING: operation_mode parameter ix ADAPTIVE_GAIN, slow data indicates fixed gain\")\n",
" fixed_gain_mode = True\n",
"else:\n",
" print(f'Something is clearly wrong; slow data indicates gain modes {run_gain_modes}')\n",
--
GitLab