From f67bcda4dc2401814037ddf3a6dc677a972077fa Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Thu, 15 Aug 2024 17:24:01 +0200
Subject: [PATCH] refactor: improve messages and add exit_notebook to epix100
---
notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb | 5 +++--
.../Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb | 5 +++--
notebooks/ePix100/Correction_ePix100_NBC.ipynb | 5 +++--
notebooks/pnCCD/Correct_pnCCD_NBC.ipynb | 3 ++-
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
index 1ef16054e..565260c8f 100644
--- a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
@@ -552,9 +552,10 @@
"outputs": [],
"source": [
"if skip_plots:\n",
- " exit_notebook('Skipping plots due to user request.')\n",
+ " exit_notebook('Skipping plots as configured.')\n",
"if empty_seq == len(seq_files):\n",
- " exit_notebook('Skipping plots because no data correction have been applied.')"
+ " seqs_no = sequences if sequences != [-1] else \"All\"\n",
+ " exit_notebook(f\"{seqs_no} sequence files has no data to correct.\")"
]
},
{
diff --git a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
index de2016ff2..da7c3d15c 100644
--- a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
@@ -739,7 +739,8 @@
"\n",
" step_timer.done_step(f'Saving data time.')\n",
"if empty_seq == sum([len(i) for i in mapped_files.values()]):\n",
- " exit_notebook(\"No valid trains for RAW data to correct.\")"
+ " seqs_no = sequences if sequences != [-1] else \"All\"\n",
+ " exit_notebook(f\"{seqs_no} sequence files has no data to correct.\")"
]
},
{
@@ -766,7 +767,7 @@
"outputs": [],
"source": [
"if skip_plots:\n",
- " exit_notebook('Skipping plots')"
+ " exit_notebook('Skipping plots as configured.')"
]
},
{
diff --git a/notebooks/ePix100/Correction_ePix100_NBC.ipynb b/notebooks/ePix100/Correction_ePix100_NBC.ipynb
index 29b6abd17..7e976d03e 100644
--- a/notebooks/ePix100/Correction_ePix100_NBC.ipynb
+++ b/notebooks/ePix100/Correction_ePix100_NBC.ipynb
@@ -103,6 +103,7 @@
"from cal_tools.files import DataFile\n",
"from cal_tools.tools import (\n",
" calcat_creation_time,\n",
+ " exit_notebook,\n",
" write_constants_fragment,\n",
")\n",
"from cal_tools.step_timing import StepTimer\n",
@@ -656,8 +657,8 @@
"\n",
" step_timer.done_step('Storing data.')\n",
"if empty_seq == len(seq_files):\n",
- " warning(\"No valid trains for RAW data to correct.\")\n",
- " exit(0)"
+ " seqs_no = sequences if sequences != [-1] else \"All\"\n",
+ " exit_notebook(f\"{seqs_no} sequence files has no data to correct.\")"
]
},
{
diff --git a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
index b19904f03..7d90eb3cf 100644
--- a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
+++ b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
@@ -785,7 +785,8 @@
" step_timer.done_step(f'Storing data.')\n",
"# Exit and raise warning if there are no data to correct for all sequences.\n",
"if empty_seq == len(seq_files):\n",
- " exit_notebook(\"No valid trains for RAW data to correct.\")"
+ " seqs_no = sequences if sequences != [-1] else \"All\"\n",
+ " exit_notebook(f\"{seqs_no} sequence files has no data to correct.\")"
]
},
{
--
GitLab