From c448886e4d56ff4086b55a038a3c203e54a17e8f Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Fri, 31 Jan 2020 17:03:25 +0100
Subject: [PATCH] avoid errors when hist params are None
---
.../AGIPD/AGIPD_Correct_and_Verify.ipynb | 36 +++++++++++--------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 2bb9fdeae..2286d4640 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -107,11 +107,11 @@
" \n",
" # Apply PC correction only if requested\n",
" if pc_corr:\n",
- " corr_bools[\"slopesPC\"] = pc_corr\n",
+ " corr_bools[\"pc_corr\"] = pc_corr\n",
" \n",
" # Apply FF correction only if requested\n",
" if ff_corr:\n",
- " corr_bools[\"slopesFF\"] = ff_corr\n",
+ " corr_bools[\"ff_corr\"] = ff_corr\n",
" \n",
" corr_bools[\"adjust_mg_baseline\"] = adjust_mg_baseline\n",
" corr_bools[\"do_rel_gain\"] = relative_gain\n",
@@ -376,7 +376,7 @@
"end_time": "2019-02-21T11:30:16.057429Z",
"start_time": "2019-02-21T11:30:10.082114Z"
},
- "scrolled": false
+ "scrolled": true
},
"outputs": [],
"source": [
@@ -609,7 +609,8 @@
" all_cells.append(cells)\n",
" whens.append((qm, when))\n",
" errors.append(err)\n",
- " if not init_hist:\n",
+ " # Validate hp to be int not None.\n",
+ " if not init_hist and hp is not None:\n",
" hists_signal_low = np.zeros((bins_signal_low_range, hp), np.float64)\n",
" hists_signal_high = np.zeros((bins_signal_low_range, hp), np.float64)\n",
" init_hist = True\n",
@@ -716,7 +717,8 @@
},
"outputs": [],
"source": [
- "do_3d_plot(hists_gain_vs_signal, signal_edges, \"Signal (ADU)\", \"Analogue gain (ADU)\")"
+ "if signal_edges is not None:\n",
+ " do_3d_plot(hists_gain_vs_signal, signal_edges, \"Signal (ADU)\", \"Analogue gain (ADU)\")"
]
},
{
@@ -741,8 +743,8 @@
" cb = fig.colorbar(im)\n",
" cb.set_label(\"Counts\")\n",
" \n",
- " \n",
- "do_2d_plot(hists_gain_vs_signal, signal_edges, \"Signal (ADU)\", \"Gain Value (ADU)\")"
+ "if signal_edges is not None:\n",
+ " do_2d_plot(hists_gain_vs_signal, signal_edges, \"Signal (ADU)\", \"Gain Value (ADU)\")"
]
},
{
@@ -765,7 +767,8 @@
},
"outputs": [],
"source": [
- "do_2d_plot(hists_dig_gain_vs_signal, dig_signal_edges, \"Signal (ADU)\", \"Gain Bit Value\")"
+ "if dig_signal_edges is not None:\n",
+ " do_2d_plot(hists_dig_gain_vs_signal, dig_signal_edges, \"Signal (ADU)\", \"Gain Bit Value\")"
]
},
{
@@ -780,9 +783,10 @@
"outputs": [],
"source": [
"fig, ax = plt.subplots()\n",
- "ax.pie(gain_stats, labels=[\"high\", \"medium\", \"low\"], autopct='%1.2f%%',\n",
- " shadow=True, startangle=27)\n",
- "a = ax.axis('equal') # Equal aspect ratio ensures that pie is drawn as a circle."
+ "if gain_stats != 0:\n",
+ " ax.pie(gain_stats, labels=[\"high\", \"medium\", \"low\"], autopct='%1.2f%%',\n",
+ " shadow=True, startangle=27)\n",
+ " a = ax.axis('equal') # Equal aspect ratio ensures that pie is drawn as a circle."
]
},
{
@@ -806,10 +810,12 @@
},
"outputs": [],
"source": [
- "do_3d_plot(hists_signal_low, low_edges, \"Signal (ADU)\", \"Pulse id\")\n",
- "do_2d_plot(hists_signal_low, low_edges, \"Signal (ADU)\", \"Pulse id\")\n",
- "do_3d_plot(hists_signal_high, high_edges, \"Signal (ADU)\", \"Pulse id\")\n",
- "do_2d_plot(hists_signal_high, high_edges, \"Signal (ADU)\", \"Pulse id\")"
+ "if low_edges is not None:\n",
+ " do_3d_plot(hists_signal_low, low_edges, \"Signal (ADU)\", \"Pulse id\")\n",
+ " do_2d_plot(hists_signal_low, low_edges, \"Signal (ADU)\", \"Pulse id\")\n",
+ "if high_edges is not None:\n",
+ " do_3d_plot(hists_signal_high, high_edges, \"Signal (ADU)\", \"Pulse id\")\n",
+ " do_2d_plot(hists_signal_high, high_edges, \"Signal (ADU)\", \"Pulse id\")"
]
},
{
--
GitLab