From 9659ef68408a30d5d1e00f1f4bdb6e3a4d3e1134 Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Thu, 17 Jun 2021 14:18:03 +0200
Subject: [PATCH] [AGIPD][Jungfrau] Fix: Use all available sequences files for
processing darks
---
.../Characterize_AGIPD_Gain_Darks_NBC.ipynb | 8 +++++---
...ark_analysis_all_gains_burst_mode_NBC.ipynb | 18 ++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index 0132b5929..8179f96a1 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -20,8 +20,8 @@
"outputs": [],
"source": [
"in_folder = \"/gpfs/exfel/d/raw/CALLAB/202031/p900113\" # path to input data, required\n",
- "out_folder = \"/gpfs/exfel/data/scratch/hammerd/agipd-fixed-gain\" # path to output to, required\n",
- "sequences = [0] # sequence files to evaluate.\n",
+ "out_folder = \"\" # path to output to, required\n",
+ "sequences = [-1] # sequence files to evaluate.\n",
"modules = [-1] # list of modules to evaluate, RANGE ALLOWED\n",
"run_high = 9985 # run number in which high gain data was recorded, required\n",
"run_med = 9984 # run number in which medium gain data was recorded, required\n",
@@ -166,6 +166,8 @@
" dinstance = \"AGIPD500K\"\n",
" nmods = 8\n",
"\n",
+ "if sequences == [-1]:\n",
+ " sequences = None\n",
"control_names = [f'{in_folder}/r{r:04d}/RAW-R{r:04d}-{karabo_da_control}-S00000.h5'\n",
" for r in (run_high, run_med, run_low)]\n",
"\n",
@@ -245,7 +247,7 @@
"print(f\"Proposal: {prop}\")\n",
"print(f\"Memory cells: {mem_cells}/{max_cells}\")\n",
"print(\"Runs: {}\".format([v for v in offset_runs.values()]))\n",
- "print(f\"Sequences: {sequences}\")\n",
+ "print(f\"Sequences: {sequences if sequences else 'All'}\")\n",
"print(f\"Interlaced mode: {interlaced}\")\n",
"print(f\"Using DB: {db_output}\")\n",
"print(f\"Input: {in_folder}\")\n",
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 5edd0344a..31fb1d431 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
@@ -18,23 +18,22 @@
"outputs": [],
"source": [
"cluster_profile = 'noDB' # the ipcluster profile name\n",
- "in_folder = '/gpfs/exfel/exp/SPB/201922/p002566/raw/' # folder under which runs are located, required\n",
+ "in_folder = '/gpfs/exfel/exp/SPB/202130/p900204/raw/' # folder under which runs are located, required\n",
"out_folder = '/gpfs/exfel/data/scratch/ahmedk/jftest_dark/' # path to place reports at, required\n",
- "sequences = 0 # number of sequence files in that run\n",
- "run_high = 103 # run number for G0 dark run, required\n",
- "run_med = 104 # run number for G1 dark run, required\n",
- "run_low = 105 # run number for G2 dark run, required\n",
+ "run_high = 141 # run number for G0 dark run, required\n",
+ "run_med = 142 # run number for G1 dark run, required\n",
+ "run_low = 143 # run number for G2 dark run, required\n",
"\n",
- "karabo_da = ['JNGFR01', 'JNGFR02','JNGFR03','JNGFR06','JNGFR07','JNGFR08'] # list of data aggregators, which corresponds to different JF modules\n",
- "karabo_id = \"SPB_IRDA_JNGFR\" # bla karabo prefix of Jungfrau devices\n",
+ "karabo_da = ['JNGFR01', 'JNGFR02','JNGFR03','JNGFR04', 'JNGFR05', 'JNGFR06','JNGFR07','JNGFR08'] # list of data aggregators, which corresponds to different JF modules\n",
+ "karabo_id = \"SPB_IRDA_JF4M\" # karabo_id (detector identifier) prefix of Jungfrau detector to process.\n",
"karabo_id_control = \"\" # if control is on a different ID, set to empty string if it is the same a karabo-id\n",
- "receiver_id = 'MODULE_{}' # inset for receiver devices\n",
+ "receiver_id = 'JNGFR{:02}' # inset for receiver devices\n",
"receiver_control_id = \"CONTROL\" # inset for control devices\n",
"path_template = 'RAW-R{:04d}-{}-S{{:05d}}.h5' # template to use for file name, double escape sequence number\n",
"h5path = '/INSTRUMENT/{}/DET/{}:daqOutput/data' # path in H5 file under which images are located\n",
"h5path_run = '/RUN/{}/DET/{}' # path to run data\n",
"h5path_cntrl = '/CONTROL/{}/DET/{}' # path to control data\n",
- "karabo_da_control = \"JNGFR01\" # file inset for control data\n",
+ "karabo_da_control = \"JNGFRCTRL00\" # file inset for control data\n",
"\n",
"use_dir_creation_date = True # use dir creation date\n",
"cal_db_interface = 'tcp://max-exfl016:8016' # calibrate db interface to connect to\n",
@@ -228,7 +227,6 @@
" \n",
" fp_name = path_template.format(r_n, path_inset)\n",
" fp_path = '{}/{}'.format(ped_dir, fp_name)\n",
- " myRange_P = range(0, sequences)\n",
" path = h5path\n",
"\n",
" print(\"Reading data from {}\".format(fp_path))\n",
--
GitLab