diff --git a/cal_tools/cal_tools/agipdlib.py b/cal_tools/cal_tools/agipdlib.py
index ede2c23d55feb817446e2bc705323d618a8ffd22..ad6d1325a96f3a15f0f28695a027555d356d7cb6 100644
--- a/cal_tools/cal_tools/agipdlib.py
+++ b/cal_tools/cal_tools/agipdlib.py
@@ -38,7 +38,7 @@ class AgipdCorrections:
bins_dig_gain_vs_signal, raw_fmt_version=2, chunk_size=512,
h5_data_path="INSTRUMENT/SPB_DET_AGIPD1M-1/DET/{}CH0:xtdf/",
h5_index_path="INDEX/SPB_DET_AGIPD1M-1/DET/{}CH0:xtdf/",
- do_rel_gain=True, timeout=3000):
+ do_rel_gain=True, timeout=30000):
"""
Initialize an AgipdCorrections Class
@@ -385,7 +385,7 @@ class AgipdCorrections:
return ((self.hists_signal_low, self.hists_signal_high, self.hists_gain_vs_signal, self.hists_dig_gain_vs_signal),
(self.low_edges, self.high_edges, self.signal_edges, self.dig_signal_edges))
- def initialize_from_db(self, dbparms, qm, only_dark=False, timeout = self.timeout):
+ def initialize_from_db(self, dbparms, qm, only_dark=False):
cal_db_interface, creation_time, max_cells_db, bias_voltage, photon_energy = dbparms
offset = get_constant_from_db(getattr(Detectors.AGIPD1M1, qm),
Constants.AGIPD.Offset(),
@@ -393,7 +393,7 @@ class AgipdCorrections:
np.zeros((128,512,max_cells_db,3)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout)
+ timeout=self.timeout)
noise = get_constant_from_db(getattr(Detectors.AGIPD1M1, qm),
Constants.AGIPD.Noise(),
@@ -401,7 +401,7 @@ class AgipdCorrections:
np.zeros((128,512,max_cells_db,3)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout)
+ timeout=self.timeout)
bpixels = get_constant_from_db(getattr(Detectors.AGIPD1M1, qm),
Constants.AGIPD.BadPixelsDark(),
@@ -410,7 +410,7 @@ class AgipdCorrections:
np.zeros((128,512,max_cells_db,3)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout).astype(np.uint32)
+ timeout=self.timeout).astype(np.uint32)
thresholds = get_constant_from_db(getattr(Detectors.AGIPD1M1, qm),
Constants.AGIPD.ThresholdsDark(),
@@ -419,7 +419,7 @@ class AgipdCorrections:
np.ones((128,512,max_cells_db,2)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout)
+ timeout=self.timeout)
if only_dark:
self.initialize(offset, None, bpixels, noise, thresholds, None)
@@ -432,7 +432,7 @@ class AgipdCorrections:
np.ones((128,512,max_cells_db,10)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout).astype(np.float32)
+ timeout=self.timeout).astype(np.float32)
if slopesPC.shape[0] == 10: # constant dimension injected first
slopesPC = np.moveaxis(slopesPC, 0, 3)
@@ -457,7 +457,7 @@ class AgipdCorrections:
np.ones((128,512,max_cells_db)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout))
+ timeout=self.timeout))
rel_gain = np.ones((128, 512, self.max_cells, 3), np.float32)
pc_high_m = slopesPC[...,:self.max_cells,0]
@@ -493,7 +493,7 @@ class AgipdCorrections:
np.zeros((max_cells_db, 128,512)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout).astype(np.uint32), 0, 2)[...,None]
+ timeout=self.timeout).astype(np.uint32), 0, 2)[...,None]
bpixels |= get_constant_from_db(getattr(Detectors.AGIPD1M1, qm),
Constants.AGIPD.BadPixelsFF(),
@@ -503,7 +503,7 @@ class AgipdCorrections:
np.zeros((128,512,max_cells_db)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout).astype(np.uint32)[...,None]
+ timeout=self.timeout).astype(np.uint32)[...,None]
diff --git a/cal_tools/cal_tools/lpdlib.py b/cal_tools/cal_tools/lpdlib.py
index 4c6e66eb68ea6bb18796fb5696616a3a513eea25..e97b79c578dc138e19400f03c9e7f3b91574db55 100644
--- a/cal_tools/cal_tools/lpdlib.py
+++ b/cal_tools/cal_tools/lpdlib.py
@@ -38,7 +38,7 @@ class LpdCorrections:
raw_fmt_version=2, chunk_size=512,
h5_data_path="INSTRUMENT/FXE_DET_LPD1M-1/DET/{}CH0:xtdf/",
h5_index_path="INDEX/FXE_DET_LPD1M-1/DET/{}CH0:xtdf/",
- do_ff=True, timeout=3000):
+ do_ff=True, timeout=30000):
"""
Initialize an LpdCorrections Class
@@ -367,7 +367,7 @@ class LpdCorrections:
return ((self.hists_signal_low, self.hists_signal_high, self.hists_gain_vs_signal),
(self.low_edges, self.high_edges, self.signal_edges))
- def initialize_from_db(self, dbparms, qm, only_dark=False, timeout = self.timeout):
+ def initialize_from_db(self, dbparms, qm, only_dark=False):
cal_db_interface, creation_time, max_cells_db, capacitor, bias_voltage, photon_energy = dbparms
offset = get_constant_from_db(getattr(Detectors.LPD1M1, qm),
Constants.LPD.Offset(),
@@ -376,7 +376,7 @@ class LpdCorrections:
np.zeros((256,256,max_cells_db,3)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout)
+ timeout=self.timeout)
noise = get_constant_from_db(getattr(Detectors.LPD1M1, qm),
Constants.LPD.Noise(),
@@ -385,7 +385,7 @@ class LpdCorrections:
np.zeros((256,256,max_cells_db,3)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout)
+ timeout=self.timeout)
bpixels = get_constant_from_db(getattr(Detectors.LPD1M1, qm),
Constants.LPD.BadPixelsDark(),
@@ -395,7 +395,7 @@ class LpdCorrections:
np.zeros((256,256,max_cells_db,3)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout).astype(np.uint32)
+ timeout=self.timeout).astype(np.uint32)
if only_dark:
self.initialize(offset, None, None, bpixels, noise, None)
return
@@ -408,7 +408,7 @@ class LpdCorrections:
np.ones((256,256,max_cells_db,2)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout)
+ timeout=self.timeout)
rel_gains = slopesCI[...,0]
rel_gain_offset = slopesCI[...,1]
@@ -421,7 +421,7 @@ class LpdCorrections:
np.ones((256,256)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout))
+ timeout=self.timeout))
@@ -434,7 +434,7 @@ class LpdCorrections:
np.zeros((256,256,max_cells_db,3)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout).astype(np.uint32)
+ timeout=self.timeout).astype(np.uint32)
bpixels |= get_constant_from_db(getattr(Detectors.LPD1M1, qm),
Constants.LPD.BadPixelsFF(),
@@ -444,7 +444,7 @@ class LpdCorrections:
np.zeros((256,256,max_cells_db)),
cal_db_interface,
creation_time=creation_time,
- timeout=timeout).astype(np.uint32)[...,None]
+ timeout=self.timeout).astype(np.uint32)[...,None]
self.initialize(offset, rel_gains, rel_gain_offset, bpixels, noise, flat_fields)
diff --git a/cal_tools/cal_tools/tools.py b/cal_tools/cal_tools/tools.py
index 778764ccc1995bb5f147a032a43aa43286c2ec6d..54e89bd0f7e1b9131b6604b9a3793d17053788ff 100644
--- a/cal_tools/cal_tools/tools.py
+++ b/cal_tools/cal_tools/tools.py
@@ -286,7 +286,7 @@ def get_dir_creation_date(directory, run):
all_ready_printed = {}
def get_constant_from_db(device, constant, condition, empty_constant,
cal_db_interface, creation_time = None,
- print_once=True, timeout=3000):
+ print_once=True, timeout=30000):
from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions
if device:
@@ -300,7 +300,7 @@ def get_constant_from_db(device, constant, condition, empty_constant,
metadata.calibration_constant_version = Versions.Timespan(device=device,
start=creation_time)
try:
- metadata.retrieve(cal_db_interface, timeout)
+ metadata.retrieve(cal_db_interface, timeout=timeout)
if constant.name not in all_ready_printed or not print_once:
all_ready_printed[constant.name] = True
print("{} was injected on: {}".format(constant.name, metadata.calibration_constant_version.begin_at))
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 41803263552e593525cfa786652dc52bba879b10..bef0996b68a878ee1d90b14b920d3e7ac60acb7f 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -38,6 +38,7 @@
"photon_energy = 9.2 # photon energy in keV\n",
"index_v = 2 # version of RAW index type\n",
"nodb = False # if set only file-based constants will be used\n",
+ "timeout_zmq = 900 # set to 900 as a default value to communicate with ZMQ\n",
"\n",
"def balance_sequences(in_folder, run, sequences, sequences_per_node):\n",
" import glob\n",
@@ -419,7 +420,7 @@
" agipd_corr = AgipdCorrections(infile, outfile, max_cells, channel, max_pulses,\n",
" bins_gain_vs_signal, bins_signal_low_range,\n",
" bins_signal_high_range, bins_dig_gain_vs_signal,\n",
- " do_rel_gain=do_rel_gain)\n",
+ " do_rel_gain=do_rel_gain, timeout=timeout_zmq)\n",
" \n",
" try:\n",
" agipd_corr.get_valid_image_idx() \n",
diff --git a/notebooks/LPD/LPD_Correct_and_Verify.ipynb b/notebooks/LPD/LPD_Correct_and_Verify.ipynb
index 50e33e9d07e6e279b8f072855107e35cb625b922..1de3afbb432da1adc7fef9d84599d55d99c4c741 100644
--- a/notebooks/LPD/LPD_Correct_and_Verify.ipynb
+++ b/notebooks/LPD/LPD_Correct_and_Verify.ipynb
@@ -42,6 +42,7 @@
"geometry_file = \"/gpfs/exfel/d/cal/exchange/lpdMF_00.h5\" # the geometry file to use, MAR 2018\n",
"beam_center_offset = [1.5, 1] # offset from the beam center, MAR 2018\n",
"sequences_per_node = 2\n",
+ "timeout_zmq = 900 # set to 900 as a default value to communicate with ZMQ\n",
"\n",
"def balance_sequences(in_folder, run, sequences, sequences_per_node):\n",
" import glob\n",
@@ -379,7 +380,7 @@
" \n",
" lpd_corr = LpdCorrections(infile, outfile, max_cells, channel, max_pulses,\n",
" bins_gain_vs_signal, bins_signal_low_range,\n",
- " bins_signal_high_range, do_ff=do_ff)\n",
+ " bins_signal_high_range, do_ff=do_ff, timeout=timeout_zmq)\n",
" \n",
" try:\n",
" lpd_corr.get_valid_image_idx() \n",