diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify_Summary_NBC.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify_Summary_NBC.ipynb
index 8565e8db22fe54fad5457d5e54025791dfabd2a2..c34233b9ae48d960dfebcc73e9cd710b23bcb5d2 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify_Summary_NBC.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify_Summary_NBC.ipynb
@@ -15,7 +15,9 @@
"source": [
"run = 11 # runs to process, required\n",
"out_folder = \"/gpfs/exfel/data/scratch/ahmedk/test/AGIPD_Corr\" # path to output to, required\n",
- "modules = [-1]"
+ "karabo_id = \"SPB_DET_AGIPD1M-1\" # karabo karabo_id\n",
+ "modules = [-1]\n",
+ "karabo_da = ['-1'] # a list of data aggregators names, Default [-1] for selecting all data aggregators"
]
},
{
@@ -52,8 +54,26 @@
"else:\n",
" main_dict = {\"time-summary\":dict()}\n",
"\n",
- "if modules[0] == -1:\n",
- " modules = list(range(16))\n",
+ "# Extracting Instrument string\n",
+ "instrument = karabo_id.split(\"_\")[0]\n",
+ "# Evaluate detector instance for mapping\n",
+ "if instrument == \"SPB\":\n",
+ " dinstance = \"AGIPD1M1\"\n",
+ " nmods = 16\n",
+ "elif instrument == \"MID\":\n",
+ " dinstance = \"AGIPD1M2\"\n",
+ " nmods = 16\n",
+ "# TODO: Remove DETLAB\n",
+ "elif instrument == \"HED\" or instrument == \"DETLAB\":\n",
+ " dinstance = \"AGIPD500K\"\n",
+ " nmods = 8\n",
+ "\n",
+ "if karabo_da[0] == '-1':\n",
+ " if modules[0] == -1:\n",
+ " modules = list(range(nmods))\n",
+ " karabo_da = [\"AGIPD{:02d}\".format(i) for i in modules]\n",
+ "else:\n",
+ " modules = [int(x[-2:]) for x in karabo_da]\n",
"\n",
"# This is needed only if AGIPD Correction notebook had no precorrection notebooks for retrieving constants\n",
"# gather all generated sequence yml files for time summary of retrieved constant in retrieved_constants.yml\n",
diff --git a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
index 5b30d81c6d1bca39783b60e9c8b2b3e61d2ee623..921904a5cb0f2cd7eb35931158e708453f2e2ae0 100644
--- a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
+++ b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
@@ -471,7 +471,7 @@
"mnames = []\n",
"for i in modules:\n",
" qm = f\"Q{i//4+1}M{i % 4+1}\"\n",
- " display(Markdown(f'## Position of the module {mnames} and it\\'s ASICs##'))\n",
+ " display(Markdown(f'## Position of the module {qm} and its ASICs##'))\n",
" mnames.append(qm)\n",
" \n",
"show_processed_modules(dinstance=dinstance, constants=None, mnames=mnames, mode=\"position\")\n"
diff --git a/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb b/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
index 0c4d704014d69db5f4b346c61b1d180a95d0fbae..e091b4bbe86fed79084e9ae53ce6a4083f74a754 100644
--- a/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
+++ b/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
@@ -89,7 +89,8 @@
"import numpy as np\n",
"from prettytable import PrettyTable\n",
"\n",
- "from cal_tools.tools import get_dir_creation_date, get_random_db_interface, save_const_to_h5\n",
+ "from cal_tools.tools import (get_dir_creation_date, get_random_db_interface,\n",
+ " save_const_to_h5, send_to_db)\n",
"from cal_tools.enums import BadPixels\n",
"from iCalibrationDB import Constants, Conditions, Detectors, Versions\n",
"from iCalibrationDB.detectors import DetectorTypes\n",
@@ -1121,8 +1122,7 @@
" \n",
"print(\"Constants parameter conditions are:\\n\")\n",
"print(f\"• bias_voltage: {bias_voltage}\\n• integration_time: {integration_time}\\n\"\n",
- " f\"• temperature: {temperature_k}\\n• gain_setting: {gain_setting}\\n\"\n",
- " f\"• in_vacuum: {in_vacuum}\\n\"\n",
+ " f\"• temperature: {fix_temperature}\\n• gain_setting: {det_gain}\\n\"\n",
" f\"• creation_time: {md.calibration_constant_version.begin_at if md is not None else creation_time}\\n\")"
]
}
diff --git a/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb b/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
index 7853cc10f8f1fc7779e13751b5241b83df728719..58f4256055a86bd912950078940b09b16f6dd418 100644
--- a/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
+++ b/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
@@ -803,8 +803,9 @@
" gain[gain != 0] -= 1\n",
" \n",
" fstride = 1\n",
- " if not flip_rgain: # rgain was taken during flipped orientation\n",
- " fstride = -1\n",
+ " if corr_bools.get('relgain'):\n",
+ " if not flip_rgain: # rgain was taken during flipped orientation\n",
+ " fstride = -1\n",
" \n",
" data = np.bitwise_and(data, 0b0011111111111111).astype(np.float32)\n",
"\n",
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index c5b74363156e36c1f3f18934d60986342c592be1..7cd3961d78a39a7bc58c2970266b204248ce90de 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -503,7 +503,7 @@
"\n",
" if gain == 0:\n",
" leg = grid[gain].legend(\n",
- " loc='outside-top', ncol=3, \n",
+ " loc='upper center', ncol=3, \n",
" bbox_to_anchor=(0.1, 0.25, 0.7, 1.0))\n",
"\n",
" grid[gain].text(820, np.nanmax(hn)*0.4,\n",
diff --git a/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb b/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb
index 536f8b04b99453c5c95f9c86ce636ed9cae6871a..31fecbcc79175e072b8b921722507b53e619c7a6 100644
--- a/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb
+++ b/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb
@@ -284,7 +284,7 @@
" device = getattr(Detectors, db_module)\n",
" \n",
" if db_output:\n",
- " md = send_to_db(device, const, const.data, condition, file_loc, \n",
+ " md = send_to_db(device, const, condition, file_loc, \n",
" cal_db_interface, creation_time=creation_time, timeout=cal_db_timeout)\n",
"\n",
" if local_output:\n",
diff --git a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
index 18c45d5bd17fc41c4b881ecbe37fcfd30e2facac..094bbec2d14b8fe54dba4cfb4cf703aad95749b5 100644
--- a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
+++ b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
@@ -38,7 +38,7 @@
"h5path_ctrl = '/CONTROL/{}/CTRL/TCTRL'\n",
"\n",
"overwrite = True # keep this as True to not overwrite the output \n",
- "use_dir_creation_date = True # required to obtain creation time of the run\n",
+ "use_dir_creation_date = True # To obtain creation time of the run\n",
"number_dark_frames = 0 # number of images to be used, if set to 0 all available images are used\n",
"chunk_size_idim = 1 # H5 chunking size of output data\n",
"cluster_profile = \"noDB\" # ipcluster profile to use\n",
@@ -1209,8 +1209,9 @@
"# Resetting the histogram calculators:\n",
"histCalRaw.reset()\n",
"histCalOffsetCor.reset()\n",
- "histCalPcorr.reset()\n",
- "histCalPcorrS.reset()\n",
+ "if corr_bools.get('pattern_class'):\n",
+ " histCalPcorr.reset()\n",
+ " histCalPcorrS.reset()\n",
"if corr_bools.get('common_mode'):\n",
" histCalCommonModeCor.reset()\n",
"if corr_bools.get('relgain'):\n",