From c7b73e3d3f6fffd13fd662bbcfa91e733c0db3cf Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Mon, 7 Dec 2020 06:32:30 +0100
Subject: [PATCH] Fix/3.0.0 test02 fixes
---
cal_tools/cal_tools/plotting.py | 2 +-
...rk_analysis_all_gains_burst_mode_NBC.ipynb | 28 +++++++++----------
...aracterize_LPD_GAIN_CI_per_pixel_NBC.ipynb | 2 +-
notebooks/LPD/LPDChar_Darks_NBC.ipynb | 2 +-
...PD_FlatField_Radial_per_pixel_CI_NBC.ipynb | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/cal_tools/cal_tools/plotting.py b/cal_tools/cal_tools/plotting.py
index cc6409686..a84463efa 100644
--- a/cal_tools/cal_tools/plotting.py
+++ b/cal_tools/cal_tools/plotting.py
@@ -299,7 +299,7 @@ def show_processed_modules(dinstance: str, constants: Optional[Dict[str, Any]],
if module in mnames:
color = 'green'
if ('Noise' not in constants.keys() or
- np.nanmean(constants['Noise'][counter, :, :, :, 0]) == 0): # noqa
+ np.nanmean(constants['Noise'][counter, ..., 0]) == 0): # noqa
color = 'red'
counter += 1
diff --git a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
index 931233724..afddd3b29 100644
--- a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
@@ -325,10 +325,11 @@
" f_o0 = heatmapPlot(np.swapaxes(offset_map[..., cell, g_idx], 0, 1), \n",
" y_label=\"Row\",\n",
" x_label=\"Column\",\n",
- " lut_label=\"Pedestal {} [ADCu]\".format(g_name[g_idx]),\n",
+ " lut_label=unit,\n",
" aspect=1.,\n",
" vmin=g_range[g_idx][0],\n",
- " vmax=g_range[g_idx][1])\n",
+ " vmax=g_range[g_idx][1],\n",
+ " title=f'Pedestal {g_name[g_idx]} - Cell {cell:02d}')\n",
"\n",
" fo0, ax_o0 = plt.subplots()\n",
" res_o0 = histPlot(ax_o0, offset_map[..., cell, g_idx],\n",
@@ -338,17 +339,18 @@
" histotype='stepfilled')\n",
"\n",
" ax_o0.tick_params(axis='both',which='major',labelsize=15)\n",
- " ax_o0.set_title('Module pedestal distribution Cell {:02d}'.format(cell), fontsize=15)\n",
- " ax_o0.set_xlabel('Pedestal {} [ADCu]'.format(g_name[g_idx]),fontsize=15)\n",
+ " ax_o0.set_title(f'Module pedestal distribution - Cell {cell:02d}', fontsize=15)\n",
+ " ax_o0.set_xlabel(f'Pedestal {g_name[g_idx]} {unit}',fontsize=15)\n",
" ax_o0.set_yscale('log')\n",
"\n",
" f_n0 = heatmapPlot(np.swapaxes(noise_map[..., cell, g_idx], 0, 1), \n",
" y_label=\"Row\",\n",
" x_label=\"Column\",\n",
- " lut_label=\"RMS noise {} \".format(g_name[g_idx]) + unit,\n",
+ " lut_label= unit,\n",
" aspect=1.,\n",
" vmin=n_range[g_idx][0],\n",
- " vmax=n_range[g_idx][1])\n",
+ " vmax=n_range[g_idx][1],\n",
+ " title=f\"RMS noise {g_name[g_idx]} - Cell {cell:02d}\")\n",
"\n",
" fn0, ax_n0 = plt.subplots()\n",
" res_n0 = histPlot(ax_n0, noise_map[..., cell, g_idx],\n",
@@ -358,8 +360,8 @@
" histotype='stepfilled')\n",
" \n",
" ax_n0.tick_params(axis='both',which='major',labelsize=15)\n",
- " ax_n0.set_title('Module noise distribution Cell {:02d}'.format(cell), fontsize=15)\n",
- " ax_n0.set_xlabel('RMS noise {} '.format(g_name[g_idx]) + unit,fontsize=15)\n",
+ " ax_n0.set_title(f'Module noise distribution - Cell {cell:02d}', fontsize=15)\n",
+ " ax_n0.set_xlabel(f'RMS noise {g_name[g_idx]} ' + unit, fontsize=15)\n",
" #ax_n0.set_yscale('log')\n",
" \n",
" plt.show()\n",
@@ -425,17 +427,15 @@
"bad_pixels_map[~np.isfinite(noise_map)] |= BadPixels.OFFSET_NOISE_EVAL_ERROR.value\n",
"bad_pixels_map[(offset_map < offset_abs_threshold[0][None, None, None, :]) | (offset_map > offset_abs_threshold[1][None, None, None, :])] |= BadPixels.OFFSET_OUT_OF_THRESHOLD.value\n",
"\n",
- "for g_idx in gains: \n",
- " for cell in range(0, memoryCells):\n",
- "\n",
+ "for g_idx in gains:\n",
+ " for cell in range(memoryCells):\n",
" bad_pixels = bad_pixels_map[:, :, cell, g_idx]\n",
- "\n",
" fn_0 = heatmapPlot(np.swapaxes(bad_pixels, 0, 1), \n",
" y_label=\"Row\",\n",
" x_label=\"Column\",\n",
- " lut_label=\"Badpixels {} [ADCu]\".format(g_name[g_idx]),\n",
+ " lut_label=f\"Badpixels {g_name[g_idx]} [ADCu]\",\n",
" aspect=1.,\n",
- " vmin=0)"
+ " vmin=0, title=f'G{g_idx} Bad pixel map - Cell {cell:02d}')"
]
},
{
diff --git a/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb b/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
index d20e4bf45..ce8c1d522 100644
--- a/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
+++ b/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
@@ -33,7 +33,7 @@
"\n",
"modules = [-1]\n",
"\n",
- "capacitor_setting = 5 # capacitor_setting for which data was taken, required\n",
+ "capacitor_setting = 5 # capacitor_setting for which data was taken\n",
"\n",
"mem_cells = 512 # number of memory cells used\n",
"local_output = True # output constants locally\n",
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index e260e54d2..5d042bbe4 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -44,7 +44,7 @@
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
"\n",
- "capacitor_setting = 5 # capacitor_setting for which data was taken, required\n",
+ "capacitor_setting = 5 # capacitor_setting for which data was taken \n",
"mem_cells = 512 # number of memory cells used\n",
"bias_voltage = 250 # detector bias voltage\n",
"thresholds_offset_sigma = 3. # bad pixel relative threshold in terms of n sigma offset\n",
diff --git a/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb b/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb
index bde2f8ce4..d0781a76d 100644
--- a/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb
+++ b/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb
@@ -25,7 +25,7 @@
"out_folder = \"/gpfs/exfel/exp/FXE/201831/p900038/usr/calibration0818/FF/\" # path to output to, required\n",
"run = 125 # runs to process, required\n",
"sequences = [0] # which sequence files to use\n",
- "capacitor_setting = 5 # capacitor_setting for which data was taken, required\n",
+ "capacitor_setting = 5 # capacitor_setting for which data was taken\n",
"\n",
"mem_cells = 512 # number of memory cells used\n",
"local_output = True # output constants locally\n",
--
GitLab