diff --git a/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb b/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb index aceb6595cbb3ca3c198fcdbb3a060b1b0b9de58d..15f5b1c4224c92a3e502f831d771aa5380263f54 100644 --- a/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb +++ b/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb @@ -42,13 +42,13 @@ "metadata": {}, "outputs": [], "source": [ - "in_folder = '/gpfs/exfel/exp/SPB/202330/p900340/scratch/CSmergedFiles/19012023/' # path to input data, required\n", - "out_folder = \"/gpfs/exfel/exp/SPB/202330/p900340/scratch/CS_Processing/test\" # path to output to, required\n", - "raw_folder = '/gpfs/exfel/exp/SPB/202330/p900340/raw/' # path to raw folder, required\n", + "in_folder = '/gpfs/exfel/exp/SPB/202331/p900376/scratch/CSmergedFiles/65_75_100_150/' # path to input data, required\n", + "out_folder = \"/gpfs/exfel/exp/SPB/202331/p900376/scratch/CS_Processing/240105/\" # path to output to, required\n", + "raw_folder = '/gpfs/exfel/exp/SPB/202331/p900376/raw/' # path to raw folder, required\n", "metadata_folder = \"\" # Directory containing calibration_metadata.yml when run by xfel-calibrate\n", - "dark_run = 5 # run containning CS specific darks, required\n", + "dark_run = 264 # run containning CS specific darks, required\n", "\n", - "modules = [8] # modules to work on, required, range allowed\n", + "modules = [5] # modules to work on, required, range allowed\n", "karabo_da = [\"all\"]\n", "karabo_id_control = \"SPB_IRU_AGIPD1M1\" # karabo-id for the control device e.g. \"MID_EXP_AGIPD1M1\", or \"SPB_IRU_AGIPD1M1\"\n", "karabo_id = \"SPB_DET_AGIPD1M-1\"\n", @@ -745,7 +745,7 @@ }, "outputs": [], "source": [ - "tpix_range2 = [(35,38), (38,44)]\n", + "tpix_range2 = [(75,78), (38,44)]\n", "roi2 = 'ROI2'\n", "evaluate_fitting_ROI(cs_data[0], tpix_range2, test_cells, roi2)" ] @@ -1565,7 +1565,7 @@ "\n", "for i, cell in enumerate(cells):\n", " vmin, vmax = get_range(ratio_HM, 8)\n", - " fig = xana.heatmapPlot(ratio_HM[cell, ...][BPmap[cell, ...] == 0], cmap='jet', add_panels=False, aspect=1,\n", + " fig = xana.heatmapPlot(ratio_HM[cell, ...], cmap='jet', add_panels=False, aspect=1,\n", " lut_label=f'H-M ratio, Cell: {cell}', \n", " cb_loc='bottom', vmin=vmin, vmax=vmax)\n", "\n", @@ -1640,7 +1640,7 @@ "fig.subplots_adjust(wspace=0.1, hspace=0.5)\n", "lbl = ['HG', 'MG', 'LG']\n", "for i in range(3):\n", - " hrange = [0.1 * np.median(slopes[i]), 2.5 * np.median(slopes[i])]\n", + " hrange = [0.1 * np.nanmedian(slopes[i]), 2.5 * np.nanmedian(slopes[i])]\n", " r_hist = np.zeros((slopes[i].shape[0], 100))\n", " for c in range(slopes[i].shape[0]):\n", " d = slopes[i][c, ...]\n", @@ -1655,7 +1655,7 @@ " ax[i, 0].set_ylabel('Slope {}'.format(lbl[i]), fontsize=12)\n", " cb = fig.colorbar(im, ax=ax[i, 0], pad=0.01)\n", " \n", - " hrange = [0.5 * np.median(intercepts[i]), 1.8 * np.median(intercepts[i])]\n", + " hrange = [0.5 * np.nanmedian(intercepts[i]), 1.8 * np.nanmedian(intercepts[i])]\n", " r_hist = np.zeros((intercepts[i].shape[0], 100))\n", " for c in range(intercepts[i].shape[0]):\n", " d = intercepts[i][c, ...]\n", @@ -1683,7 +1683,7 @@ "fig, ax = plt.subplots(1, 2, figsize=(16, 4))\n", "lbl = ['High-Medium', 'Medium-Low']\n", "for i, ratio in enumerate(ratios):\n", - " hrange = [0.6 * np.median(ratio), 1.4 * np.median(ratio)]\n", + " hrange = [0.6 * np.nanmedian(ratio), 1.4 * np.nanmedian(ratio)]\n", " r_hist = np.zeros((ratio.shape[0], 100))\n", " for c in range(ratio.shape[0]):\n", " d = ratio[c, ...]\n", @@ -1753,7 +1753,7 @@ "outputs": [], "source": [ "one_photon = 73 #assuming 10keV ph\n", - "tpix_range2 = [(35,55), (38,44)]\n", + "tpix_range2 = [(75,85), (38,44)]\n", "\n", "test_pixels = []\n", "for i in range(*tpix_range2[0]):\n", @@ -1887,7 +1887,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "pycalibration", "language": "python", "name": "python3" }, diff --git a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb index d7da4e0ee3e90a522ab6b996c02239f49c146fb2..9b7acac43ad62f3289ede13490e6251cb8021173 100644 Binary files a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb and b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb differ diff --git a/notebooks/AGIPD/CS_parallelMerging_NBC.ipynb b/notebooks/AGIPD/CS_parallelMerging_NBC.ipynb index de8cbacca431253815bf5f97ffb21f914d478fd0..180b509adfb94070bc8021ae40782037e893c356 100644 --- a/notebooks/AGIPD/CS_parallelMerging_NBC.ipynb +++ b/notebooks/AGIPD/CS_parallelMerging_NBC.ipynb @@ -20,7 +20,7 @@ "in_folder = \"/gpfs/exfel/exp/SPB/202330/p900340/raw/\" # path to input data, required\n", "out_folder = \"/gpfs/exfel/exp/SPB/202330/p900340/scratch/CSmergedFiles/test/\" # path to output to, required\n", "metadata_folder = \"\"\n", - "first_run = 6 # first taken run, required, it has to be run with the smallest ITESTC, otherwise define runs manually\n", + "first_run = 6 # first taken run, it has to be run with the smallest ITESTC, otherwise define runs manually\n", "\n", "runs1 = [-1] # list of runs to use, range allowed ITESTC 65, use -1 for auto-completion\n", "runs2 = [-1] # list of runs to use, ITESTC 80, use -1 for auto-completion\n",