From 3d9396228c06dd731f3516544a27ac2ef953edc6 Mon Sep 17 00:00:00 2001
From: karnem <mikhail.karnevskiy@desy.de>
Date: Tue, 10 Sep 2019 16:33:44 +0200
Subject: [PATCH] Add separate_plot parameter
---
.../FastCCD/PlotFromCalDB_FastCCD_NBC.ipynb | 38 +++++-----
.../Jungfrau/PlotFromCalDB_Jungfrau_NBC.ipynb | 73 +++++++++----------
2 files changed, 53 insertions(+), 58 deletions(-)
diff --git a/notebooks/FastCCD/PlotFromCalDB_FastCCD_NBC.ipynb b/notebooks/FastCCD/PlotFromCalDB_FastCCD_NBC.ipynb
index e2b9a436f..908d75fea 100644
--- a/notebooks/FastCCD/PlotFromCalDB_FastCCD_NBC.ipynb
+++ b/notebooks/FastCCD/PlotFromCalDB_FastCCD_NBC.ipynb
@@ -29,11 +29,13 @@
"bias_voltage = [79] # Bias voltage\n",
"temperature = [235, 216, 245] # Operation temperature\n",
"integration_time = [1, 50] # Integration time\n",
- "pixels_x=[1934]\n",
- "pixels_y=[960]\n",
- "max_time = 15\n",
+ "pixels_x=[1934] # number of pixels along X axis\n",
+ "pixels_y=[960] # number of pixels along Y axis\n",
+ "max_time = 15 # max time margin in minutes to match bad pixels\n",
"parameter_names = ['bias_voltage', 'integration_time', 'temperature', \n",
" 'gain_setting', 'pixels_x', 'pixels_y'] # names of parameters\n",
+ "\n",
+ "separate_plot = ['integration_time', 'gain_setting', 'temperature'] # Plot on separate plots\n",
"photon_energy = 9.2 # Photon energy of the beam\n",
"out_folder = \"/gpfs/exfel/data/scratch/karnem/test_FCCD/\" # output folder\n",
"use_existing = \"\" # If not empty, constants stored in given folder will be used\n",
@@ -281,16 +283,10 @@
" qm = db_module\n",
" \n",
" print(\"constant: {}, module {}\".format(const,qm))\n",
- " \n",
" constant_data.retrieve_from_version_info(constant_version)\n",
" \n",
- " # Convert parameters to dict\n",
- " dpar = {p.name: p.value for p in constant_data.detector_condition.parameters}\n",
- " \n",
- " const = \"{}_{}_{}_{}\".format(const, \n",
- " constant_parameters[i]['gain_setting'],\n",
- " constant_parameters[i]['temperature'],\n",
- " constant_parameters[i]['integration_time'])\n",
+ " for key in separate_plot:\n",
+ " const = '{}_{}'.format(const, constant_parameters[i][key])\n",
" \n",
" if not const in ret_constants:\n",
" ret_constants[const] = {}\n",
@@ -405,7 +401,7 @@
"# loop over constat type\n",
"for const, modules in ret_constants.items():\n",
"\n",
- " const, gain, temp, int_time = const.split(\"_\")\n",
+ " const = const.split(\"_\")\n",
" print('Const: {}'.format(const))\n",
"\n",
" # Loop over modules\n",
@@ -437,7 +433,7 @@
" nBins = nPixels\n",
"\n",
" # Avoid too low values\n",
- " if const in [\"Noise\", \"Offset\", \"Noise-e\"]:\n",
+ " if const[0] in [\"Noise\", \"Offset\"]:\n",
" rdata['Mean'][rdata['Mean'] < 0.1] = np.nan\n",
" if 'MeanBP' in rdata:\n",
" rdata['MeanBP'][rdata['MeanBP'] < 0.1] = np.nan\n",
@@ -463,13 +459,16 @@
" unit = '[%]'\n",
" else:\n",
" unit = '[ADU]'\n",
- " if const == 'Noise-e':\n",
- " unit = '[$e^-$]'\n",
"\n",
- " title = '{}, module {}, gain {} {}'.format(\n",
- " const, mod, gain, keys[key][1])\n",
- " cb_label = '{}, {} {}'.format(const, keys[key][2], unit)\n",
+ " title = '{}, module {}, {}'.format(\n",
+ " const[0], mod, keys[key][1])\n",
+ " cb_label = '{}, {} {}'.format(const[0], keys[key][2], unit)\n",
"\n",
+ " fname = '{}/{}_{}'.format(out_folder, const[0], mod.replace('_', ''))\n",
+ " for item in const[1:]:\n",
+ " fname = '{}_{}'.format(fname, item)\n",
+ " fname = '{}_ASIC_{}.png'.format(fname, key)\n",
+ " \n",
" vmin,vmax = get_range(pdata[key][::-1].flatten(), plot_range)\n",
" hm_combine(pdata[key][::-1], htype=HMType.mro,\n",
" x_label='Creation Time', y_label='ASIC ID',\n",
@@ -477,8 +476,7 @@
" x_ticks=np.arange(len(ctimes_ticks))+0.3,\n",
" title=title, cb_label=cb_label,\n",
" vmin=vmin, vmax=vmax,\n",
- " fname='{}/{}_{}_g{}_t{}_t{}_ASIC_{}.png'.format(\n",
- " out_folder, const, mod.replace('_', ''), gain, temp, int_time, key),\n",
+ " fname=fname,\n",
" pad=[0.125, 0.125, 0.12, 0.185])\n"
]
}
diff --git a/notebooks/Jungfrau/PlotFromCalDB_Jungfrau_NBC.ipynb b/notebooks/Jungfrau/PlotFromCalDB_Jungfrau_NBC.ipynb
index 530fb2dc5..1b428701c 100644
--- a/notebooks/Jungfrau/PlotFromCalDB_Jungfrau_NBC.ipynb
+++ b/notebooks/Jungfrau/PlotFromCalDB_Jungfrau_NBC.ipynb
@@ -25,28 +25,27 @@
"start_date = \"2019-06-30\" # date to start investigation interval from\n",
"end_date = \"2019-09-01\" # date to end investigation interval at, can be \"now\"\n",
"dclass=\"jungfrau\" # Detector class\n",
- "db_modules = [\"Jungfrau_M125\", \"Jungfrau_M260\"] # detector entry in the DB to investigate\n",
+ "modules = [\"Jungfrau_M125\", \"Jungfrau_M260\"] # detector entry in the DB to investigate\n",
"constants = [\"Noise\", \"Offset\"] # constants to plot\n",
"nconstants = 10 # Number of time stamps to plot. If not 0, overcome start_date.\n",
- "bias_voltage = [90, 180]\n",
- "memory_cells = [1]\n",
- "pixels_x = [1024]\n",
- "pixels_y = [512, 1024]\n",
- "temperature = [291]\n",
- "integration_time = [50, 250]\n",
- "gain_setting = [0]\n",
+ "bias_voltage = [90, 180] # bias voltage\n",
+ "memory_cells = [1] # number of memory cells\n",
+ "pixels_x = [1024] # number of pixels along X axis\n",
+ "pixels_y = [512, 1024] # number of pixels along Y axis\n",
+ "temperature = [291] # operational temperature\n",
+ "integration_time = [50, 250] # integration time\n",
+ "gain_setting = [0] # gain stage\n",
"\n",
"parameter_names = ['bias_voltage', 'integration_time', 'pixels_x', 'pixels_y', 'gain_setting',\n",
" 'temperature', 'memory_cells'] # names of parameters\n",
"\n",
- "max_time = 15\n",
+ "separate_plot = ['integration_time'] # Plot on separate plots\n",
+ "max_time = 15 # max time margin in minutes to match bad pixels\n",
"photon_energy = 9.2 # Photon energy of the beam\n",
- "out_folder = \"/gpfs/exfel/data/scratch/karnem/test_JF2/\" # output folder\n",
+ "out_folder = \"/gpfs/exfel/data/scratch/karnem/test_JF/\" # output folder\n",
"use_existing = \"\" # If not empty, constants stored in given folder will be used\n",
"cal_db_interface = \"tcp://max-exfl016:8016\" # the database interface to use\n",
"cal_db_timeout = 180000 # timeout on caldb requests\",\n",
- "range_offset = [1000., 2200] # plotting range for offset: high gain l, r, medium gain l, r \n",
- "range_noise = [15, 20, 3, 7, 1, 6] # plotting range for noise: high gain l, r, medium gain l, r \n",
"plot_range = 3 # range for plotting in units of median absolute deviations\n",
"spShape = [256, 64] # Shape of superpixel"
]
@@ -134,7 +133,7 @@
"# Loop over constants\n",
"for c, const in enumerate(constants):\n",
" \n",
- " for db_module in db_modules:\n",
+ " for db_module in modules:\n",
" det = getattr(Detectors, db_module)\n",
" \n",
" if use_existing != \"\":\n",
@@ -288,6 +287,9 @@
" const = constant_versions[i]['data_set_name'].split('/')[-2]\n",
" qm = constant_versions[i]['physical_device']['name']\n",
" \n",
+ " for key in separate_plot:\n",
+ " const = '{}_{}'.format(const, constant_parameters[i][key])\n",
+ " \n",
" if not const in ret_constants:\n",
" ret_constants[const] = {}\n",
" if not qm in ret_constants[const]:\n",
@@ -301,10 +303,8 @@
" \n",
" cdata = constant_data.calibration_constant.data\n",
" ctime = constant_data.calibration_constant_version.begin_at\n",
- " \n",
" cdata = modify_const(const, cdata)\n",
" \n",
- " \n",
" if len(constantBP_versions)>0:\n",
" constant_BP.retrieve_from_version_info(constantBP_versions[i])\n",
" cdataBP = constant_BP.calibration_constant.data\n",
@@ -387,12 +387,6 @@
"source": [
"# Parameters for plotting\n",
"\n",
- "# Define range for plotting\n",
- "rangevals = {\n",
- " \"OffsetEPix100\": [range_offset[0:2], range_offset[2:4]],\n",
- " \"Noise10Hz\": [range_noise[0:2], range_noise[2:4], range_noise[4:6]],\n",
- "}\n",
- "\n",
"keys = {\n",
" 'Mean': ['data', '', 'Mean over pixels'],\n",
" 'std': ['dataStd', '', '$\\sigma$ over pixels'],\n",
@@ -408,7 +402,7 @@
"cell_type": "code",
"execution_count": null,
"metadata": {
- "scrolled": false
+ "scrolled": true
},
"outputs": [],
"source": [
@@ -417,6 +411,7 @@
"# loop over constat type\n",
"for const, modules in ret_constants.items():\n",
" \n",
+ " const = const.split(\"_\")\n",
" for gain in range(3):\n",
"\n",
" print('Const: {}'.format(const))\n",
@@ -455,14 +450,14 @@
" nBins = nPixels\n",
" \n",
" # Select gain\n",
- " if const not in [\"Gain\", \"Noise-e\"]:\n",
+ " if const[0] not in [\"Gain\", \"Noise-e\"]:\n",
" for key in rdata:\n",
" if len(rdata[key].shape)<5:\n",
" continue\n",
" rdata[key] = rdata[key][..., 0, gain]\n",
"\n",
" # Avoid to low values\n",
- " if const in [\"Noise10Hz\", \"Offset10Hz\"]:\n",
+ " if const[0] in [\"Noise10Hz\", \"Offset10Hz\"]:\n",
" rdata['Mean'][rdata['Mean'] < 0.1] = np.nan\n",
" if 'MeanBP' in rdata:\n",
" rdata['MeanBP'][rdata['MeanBP'] < 0.1] = np.nan\n",
@@ -503,29 +498,27 @@
" continue\n",
" \n",
" vmin,vmax = get_range(pdata[key][::-1].flatten(), plot_range)\n",
- " #if const in rangevals and key in ['Mean', 'MeanBP']:\n",
- " # vmin = rangevals[const][0][0]\n",
- " # vmax = rangevals[const][0][1]\n",
- "\n",
" if key == 'NBP':\n",
" unit = '[%]'\n",
" else:\n",
" unit = '[ADU]'\n",
- " if const == 'Noise-e':\n",
- " unit = '[$e^-$]'\n",
"\n",
" title = '{}, module {}, {}'.format(\n",
- " const, mod, keys[key][1])\n",
- " cb_label = '{}, {} {}'.format(const, keys[key][2], unit)\n",
+ " const[0], mod, keys[key][1])\n",
+ " cb_label = '{}, {} {}'.format(const[0], keys[key][2], unit)\n",
"\n",
+ " fname = '{}/{}_{}'.format(out_folder, const[0], mod.replace('_', ''))\n",
+ " for item in const[1:]:\n",
+ " fname = '{}_{}'.format(fname, item)\n",
+ " fname = '{}_ASIC_{}.png'.format(fname, key)\n",
+ " \n",
" hm_combine(pdata[key][::-1], htype=HMType.mro,\n",
" x_label='Creation Time', y_label='ASIC ID',\n",
" x_ticklabels=ctimes_ticks,\n",
" x_ticks=np.arange(len(ctimes_ticks))+0.3,\n",
" title=title, cb_label=cb_label,\n",
" vmin=vmin, vmax=vmax,\n",
- " fname='{}/{}_{}_g{}_ASIC_{}.png'.format(\n",
- " out_folder, const, mod.replace('_', ''), gain, key),\n",
+ " fname=fname,\n",
" pad=[0.125, 0.125, 0.12, 0.185])\n",
"\n",
" \n",
@@ -538,18 +531,22 @@
" unit = '[ADU]'\n",
"\n",
" title = '{}, All modules, {} gain, {}'.format(\n",
- " const, gain_name[gain], keys[key][1])\n",
+ " const[0], gain_name[gain], keys[key][1])\n",
" \n",
+ " fname = '{}/{}_{}'.format(out_folder, const[0], 'All')\n",
+ " for item in const[1:]:\n",
+ " fname = '{}_{}'.format(fname, item)\n",
+ " fname = '{}_ASIC_{}.png'.format(fname, key)\n",
+ " \n",
" fig = plt.figure(figsize=(12,12) )\n",
" for i in range(len(mod_data[key])):\n",
" plt.scatter(mod_times[i], mod_data[key][i], label=mod_names[i])\n",
" plt.grid()\n",
" plt.xlabel('Creation Time')\n",
- " plt.ylabel('{}, {} {}'.format(const, keys[key][2], unit)) \n",
+ " plt.ylabel('{}, {} {}'.format(const[0], keys[key][2], unit)) \n",
" plt.legend(loc='best guess')\n",
" plt.title(title)\n",
- " fig.savefig('{}/{}_{}_g{}_ASIC_{}.png'.format(\n",
- " out_folder, const, 'All', gain, key))\n"
+ " fig.savefig(fname)\n"
]
}
],
--
GitLab