From 9303a7249c2966f2803256d8f6924c1d22c89453 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 19 Feb 2024 15:35:26 +0100
Subject: [PATCH] remove the dinstance leftovers and use nmods instead of
checking 1M and 500K
---
notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb | 4 ++--
notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb | 2 --
notebooks/LPD/LPDChar_Darks_NBC.ipynb | 2 --
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index 25694c741..b89a5bccb 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -737,8 +737,8 @@
"outputs": [],
"source": [
"# This is a temporary workaround to enable dark processing for the first SM AGIPD detector\n",
- "if any(d in karabo_id for d in [\"AGIPD1M\", \"AGIPD500K\"]):\n",
- " mnames=[]\n",
+ "if nmods > 1: # AGIPD1M and AGIPD500K\n",
+ " mnames = []\n",
" for i in modules:\n",
" qm = module_index_to_qm(i)\n",
" mnames.append(qm)\n",
diff --git a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
index d8e1ef3f6..c57327ab3 100644
--- a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
+++ b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
@@ -138,8 +138,6 @@
"\n",
"run, prop, seq = run_prop_seq_from_path(in_folder)\n",
"\n",
- "dinstance = \"DSSC1M1\"\n",
- "\n",
"print(f\"Detector in use is {karabo_id}\") \n",
"\n",
"cal_db_interface = get_random_db_interface(cal_db_interface)"
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index 6657a942b..b86a55302 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -373,8 +373,6 @@
"# Retrieve existing constants for comparison\n",
"clist = [\"Offset\", \"Noise\", \"BadPixelsDark\"]\n",
"\n",
- "dinstance = \"LPD1M1\"\n",
- "detinst = getattr(Detectors, dinstance)\n",
"print('Retrieve pre-existing constants for comparison.')\n",
"\n",
"old_const = {}\n",
--
GitLab