From 4370a8eab5991af874d06e43d4f6d65e6ea7302f Mon Sep 17 00:00:00 2001
From: Steffen Hauf <steffen.hauf@xfel.eu>
Date: Tue, 30 Jul 2019 11:32:03 +0200
Subject: [PATCH] Resolved regressions
---
...Jungfrau_Gain_Correct_and_Verify_NBC.ipynb | 19 +++++++++----------
...Jungfrau_dark_analysis_all_gains_NBC.ipynb | 14 +++++++-------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
index 2a93c3520..3f7a4e91c 100644
--- a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
@@ -21,14 +21,13 @@
"source": [
"in_folder = \"/gpfs/exfel/exp/FXE/201802/p002271/ra\" # the folder to read data from, required\n",
"run = 132 # runs to process, required\n",
- "# out_folder = \"/gpfs/exfel/data/scratch/haufs/test/\" # the folder to output to, required\n",
- "out_folder = \"/gpfs/exfel/data/scratch/xcal/test/\"\n",
+ "out_folder = \"/gpfs/exfel/data/scratch/haufs/test/\" # the folder to output to, required\n",
"calfile = \"\" # path to calibration file. Leave empty if all data should come from DB, not actually used, makes automode happy\n",
"sequences = [-1] # sequences to correct, set to -1 for all, range allowed\n",
"mem_cells = 1 # memory cells in data, not actually used, makes automode happy\n",
"overwrite = True # set to True if existing data should be overwritten\n",
"no_relative_gain = False # do not do relative gain correction\n",
- "cluster_profile = \"noDB\"\n",
+ "cluster_profile = \"noDB\" # cluster profile to use\n",
"bias_voltage = 90 # will be overwritten by value in file\n",
"cal_db_interface = \"tcp://max-exfl016:8016\" #\"tcp://max-exfl016:8015#8025\" # the database interface to use\n",
"use_dir_creation_date = True # use the creation data of the input dir for database queries\n",
@@ -41,13 +40,13 @@
"integration_time = 1000 # integration time in us, will be overwritten by value in file\n",
"h5path = '/INSTRUMENT/{}/DET/{}:daqOutput/data' # path in H5 file under which images are located\n",
"gmapfile = \"/gpfs/exfel/data/scratch/xcal/jfgain/gainMaps_M233.h5\" #temporary gain calibration file, not in the DB; leave empty if using DB\n",
- "memcells = 1 \n",
- "karabo_id = \"FXE_XAD_JF1M\"\n",
- "receiver_id = \"RECEIVER\"\n",
- "control_id = \"CONTROL\"\n",
- "db_module = \"Jungfrau_M233\"\n",
- "path_inset = \"JNGFR02\"\n",
- "path_inset_control = \"JNGFR01\"\n",
+ "memcells = 1 # number of memory cells\n",
+ "karabo_id = \"FXE_XAD_JF1M\" # karabo prefix of Jungfrau devices\n",
+ "receiver_id = \"RECEIVER\" # inset for receiver devices\n",
+ "control_id = \"CONTROL\" # inset for control devices\n",
+ "db_module = \"Jungfrau_M233\" # ID of module in calibration database\n",
+ "path_inset = \"JNGFR02\" # file inset for image data\n",
+ "path_inset_control = \"JNGFR01\" # file inset for control data\n",
"manual_slow_data = False # set this flag to not use slow control data from file, but manual entries\n",
"\n",
"def balance_sequences(in_folder, run, sequences, sequences_per_node):\n",
diff --git a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_NBC.ipynb
index c4e3aebc3..040660ff0 100644
--- a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_NBC.ipynb
@@ -23,8 +23,8 @@
"out_folder = '' # path to place reports at, required\n",
"sequences = 1 # number of sequence files in that run\n",
"path_template = 'RAW-R{:04d}-{}-S{{:05d}}.h5' # template to use for file name, double escape sequence number\n",
- "path_inset = \"DA06\"\n",
- "path_inset_control = \"DA06\"\n",
+ "path_inset = \"DA06\" # file inset for image data\n",
+ "path_inset_control = \"DA06\" # file inset for control data\n",
"cluster_profile = 'noDB' # the ipcluster profile name\n",
"cal_db_interface = 'tcp://max-exfl016:8016' # calibrate db interface to connect to\n",
"integration_time = 1000 # integration time in us, will be overwritten by value in file\n",
@@ -39,11 +39,11 @@
"run_high = 0 # run number for G0 dark run, required\n",
"run_med = 0 # run number for G1 dark run, required\n",
"run_low = 0 # run number for G2 dark run, required\n",
- "karabo_id = \"FXE_XAD_JF500K\"\n",
- "receiver_id = \"RECEIVER\"\n",
- "control_id = \"CONTROL\"\n",
- "db_module = \"Jungfrau_M233\"\n",
- "use_dir_creation_date = True\n",
+ "karabo_id = \"FXE_XAD_JF500K\" # karabo prefix of Jungfrau devices\n",
+ "receiver_id = \"RECEIVER\" # inset for receiver devices\\\n",
+ "control_id = \"CONTROL\" # inset for control devices\n",
+ "db_module = \"Jungfrau_M233\" # ID of module in calibration database\n",
+ "use_dir_creation_date = True # use dir creation date\n",
"manual_slow_data = False # set this flag to not use slow control data from file, but manual entries"
]
},
--
GitLab