From 23a7e3f2018206f3f831f7cf1df7faccd9eea932 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas.kluyver@xfel.eu>
Date: Fri, 16 Dec 2022 15:46:44 +0100
Subject: [PATCH] Add boolean option to exclude memory cell order from detector
conditions
---
notebooks/LPD/LPD_Correct_Fast.ipynb | 5 +++--
notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/notebooks/LPD/LPD_Correct_Fast.ipynb b/notebooks/LPD/LPD_Correct_Fast.ipynb
index 0d3c8b613..3cfe25abd 100644
--- a/notebooks/LPD/LPD_Correct_Fast.ipynb
+++ b/notebooks/LPD/LPD_Correct_Fast.ipynb
@@ -46,6 +46,7 @@
"capacitor = '5pF' # Capacitor setting: 5pF or 50pF\n",
"photon_energy = 9.2 # Photon energy in keV.\n",
"category = 0 # Whom to blame.\n",
+ "use_cell_order = True # Whether to use memory cell order as a detector condition (not stored for older constants)\n",
"\n",
"# Correction parameters\n",
"offset_corr = True # Offset correction.\n",
@@ -276,9 +277,9 @@
" dict(parameter_id=13, value=256), # Pixels X\n",
" dict(parameter_id=14, value=256), # Pixels Y\n",
" ]\n",
- " dark_condition = base_condition + [\n",
+ " dark_condition = base_condition + ([\n",
" dict(parameter_id=142, value=cell_ids_pattern_s), # Memory cell order\n",
- " ]\n",
+ " ] if use_cell_order else [])\n",
"\n",
" illuminated_calibrations = {\n",
" 20: 'BadPixelsFF', # np.uint32\n",
diff --git a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
index be2d1ee03..9066c3c46 100644
--- a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
+++ b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
@@ -37,7 +37,8 @@
"bias_voltage = 250.0 # Detector bias voltage.\n",
"capacitor = '5pF' # Capacitor setting: 5pF or 50pF\n",
"photon_energy = 9.2 # Photon energy in keV.\n",
- "category = 0 # Whom to blame."
+ "category = 0 # Whom to blame.\n",
+ "use_cell_order = True # Whether to use memory cell order as a detector condition (not stored for older constants)"
]
},
{
@@ -141,9 +142,9 @@
" dict(parameter_id=13, value=256), # Pixels X\n",
" dict(parameter_id=14, value=256), # Pixels Y\n",
"]\n",
- "dark_condition = base_condition + [\n",
+ "dark_condition = base_condition + ([\n",
" dict(parameter_id=142, value=cell_ids_pattern_s), # Memory cell order\n",
- "]\n",
+ "] if use_cell_order else [])\n",
"\n",
"illuminated_calibrations = {\n",
" 20: 'BadPixelsFF',\n",
--
GitLab