diff --git a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb index 1ef16054eaed34685a96c5a606911b1d7eff658c..565260c8f74d69084be4dc68455f3e28399463eb 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 de2016ff23eb109a5326c7f09bfa7f76683861d1..da7c3d15c555e57f8e2b841f312d59cb15caa269 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 29b6abd174f8182c436a2ef687ea3bb426c23418..7e976d03ea3e63b03633d2f341115a0170ccb380 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 b19904f03da1090873f98f2dcb44e7e2b9c75ed2..7d90eb3cf319860ab26c7f2fb969e0495248153e 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.\")" ] }, {