From f87d8e3a372385ad941e6978499b924ec9109e9f Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 19 Jun 2023 13:06:52 +0200
Subject: [PATCH] Split retrieving dark and illuminated calibrations
---
notebooks/LPD/LPD_Correct_Fast.ipynb | 17 ++++++-----------
.../LPD_retrieve_constants_precorrection.ipynb | 15 +++++++--------
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/notebooks/LPD/LPD_Correct_Fast.ipynb b/notebooks/LPD/LPD_Correct_Fast.ipynb
index 7ee0acd4e..51ecd1c7c 100644
--- a/notebooks/LPD/LPD_Correct_Fast.ipynb
+++ b/notebooks/LPD/LPD_Correct_Fast.ipynb
@@ -290,18 +290,13 @@
" event_at=creation_time,\n",
" client=rest_cfg.calibration_client(),\n",
" )\n",
- " # Initialize const_data in case no constants were retrieved.\n",
- " const_data = {mod: {\"no-constants-retrieved\": None} for mod in karabo_da}\n",
+ " constant_data = lpd_cal.ndarray_map([\"Offset\", \"BadPixelsDark\"])\n",
" try:\n",
- " const_data = lpd_cal.ndarray_map(\n",
- " [\n",
- " \"Offset\", \"BadPixelsDark\",\n",
- " \"BadPixelsFF\", \"GainAmpMap\",\n",
- " \"FFMap\", \"RelativeGain\",\n",
- " ]\n",
- " )\n",
- " except CalCatError as e: # TODO: remove when API errors are improved.\n",
- " warning(f\"CaLCaTError: {e}\")\n",
+ " illum_const_data = lpd_cal.ndarray_map(lpd_cal.illuminated_calibrations)\n",
+ " for key, value in illum_const_data.items():\n",
+ " const_data.setdefault(key, {}).update(value)\n",
+ " except CalCatError as e: # TODO: replace when API errors are improved.\n",
+ " warning(f\"CalCatError: {e}\")\n",
"total_time = perf_counter() - start\n",
"print(f'Loading constants {total_time:.1f}s')"
]
diff --git a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
index 584be0a91..27b78bc71 100644
--- a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
+++ b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
@@ -133,18 +133,17 @@
" event_at=creation_time,\n",
" client=rest_cfg.calibration_client(),\n",
")\n",
- "constant_names = [\n",
- " \"Offset\", \"BadPixelsDark\",\n",
- " \"BadPixelsFF\", \"GainAmpMap\",\n",
- " \"FFMap\", \"RelativeGain\",\n",
- "]\n",
+ "\n",
"# Initialize const_data in case no constants were retrieved.\n",
"lpd_cal_metadata = {mod: {\"no-constants-retrieved\": None} for mod in karabo_da}\n",
"\n",
+ "constant_data = lpd_cal.metadata([\"Offset\", \"BadPixelsDark\"])\n",
"try:\n",
- " lpd_cal_metadata = lpd_cal.metadata(constant_names)\n",
- "except CalCatError as e:\n",
- " warning(f\"CaLCaTError: {e}\")\n",
+ " illum_const_data = lpd_cal.metadata(lpd_cal.illuminated_calibrations)\n",
+ " for key, value in illum_const_data.items():\n",
+ " const_data.setdefault(key, {}).update(value)\n",
+ "except CalCatError as e: # TODO: replace when API errors are improved.\n",
+ " warning(f\"CalCatError: {e}\")\n",
"\n",
"# Validate the constants availability and raise/warn correspondingly. \n",
"for mod, ccv_dict in lpd_cal_metadata.items():\n",
--
GitLab