Skip to content
Snippets Groups Projects
Commit 49d31851 authored by David Hammer's avatar David Hammer
Browse files

Stripping some trailing spaces

parent fdd736f4
No related branches found
No related tags found
1 merge request!438Feat/agipd add fixed gain mode to dark notebook
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
"gains = np.arange(3)\n", "gains = np.arange(3)\n",
"\n", "\n",
"max_cells = mem_cells\n", "max_cells = mem_cells\n",
" \n", "\n",
"offset_runs = OrderedDict()\n", "offset_runs = OrderedDict()\n",
"offset_runs[\"high\"] = run_high\n", "offset_runs[\"high\"] = run_high\n",
"offset_runs[\"med\"] = run_med\n", "offset_runs[\"med\"] = run_med\n",
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
" gsettings.append(get_gain_setting(control_fname, h5path_ctrl))\n", " gsettings.append(get_gain_setting(control_fname, h5path_ctrl))\n",
" if not all(g == gsettings[0] for g in gsettings):\n", " if not all(g == gsettings[0] for g in gsettings):\n",
" raise ValueError(f\"Different gain settings for the 3 input runs {gsettings}\")\n", " raise ValueError(f\"Different gain settings for the 3 input runs {gsettings}\")\n",
" gain_setting = gsettings[0] \n", " gain_setting = gsettings[0]\n",
" except Exception as e:\n", " except Exception as e:\n",
" print(f'Error while reading gain setting from: \\n{control_fname}')\n", " print(f'Error while reading gain setting from: \\n{control_fname}')\n",
" print(f'Error: {e}')\n", " print(f'Error: {e}')\n",
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
"h5path = h5path.format(karabo_id, receiver_id)\n", "h5path = h5path.format(karabo_id, receiver_id)\n",
"h5path_idx = h5path_idx.format(karabo_id, receiver_id)\n", "h5path_idx = h5path_idx.format(karabo_id, receiver_id)\n",
"\n", "\n",
"if bias_voltage == 0: \n", "if bias_voltage == 0:\n",
" # Read the bias voltage from files, if recorded.\n", " # Read the bias voltage from files, if recorded.\n",
" # If not available, make use of the historical voltage the detector is running at\n", " # If not available, make use of the historical voltage the detector is running at\n",
" bias_voltage = get_bias_voltage(control_names[0], karabo_id_control)\n", " bias_voltage = get_bias_voltage(control_names[0], karabo_id_control)\n",
...@@ -621,15 +621,15 @@ ...@@ -621,15 +621,15 @@
" acquisition_rate=acq_rate,\n", " acquisition_rate=acq_rate,\n",
" gain_setting=gain_setting)\n", " gain_setting=gain_setting)\n",
" if db_output:\n", " if db_output:\n",
" md = send_to_db(db_module, karabo_id, dconst, condition, file_loc, \n", " md = send_to_db(db_module, karabo_id, dconst, condition, file_loc,\n",
" report, cal_db_interface, creation_time=creation_time,\n", " report, cal_db_interface, creation_time=creation_time,\n",
" timeout=cal_db_timeout)\n", " timeout=cal_db_timeout)\n",
"\n", "\n",
" if local_output:\n", " if local_output:\n",
" md = save_const_to_h5(db_module, karabo_id, dconst, condition, dconst.data, \n", " md = save_const_to_h5(db_module, karabo_id, dconst, condition, dconst.data,\n",
" file_loc, report, creation_time, out_folder)\n", " file_loc, report, creation_time, out_folder)\n",
" print(f\"Calibration constant {const} is stored locally.\\n\")\n", " print(f\"Calibration constant {const} is stored locally.\\n\")\n",
" \n", "\n",
" print(\"Constants parameter conditions are:\\n\")\n", " print(\"Constants parameter conditions are:\\n\")\n",
" print(f\"• memory_cells: {max_cells}\\n• bias_voltage: {bias_voltage}\\n\"\n", " print(f\"• memory_cells: {max_cells}\\n• bias_voltage: {bias_voltage}\\n\"\n",
" f\"• acquisition_rate: {acq_rate}\\n• gain_setting: {gain_setting}\\n\"\n", " f\"• acquisition_rate: {acq_rate}\\n• gain_setting: {gain_setting}\\n\"\n",
...@@ -724,18 +724,18 @@ ...@@ -724,18 +724,18 @@
" BadPixels.OFFSET_OUT_OF_THRESHOLD.value: (BadPixels.OFFSET_OUT_OF_THRESHOLD.name, '#00FF0080'),\n", " BadPixels.OFFSET_OUT_OF_THRESHOLD.value: (BadPixels.OFFSET_OUT_OF_THRESHOLD.name, '#00FF0080'),\n",
" BadPixels.GAIN_THRESHOLDING_ERROR.value: (BadPixels.GAIN_THRESHOLDING_ERROR.name, '#FF40FF40'),\n", " BadPixels.GAIN_THRESHOLDING_ERROR.value: (BadPixels.GAIN_THRESHOLDING_ERROR.name, '#FF40FF40'),\n",
" BadPixels.OFFSET_OUT_OF_THRESHOLD.value | BadPixels.NOISE_OUT_OF_THRESHOLD.value: ('OFFSET_OUT_OF_THRESHOLD + NOISE_OUT_OF_THRESHOLD', '#DD00DD80'),\n", " BadPixels.OFFSET_OUT_OF_THRESHOLD.value | BadPixels.NOISE_OUT_OF_THRESHOLD.value: ('OFFSET_OUT_OF_THRESHOLD + NOISE_OUT_OF_THRESHOLD', '#DD00DD80'),\n",
" BadPixels.OFFSET_OUT_OF_THRESHOLD.value | BadPixels.NOISE_OUT_OF_THRESHOLD.value | \n", " BadPixels.OFFSET_OUT_OF_THRESHOLD.value | BadPixels.NOISE_OUT_OF_THRESHOLD.value |\n",
" BadPixels.GAIN_THRESHOLDING_ERROR.value: ('MIXED', '#BFDF009F')}\n", " BadPixels.GAIN_THRESHOLDING_ERROR.value: ('MIXED', '#BFDF009F')}\n",
"\n", "\n",
"if high_res_badpix_3d:\n", "if high_res_badpix_3d:\n",
" display(Markdown(\"\"\"\n", " display(Markdown(\"\"\"\n",
" \n", "\n",
" ## Global Bad Pixel Behaviour ##\n", " ## Global Bad Pixel Behaviour ##\n",
"\n", "\n",
" The following plots show the results of bad pixel evaluation for all evaluated memory cells. \n", " The following plots show the results of bad pixel evaluation for all evaluated memory cells.\n",
" Cells are stacked in the Z-dimension, while pixels values in x/y are rebinned with a factor of 2. \n", " Cells are stacked in the Z-dimension, while pixels values in x/y are rebinned with a factor of 2.\n",
" This excludes single bad pixels present only in disconnected pixels. \n", " This excludes single bad pixels present only in disconnected pixels.\n",
" Hence, any bad pixels spanning at least 4 pixels in the x/y-plane, or across at least two memory cells are indicated. \n", " Hence, any bad pixels spanning at least 4 pixels in the x/y-plane, or across at least two memory cells are indicated.\n",
" Colors encode the bad pixel type, or mixed type.\n", " Colors encode the bad pixel type, or mixed type.\n",
"\n", "\n",
" \"\"\"))\n", " \"\"\"))\n",
...@@ -848,10 +848,10 @@ ...@@ -848,10 +848,10 @@
" for bit in bits:\n", " for bit in bits:\n",
" l_data_old.append(np.count_nonzero(old_const['BadPixelsDark'][:, :, :, gain] & bit.value))\n", " l_data_old.append(np.count_nonzero(old_const['BadPixelsDark'][:, :, :, gain] & bit.value))\n",
"\n", "\n",
" l_data_name = ['All bad pixels', 'NOISE_OUT_OF_THRESHOLD', \n", " l_data_name = ['All bad pixels', 'NOISE_OUT_OF_THRESHOLD',\n",
" 'OFFSET_OUT_OF_THRESHOLD', 'OFFSET_NOISE_EVAL_ERROR', 'GAIN_THRESHOLDING_ERROR']\n", " 'OFFSET_OUT_OF_THRESHOLD', 'OFFSET_NOISE_EVAL_ERROR', 'GAIN_THRESHOLDING_ERROR']\n",
"\n", "\n",
" l_threshold = ['', f'{thresholds_noise_sigma}' f'{thresholds_noise_hard[gain]}', \n", " l_threshold = ['', f'{thresholds_noise_sigma}' f'{thresholds_noise_hard[gain]}',\n",
" f'{thresholds_offset_sigma}' f'{thresholds_offset_hard[gain]}',\n", " f'{thresholds_offset_sigma}' f'{thresholds_offset_hard[gain]}',\n",
" '', f'{thresholds_gain_sigma}']\n", " '', f'{thresholds_gain_sigma}']\n",
"\n", "\n",
...@@ -874,9 +874,9 @@ ...@@ -874,9 +874,9 @@
"\n", "\n",
"'''))\n", "'''))\n",
"if len(table)>0:\n", "if len(table)>0:\n",
" md = display(Latex(tabulate.tabulate(table, tablefmt='latex', \n", " md = display(Latex(tabulate.tabulate(table, tablefmt='latex',\n",
" headers=[\"Pixel type\", \"Threshold\", \n", " headers=[\"Pixel type\", \"Threshold\",\n",
" \"New constant\", \"Old constant\"]))) " " \"New constant\", \"Old constant\"])))"
] ]
}, },
{ {
...@@ -885,9 +885,9 @@ ...@@ -885,9 +885,9 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"header = ['Parameter', \n", "header = ['Parameter',\n",
" \"New constant\", \"Old constant \", \n", " \"New constant\", \"Old constant \",\n",
" \"New constant\", \"Old constant \", \n", " \"New constant\", \"Old constant \",\n",
" \"New constant\", \"Old constant \",\n", " \"New constant\", \"Old constant \",\n",
" \"New constant\", \"Old constant \"]\n", " \"New constant\", \"Old constant \"]\n",
"\n", "\n",
...@@ -897,15 +897,15 @@ ...@@ -897,15 +897,15 @@
" ['Offset', 'Noise', 'ThresholdsDark']\n", " ['Offset', 'Noise', 'ThresholdsDark']\n",
"\n", "\n",
"for const in constants:\n", "for const in constants:\n",
" \n", "\n",
" if const == 'ThresholdsDark':\n", " if const == 'ThresholdsDark':\n",
" table = [['','HG-MG threshold', 'HG-MG threshold', 'MG-LG threshold', 'MG-LG threshold']]\n", " table = [['','HG-MG threshold', 'HG-MG threshold', 'MG-LG threshold', 'MG-LG threshold']]\n",
" else: \n", " else:\n",
" table = [['','High gain', 'High gain', 'Medium gain', 'Medium gain', 'Low gain', 'Low gain']]\n", " table = [['','High gain', 'High gain', 'Medium gain', 'Medium gain', 'Low gain', 'Low gain']]\n",
"\n", "\n",
" for qm in res.keys():\n", " for qm in res.keys():\n",
" data = np.copy(res[qm][const])\n", " data = np.copy(res[qm][const])\n",
" \n", "\n",
" if const == 'ThresholdsDark':\n", " if const == 'ThresholdsDark':\n",
" data[...,0][res[qm]['BadPixelsDark'][...,0]>0] = np.nan\n", " data[...,0][res[qm]['BadPixelsDark'][...,0]>0] = np.nan\n",
" data[...,1][res[qm]['BadPixelsDark'][...,1]>0] = np.nan\n", " data[...,1][res[qm]['BadPixelsDark'][...,1]>0] = np.nan\n",
...@@ -938,7 +938,7 @@ ...@@ -938,7 +938,7 @@
" table.append(line)\n", " table.append(line)\n",
"\n", "\n",
" display(Markdown('### {} [ADU], good pixels only ###'.format(const)))\n", " display(Markdown('### {} [ADU], good pixels only ###'.format(const)))\n",
" md = display(Latex(tabulate.tabulate(table, tablefmt='latex', headers=header))) " " md = display(Latex(tabulate.tabulate(table, tablefmt='latex', headers=header)))"
] ]
} }
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment