From 8c4d2f51307f83171b6e84e6c8f54a728c7b1a7c Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 19 Jun 2023 14:36:22 +0200
Subject: [PATCH] Replace max-exfl016 with max-exfl-cal001
---
README.rst | 4 ++--
.../AGIPD_Characterize_Gain_Combine_NBC.ipynb | 2 +-
.../AGIPD/AGIPD_Correct_and_Verify.ipynb | 2 +-
...IPD_Retrieve_Constants_Precorrection.ipynb | 2 +-
.../Characterize_AGIPD_Gain_Darks_NBC.ipynb | 2 +-
...aracterize_AGIPD_Gain_FlatFields_NBC.ipynb | 2 +-
...terize_AGIPD_Gain_FlatFields_Summary.ipynb | 2 +-
.../AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb | 2 +-
.../playground/AGIPD_SingleM_test_Dark.ipynb | 2 +-
...aracterize_AGIPD_Gain_FlatFields_NBC.ipynb | 2 +-
.../Chracterize_AGIPD_Gain_PC_mlearn.ipynb | 2 +-
.../Investigate_Baseline_Drift.ipynb | 2 +-
.../QuickCorrect-SingleModule.ipynb | 2 +-
.../DSSC/Characterize_DSSC_Darks_NBC.ipynb | 2 +-
notebooks/DSSC/DSSC_Correct_and_Verify.ipynb | 2 +-
...s_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb | 2 +-
...orrectionNotebook_NewDAQ_FastCCD_NBC.ipynb | 2 +-
.../Characterize_Darks_Gotthard2_NBC.ipynb | 2 +-
.../Gotthard2/Correction_Gotthard2_NBC.ipynb | 2 +-
...Jungfrau_Gain_Correct_and_Verify_NBC.ipynb | 2 +-
...rk_analysis_all_gains_burst_mode_NBC.ipynb | 2 +-
...aracterize_LPD_GAIN_CI_per_pixel_NBC.ipynb | 2 +-
...t_calibration_constants_from_h5files.ipynb | 2 +-
notebooks/LPD/LPDChar_Darks_NBC.ipynb | 2 +-
notebooks/LPD/LPD_Correct_and_Verify.ipynb | 2 +-
.../Investigate_Single_Photons.ipynb | 6 ++---
.../LPDMini/LPD_Mini_Char_Darks_NBC.ipynb | 2 +-
...t_calibration_constants_from_h5files.ipynb | 2 +-
.../Characterize_Darks_ePix100_NBC.ipynb | 2 +-
.../ePix100/Correction_ePix100_NBC.ipynb | 2 +-
.../Characterize_Darks_ePix10K_NBC.ipynb | 2 +-
.../ePix10K/Correction_ePix10K_NBC.ipynb | 2 +-
notebooks/generic/PlotFromCalDB_NBC.ipynb | 2 +-
.../pnCCD/Characterize_pnCCD_Dark_NBC.ipynb | 2 +-
notebooks/pnCCD/Characterize_pnCCD_Gain.ipynb | 2 +-
notebooks/pnCCD/Correct_pnCCD_NBC.ipynb | 2 +-
reportservice/README.md | 2 +-
reportservice/report_conf.yaml | 24 +++++++++----------
src/cal_tools/agipdlib.py | 6 ++---
src/cal_tools/lpdlib.py | 6 ++---
src/cal_tools/tools.py | 6 ++---
tests/test_update_config.py | 2 +-
webservice/config/serve_overview.yaml | 2 +-
webservice/config/webservice.yaml | 4 ++--
webservice/manual_launch.py | 2 +-
webservice/request_darks.py | 2 +-
webservice/request_repeat.py | 2 +-
webservice/update_config.py | 2 +-
48 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/README.rst b/README.rst
index 5038f9b97..c7a5c22c2 100644
--- a/README.rst
+++ b/README.rst
@@ -215,7 +215,7 @@ CORRECT<dict> {'cmd': 'python -m xfel_calibrate.calibrate {detector} CORRECT '
'--report-to '
'/gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/usr/Reports/{runs}/{det_instance}_{action}_{proposal}_{runs}_{time_stamp} '
'--cal-db-timeout 300000 --cal-db-interface '
- 'tcp://max-exfl016:8015#8044',
+ 'tcp://max-exfl-cal001:8015#8044',
'in-folder': '/gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw',
'out-folder': '/gpfs/exfel/d/proc/{instrument}/{cycle}/p{proposal}/{run}',
'sched-prio': 80}
@@ -225,7 +225,7 @@ DARK<dict> {'cmd': 'python -m xfel_calibrate.calibrate {detector} DARK --concurr
'{action}_{instrument}_{detector}_{cycle}_p{proposal}_{runs} '
'--report-to '
'/gpfs/exfel/d/cal/caldb_store/xfel/reports/{instrument}/{det_instance}/{action}/{action}_{proposal}_{runs}_{time_stamp} '
- '--cal-db-interface tcp://max-exfl016:8015#8044 --db-output',
+ '--cal-db-interface tcp://max-exfl-cal001:8015#8044 --db-output',
'in-folder': '/gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw',
'out-folder': '/gpfs/exfel/u/usr/{instrument}/{cycle}/p{proposal}/dark/runs_{runs}',
'sched-prio': 10}
diff --git a/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb b/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb
index 253789c14..0c699d8f7 100644
--- a/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb
+++ b/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb
@@ -34,7 +34,7 @@
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
"bias_voltage = 300 # detector bias voltage\n",
- "cal_db_interface = \"tcp://max-exfl016:5005\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:5005\" # the database interface to use\n",
"mem_cells = 64 # number of memory cells used\n",
"instrument = \"SPB\"\n",
"photon_energy = 9.2 # the photon energy in keV\n",
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 7f4df8a20..7adceb509 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -38,7 +38,7 @@
"slopes_ff_from_files = \"\" # Path to locally stored SlopesFF and BadPixelsFF constants, loaded in precorrection notebook\n",
"\n",
"creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC e.g. \"2022-06-28 13:00:00\"\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8045\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8045\" # the database interface to use\n",
"cal_db_timeout = 30000 # in milliseconds\n",
"creation_date_offset = \"00:00:00\" # add an offset to creation date, e.g. to get different constants\n",
"\n",
diff --git a/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb b/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
index f05b3cf1b..d0b20cadf 100644
--- a/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
+++ b/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
@@ -31,7 +31,7 @@
"karabo_id_control = \"SPB_IRU_AGIPD1M1\" # karabo-id for control device\n",
"\n",
"# Parameters for calibration database.\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8045\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8045\" # the database interface to use\n",
"creation_date_offset = \"00:00:00\" # add an offset to creation date, e.g. to get different constants\n",
"creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC e.g. \"2022-06-28 13:00:00\"\n",
"\n",
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index d42fa752d..0d113f7b3 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -36,7 +36,7 @@
"karabo_id_control = \"HED_EXP_AGIPD500K2G\" # karabo-id for control device '\n",
"\n",
"use_dir_creation_date = True # use dir creation date as data production reference date\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # the database interface to use\n",
"cal_db_timeout = 3000000 # timeout on caldb requests\"\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
index 99a185e0f..fa1d218a0 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
@@ -31,7 +31,7 @@
"karabo_da_control = 'AGIPD1MCTRL00' # karabo DA for control infromation\n",
"\n",
"use_dir_creation_date = True # use the creation data of the input dir for database queries\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8045\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8045\" # the database interface to use\n",
"cal_db_timeout = 30000 # in milli seconds\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_Summary.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_Summary.ipynb
index 1694e505e..e5705d148 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_Summary.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_Summary.ipynb
@@ -27,7 +27,7 @@
"karabo_id_control = \"MID_EXP_AGIPD1M1\" # karabo-id for control device\n",
"\n",
"use_dir_creation_date = True # use the creation data of the input dir for database queries\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8045\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8045\" # the database interface to use\n",
"cal_db_timeout = 30000 # in milli seconds\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
diff --git a/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb b/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb
index e739991f8..672e8e9bc 100644
--- a/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb
+++ b/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb
@@ -49,7 +49,7 @@
"\n",
"use_dir_creation_date = True\n",
"delta_time = 0 # offset to the creation time (e.g. useful in case we want to force the system to use diff. dark constants)\n",
- "cal_db_interface = \"tcp://max-exfl016:8019\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8019\" # the database interface to use\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
"\n",
diff --git a/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb b/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb
index 1e10696d0..93986695a 100644
--- a/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb
+++ b/notebooks/AGIPD/playground/AGIPD_SingleM_test_Dark.ipynb
@@ -31,7 +31,7 @@
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
"\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # the database interface to use\n",
"cal_db_timeout = 3000000 # timeout on caldb requests\"\n",
"\n",
"instrument = \"SPB\"\n",
diff --git a/notebooks/AGIPD/playground/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb b/notebooks/AGIPD/playground/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
index eb1807e2a..bc2e17645 100644
--- a/notebooks/AGIPD/playground/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
+++ b/notebooks/AGIPD/playground/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
@@ -40,7 +40,7 @@
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
"bias_voltage = 300 # detector bias voltage\n",
- "cal_db_interface = \"tcp://max-exfl016:8026#8035\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8026#8035\" # the database interface to use\n",
"mem_cells = 0 # number of memory cells used\n",
"interlaced = False # assume interlaced data format, for data prior to Dec. 2017\n",
"fit_hook = True # fit a hook function to medium gain slope\n",
diff --git a/notebooks/AGIPD/playground/Chracterize_AGIPD_Gain_PC_mlearn.ipynb b/notebooks/AGIPD/playground/Chracterize_AGIPD_Gain_PC_mlearn.ipynb
index 22e9fb728..78e4d3189 100644
--- a/notebooks/AGIPD/playground/Chracterize_AGIPD_Gain_PC_mlearn.ipynb
+++ b/notebooks/AGIPD/playground/Chracterize_AGIPD_Gain_PC_mlearn.ipynb
@@ -42,7 +42,7 @@
"local_output = True # output constants locally\n",
"db_output = True # output constants to database\n",
"bias_voltage = 300 # detector bias voltage\n",
- "cal_db_interface = \"tcp://max-exfl016:8019\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8019\" # the database interface to use\n",
"mem_cells = 176 # number of memory cells used\n",
"interlaced = False # assume interlaced data format, for data prior to Dec. 2017\n",
"fit_hook = True # fit a hook function to medium gain slope\n",
diff --git a/notebooks/AGIPD/playground/Investigate_Baseline_Drift.ipynb b/notebooks/AGIPD/playground/Investigate_Baseline_Drift.ipynb
index 5d944cca8..74a12622b 100644
--- a/notebooks/AGIPD/playground/Investigate_Baseline_Drift.ipynb
+++ b/notebooks/AGIPD/playground/Investigate_Baseline_Drift.ipynb
@@ -24,7 +24,7 @@
"cells = [2] #list(range(1,32,8))\n",
"max_cells_db = 176\n",
"bias_voltage = 300\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\"\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\"\n",
"photon_energy = 9.2"
]
},
diff --git a/notebooks/AGIPD/playground/QuickCorrect-SingleModule.ipynb b/notebooks/AGIPD/playground/QuickCorrect-SingleModule.ipynb
index 2290cf45b..6bcd849a4 100644
--- a/notebooks/AGIPD/playground/QuickCorrect-SingleModule.ipynb
+++ b/notebooks/AGIPD/playground/QuickCorrect-SingleModule.ipynb
@@ -19,7 +19,7 @@
"max_pulses = 120\n",
"local_input = False\n",
"bias_voltage = 300\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # the database interface to use\n",
"use_dir_creation_date = False # use the creation data of the input dir for database queries\n",
"photon_energy = 9.2 # photon energy in keV\n",
"index_v = 2 # version of RAW index type\n",
diff --git a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
index b8f152e7a..9abbcd225 100644
--- a/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
+++ b/notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb
@@ -36,7 +36,7 @@
"slow_data_pattern = 'RAW-R{}-DA{}-S00000.h5'\n",
"\n",
"use_dir_creation_date = True # use the dir creation date for determining the creation time\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # the database interface to use\n",
"cal_db_timeout = 3000000 # timeout on caldb requests\"\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
diff --git a/notebooks/DSSC/DSSC_Correct_and_Verify.ipynb b/notebooks/DSSC/DSSC_Correct_and_Verify.ipynb
index b29f2e2d9..55978ac1e 100644
--- a/notebooks/DSSC/DSSC_Correct_and_Verify.ipynb
+++ b/notebooks/DSSC/DSSC_Correct_and_Verify.ipynb
@@ -38,7 +38,7 @@
"slow_data_pattern = 'RAW-R{}-DA{}-S00000.h5'\n",
"\n",
"use_dir_creation_date = True # use the creation data of the input dir for database queries\n",
- "cal_db_interface = \"tcp://max-exfl016:8020#8025\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020#8025\" # the database interface to use\n",
"cal_db_timeout = 300000 # in milli seconds\n",
"\n",
"mem_cells = 0 # number of memory cells used, set to 0 to automatically infer\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 34e718eb4..a1c9bb5d7 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
@@ -35,7 +35,7 @@
"h5path_cntrl = '/RUN/{}/DET/FCCD' # path to find control data\n",
"\n",
"use_dir_creation_date = True # To be used to retrieve calibration constants later on (for database time derivation)\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # the calibration database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # the calibration database interface to use\n",
"cal_db_timeout = 300000 # timeout on calibration database requests\n",
"db_output = False # Output constants to the calibration database\n",
"local_output = True # output constants locally\n",
diff --git a/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb b/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
index 6be6f7d17..27081b041 100644
--- a/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
+++ b/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
@@ -37,7 +37,7 @@
"h5path_cntrl = '/RUN/{}/DET/FCCD' # path to control data\n",
"\n",
"use_dir_creation_date = True # use dir creation data for calDB queries\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8025\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8025\" # calibration DB interface to use\n",
"cal_db_timeout = 300000000 # timeout on caldb requests\n",
"\n",
"\n",
diff --git a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
index 0007b09ba..ee6e5c160 100644
--- a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
@@ -39,7 +39,7 @@
"\n",
"# Parameters for the calibration database.\n",
"use_dir_creation_date = True\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # calibration DB interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"overwrite_creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC.00 e.g. \"2022-06-28 13:00:00.00\"\n",
"db_output = False # Output constants to the calibration database\n",
diff --git a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
index 7672bf8ab..134e7e0bb 100644
--- a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
@@ -36,7 +36,7 @@
"karabo_id_control = \"\" # Control karabo ID. Set to empty string to use the karabo-id\n",
"\n",
"# Parameters for calibration database.\n",
- "cal_db_interface = \"tcp://max-exfl016:8016#8025\" # the database interface to use.\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8016#8025\" # the database interface to use.\n",
"cal_db_timeout = 180000 # timeout on caldb requests.\n",
"creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC e.g. \"2022-06-28 13:00:00\"\n",
"\n",
diff --git a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
index 7b1508799..e644dfcaa 100644
--- a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
@@ -33,7 +33,7 @@
"karabo_id_control = \"\" # if control is on a different ID, set to empty string if it is the same a karabo-id\n",
"\n",
"# Parameters for calibration database.\n",
- "cal_db_interface = \"tcp://max-exfl016:8017#8025\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8017#8025\" # the database interface to use\n",
"cal_db_timeout = 180000 # timeout on caldb requests\n",
"creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC e.g. \"2022-06-28 13:00:00\"\n",
"\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 144ce0009..e8315d3d3 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
@@ -34,7 +34,7 @@
"\n",
"# Parameters for calibration database and storing constants.\n",
"use_dir_creation_date = True # use dir creation date\n",
- "cal_db_interface = 'tcp://max-exfl016:8016#8045' # calibrate db interface to connect to\n",
+ "cal_db_interface = 'tcp://max-exfl-cal001:8016#8045' # calibrate db interface to connect to\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
diff --git a/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb b/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
index 0cdc02eb4..d406668ea 100644
--- a/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
+++ b/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
@@ -40,7 +40,7 @@
"db_output = False # output constants to database\n",
"db_input = True\n",
"bias_voltage = 300 # detector bias voltage\n",
- "cal_db_interface = \"tcp://max-exfl016:8015\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015\" # the database interface to use\n",
"\n",
"use_dir_creation_date = True # use the creation date of the directory for database time derivation\n",
"instrument = \"FXE\"\n",
diff --git a/notebooks/LPD/Inject_calibration_constants_from_h5files.ipynb b/notebooks/LPD/Inject_calibration_constants_from_h5files.ipynb
index 463bf868c..e3da58635 100644
--- a/notebooks/LPD/Inject_calibration_constants_from_h5files.ipynb
+++ b/notebooks/LPD/Inject_calibration_constants_from_h5files.ipynb
@@ -29,7 +29,7 @@
"karabo_da = [\"all\"] # karabo data aggregators. default \"all\" for all 16 karabo data aggregator names.\n",
"\n",
"# calibration database parameters:\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8045\" # calibration DB zmq address.\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8045\" # calibration DB zmq address.\n",
"\n",
"# calibration constant conditions:\n",
"memory_cells = 512 # Number of memory cells. Used for constant conditions.\n",
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index 6b8905ce4..9ba4365fc 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -35,7 +35,7 @@
"source_name = \"{}/DET/{}CH0:xtdf\" # Source name for raw detector data - filled with karabo_id & module number\n",
"\n",
"use_dir_creation_date = True # use the creation date of the directory for database time derivation\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8025\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8025\" # the database interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\"\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
diff --git a/notebooks/LPD/LPD_Correct_and_Verify.ipynb b/notebooks/LPD/LPD_Correct_and_Verify.ipynb
index c34b835b6..f99dfd20c 100644
--- a/notebooks/LPD/LPD_Correct_and_Verify.ipynb
+++ b/notebooks/LPD/LPD_Correct_and_Verify.ipynb
@@ -35,7 +35,7 @@
"h5path_idx = '/INDEX/{}/DET/{}:xtdf/' # path in the HDF5 file to images\n",
"\n",
"use_dir_creation_date = True # use the creation date of the directory for database time derivation\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8020\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8020\" # the database interface to use\n",
"cal_db_timeout = 30000 # timeout for calibration db requests in milliseconds\n",
"\n",
"\n",
diff --git a/notebooks/LPD/playground/Investigate_Single_Photons.ipynb b/notebooks/LPD/playground/Investigate_Single_Photons.ipynb
index f6151dbc6..14fa239a7 100644
--- a/notebooks/LPD/playground/Investigate_Single_Photons.ipynb
+++ b/notebooks/LPD/playground/Investigate_Single_Photons.ipynb
@@ -208,7 +208,7 @@
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mAgain\u001b[0m Traceback (most recent call last)",
- "\u001b[0;32m<ipython-input-144-cccdcd794c38>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m 11\u001b[0m capacitor=5),\n\u001b[1;32m 12\u001b[0m \u001b[0mnp\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mones\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;36m256\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m256\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m512\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m2\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 13\u001b[0;31m \"tcp://max-exfl016:8021\", timeout=30000000)\n\u001b[0m\u001b[1;32m 14\u001b[0m \u001b[0mrel_gains\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mslopesCI\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m...\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m0\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 15\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n",
+ "\u001b[0;32m<ipython-input-144-cccdcd794c38>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m 11\u001b[0m capacitor=5),\n\u001b[1;32m 12\u001b[0m \u001b[0mnp\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mones\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;36m256\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m256\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m512\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m2\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 13\u001b[0;31m \"tcp://max-exfl-cal001:8021\", timeout=30000000)\n\u001b[0m\u001b[1;32m 14\u001b[0m \u001b[0mrel_gains\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mslopesCI\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;34m...\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m0\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 15\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n",
"\u001b[0;32m/home/haufs/pycalibrate_tmp/cal_tools/cal_tools/tools.py\u001b[0m in \u001b[0;36mget_constant_from_db\u001b[0;34m(device, constant, condition, empty_constant, cal_db_interface, creation_time, print_once, timeout)\u001b[0m\n\u001b[1;32m 305\u001b[0m \u001b[0;32mif\u001b[0m \u001b[0mcreation_time\u001b[0m \u001b[0;32mis\u001b[0m \u001b[0;32mNone\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 306\u001b[0m \u001b[0mmetadata\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcalibration_constant_version\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mVersions\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mNow\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mdevice\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mdevice\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 307\u001b[0;31m \u001b[0mmetadata\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mretrieve\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mcal_db_interface\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 308\u001b[0m \u001b[0;32melse\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 309\u001b[0m metadata.calibration_constant_version = Versions.Timespan(device=device,\n",
"\u001b[0;32m/home/haufs/calkarabo/karabo/extern/lib/python3.4/site-packages/iCalibrationDB/meta_data.py\u001b[0m in \u001b[0;36mretrieve\u001b[0;34m(self, receiver, when, silent, timeout)\u001b[0m\n\u001b[1;32m 264\u001b[0m \u001b[0msock\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mconnect\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mreceiver\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 265\u001b[0m \u001b[0msock\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msend_pyobj\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mdata\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 266\u001b[0;31m \u001b[0mresp\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0msock\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mrecv_pyobj\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 267\u001b[0m \u001b[0;32mfinally\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 268\u001b[0m \u001b[0;32mdel\u001b[0m \u001b[0msock\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
"\u001b[0;32m/home/haufs/calkarabo/karabo/extern/lib/python3.4/site-packages/zmq/sugar/socket.py\u001b[0m in \u001b[0;36mrecv_pyobj\u001b[0;34m(self, flags)\u001b[0m\n\u001b[1;32m 489\u001b[0m \u001b[0mThe\u001b[0m \u001b[0mPython\u001b[0m \u001b[0mobject\u001b[0m \u001b[0mthat\u001b[0m \u001b[0marrives\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0ma\u001b[0m \u001b[0mmessage\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 490\u001b[0m \"\"\"\n\u001b[0;32m--> 491\u001b[0;31m \u001b[0mmsg\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mrecv\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mflags\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 492\u001b[0m \u001b[0;32mreturn\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0m_deserialize\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mmsg\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mpickle\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mloads\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 493\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n",
@@ -234,7 +234,7 @@
" bias_voltage=250,\n",
" capacitor=5),\n",
" np.ones((256, 256, 512, 2)),\n",
- " \"tcp://max-exfl016:8021\", timeout=30000000)\n",
+ " \"tcp://max-exfl-cal001:8021\", timeout=30000000)\n",
" rel_gains = slopesCI[..., 0]\n",
" \n",
" flat_fields = np.squeeze(\n",
@@ -248,7 +248,7 @@
" beam_energy=None,\n",
" capacitor=5), # noqa\n",
" np.ones((256, 256)),\n",
- " \"tcp://max-exfl016:8021\", timeout=30000000))\n",
+ " \"tcp://max-exfl-cal001:8021\", timeout=30000000))\n",
" \n",
" for tile in tiles:\n",
" tx0, ty0 = 256-(tile//8+1)* tile_y, 256 - (tile%8+1) * tile_x\n",
diff --git a/notebooks/LPDMini/LPD_Mini_Char_Darks_NBC.ipynb b/notebooks/LPDMini/LPD_Mini_Char_Darks_NBC.ipynb
index 38706bbff..a875f52a4 100644
--- a/notebooks/LPDMini/LPD_Mini_Char_Darks_NBC.ipynb
+++ b/notebooks/LPDMini/LPD_Mini_Char_Darks_NBC.ipynb
@@ -35,7 +35,7 @@
"control_source_name = \"{}/FPGA/FEM\" # Source name for control device\n",
"\n",
"creation_time = \"\" # Override the timestamp taken from the run (format '2023-03-30 15:04:31')\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8025\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8025\" # the database interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"local_output = True # output constants locally\n",
"db_output = False # output constants to database\n",
diff --git a/notebooks/LPDMini/LPD_Mini_Inject_calibration_constants_from_h5files.ipynb b/notebooks/LPDMini/LPD_Mini_Inject_calibration_constants_from_h5files.ipynb
index 53bb19aac..36284a0f7 100644
--- a/notebooks/LPDMini/LPD_Mini_Inject_calibration_constants_from_h5files.ipynb
+++ b/notebooks/LPDMini/LPD_Mini_Inject_calibration_constants_from_h5files.ipynb
@@ -34,7 +34,7 @@
"karabo_da = [\"\"] # karabo data aggregators. default \"all\" for all 8 karabo data aggregator names.\n",
"\n",
"# calibration database parameters:\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8045\" # calibration DB zmq address.\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8045\" # calibration DB zmq address.\n",
"\n",
"# calibration constant conditions:\n",
"memory_cells = 512 # Number of memory cells. Used for constant conditions.\n",
diff --git a/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb b/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
index 6776037fe..3d2da0b11 100644
--- a/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
+++ b/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
@@ -42,7 +42,7 @@
"\n",
"# Parameters for the calibration database.\n",
"use_dir_creation_date = True\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # calibration DB interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"db_output = False # Output constants to the calibration database\n",
"local_output = True # Output constants locally\n",
diff --git a/notebooks/ePix100/Correction_ePix100_NBC.ipynb b/notebooks/ePix100/Correction_ePix100_NBC.ipynb
index 515837397..983211e96 100644
--- a/notebooks/ePix100/Correction_ePix100_NBC.ipynb
+++ b/notebooks/ePix100/Correction_ePix100_NBC.ipynb
@@ -44,7 +44,7 @@
"limit_trains = 0 # Process only first N images, 0 - process all.\n",
"\n",
"# Parameters for the calibration database.\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8025\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8025\" # calibration DB interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"creation_time = \"\" # The timestamp to use with Calibration DBe. Required Format: \"YYYY-MM-DD hh:mm:ss\" e.g. 2019-07-04 11:02:41\n",
"\n",
diff --git a/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb b/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb
index f8a341d47..6183a9fe7 100644
--- a/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb
+++ b/notebooks/ePix10K/Characterize_Darks_ePix10K_NBC.ipynb
@@ -35,7 +35,7 @@
"h5path_cntrl = '/CONTROL/{}/DET' # path to control data\n",
"\n",
"use_dir_creation_date = True\n",
- "cal_db_interface = \"tcp://max-exfl016:8020\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8020\" # calibration DB interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"db_output = False # Output constants to the calibration database\n",
"local_output = True # output constants locally\n",
diff --git a/notebooks/ePix10K/Correction_ePix10K_NBC.ipynb b/notebooks/ePix10K/Correction_ePix10K_NBC.ipynb
index a85e3ae3a..4a3f8f933 100644
--- a/notebooks/ePix10K/Correction_ePix10K_NBC.ipynb
+++ b/notebooks/ePix10K/Correction_ePix10K_NBC.ipynb
@@ -37,7 +37,7 @@
"h5path_cntrl = '/CONTROL/{}/DET' # path to control data\n",
"\n",
"use_dir_creation_date = True # date constants injected before directory creation time\n",
- "cal_db_interface = \"tcp://max-exfl016:8015#8025\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015#8025\" # calibration DB interface to use\n",
"cal_db_timeout = 30000000 # timeout on caldb requests\n",
"\n",
"cpuCores = 4 # Specifies the number of running cpu cores\n",
diff --git a/notebooks/generic/PlotFromCalDB_NBC.ipynb b/notebooks/generic/PlotFromCalDB_NBC.ipynb
index 666b2d882..d611aeace 100644
--- a/notebooks/generic/PlotFromCalDB_NBC.ipynb
+++ b/notebooks/generic/PlotFromCalDB_NBC.ipynb
@@ -47,7 +47,7 @@
"photon_energy = 9.2 # Photon energy of the beam\n",
"out_folder = \"/gpfs/exfel/data/scratch/karnem/test_bla4/\" # output folder\n",
"use_existing = \"\" # If not empty, constants stored in given folder will be used\n",
- "cal_db_interface = \"tcp://max-exfl016:8016\" # the database interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8016\" # the database interface to use\n",
"cal_db_timeout = 180000 # timeout on caldb requests\",\n",
"plot_range = 3 # range for plotting in units of median absolute deviations\n",
"spShape = [256, 64] # Shape of superpixel\n",
diff --git a/notebooks/pnCCD/Characterize_pnCCD_Dark_NBC.ipynb b/notebooks/pnCCD/Characterize_pnCCD_Dark_NBC.ipynb
index 1f01b0aa0..f6ef23f64 100644
--- a/notebooks/pnCCD/Characterize_pnCCD_Dark_NBC.ipynb
+++ b/notebooks/pnCCD/Characterize_pnCCD_Dark_NBC.ipynb
@@ -39,7 +39,7 @@
"\n",
"# Database access parameters.\n",
"use_dir_creation_date = True # use dir creation date as data production reference date\n",
- "cal_db_interface = \"tcp://max-exfl016:8021\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8021\" # calibration DB interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"db_output = False # if True, the notebook sends dark constants to the calibration database\n",
"local_output = True # if True, the notebook saves dark constants locally\n",
diff --git a/notebooks/pnCCD/Characterize_pnCCD_Gain.ipynb b/notebooks/pnCCD/Characterize_pnCCD_Gain.ipynb
index 637f1766c..1e6359744 100644
--- a/notebooks/pnCCD/Characterize_pnCCD_Gain.ipynb
+++ b/notebooks/pnCCD/Characterize_pnCCD_Gain.ipynb
@@ -52,7 +52,7 @@
"db_output = False # if True, the notebook injects dark constants into the calibration database\n",
"local_output = True # if True, the notebook saves dark constants locally\n",
"\n",
- "cal_db_interface = \"tcp://max-exfl016:8015\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015\" # calibration DB interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC.00 e.g. 2019-07-04 11:02:41.00\n",
"\n",
diff --git a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
index 7cefbcab7..3306fa388 100644
--- a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
+++ b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb
@@ -46,7 +46,7 @@
"photon_energy = 1.6 # Al fluorescence in keV\n",
"\n",
"# Parameters for the calibration database.\n",
- "cal_db_interface = \"tcp://max-exfl016:8015\" # calibration DB interface to use\n",
+ "cal_db_interface = \"tcp://max-exfl-cal001:8015\" # calibration DB interface to use\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"creation_time = \"\" # The timestamp to use with Calibration DB. Required Format: \"YYYY-MM-DD hh:mm:ss\" e.g. 2019-07-04 11:02:41\n",
"remove_bias_voltage_if_zero = True # This flag enables removing bias voltage from the conditions if a 0 value is read from RAW data. This is useful when the corresponding constants for old RAW had no bias voltage because of a mistake in control data. e.g. p002857\n",
diff --git a/reportservice/README.md b/reportservice/README.md
index ccf7f91ba..b0a3d83d2 100644
--- a/reportservice/README.md
+++ b/reportservice/README.md
@@ -34,7 +34,7 @@ The available command line arguments are:
Modes:
-*prod* is the production mode working on the max-exfl016 as xcal user for generating the DC report through RTD
+*prod* is the production mode working on the max-exfl-cal001 as xcal user for generating the DC report through RTD
and it should generate a very generalized DC report for the available detectors with information useful for most of the detector experts and users.
*local* is the mode used for generating figures locally without uploading the DC report on RTD or pushing figures
diff --git a/reportservice/report_conf.yaml b/reportservice/report_conf.yaml
index aa6a59202..9c517865c 100644
--- a/reportservice/report_conf.yaml
+++ b/reportservice/report_conf.yaml
@@ -2,7 +2,7 @@ GLOBAL:
git:
repo-local: "/gpfs/exfel/data/scratch/xcal/calibration/DetectorCharacterization/"
figures-remote: "http://git@git.xfel.eu/gitlab/detectors/DetectorCharacterization.git"
- server-port: "tcp://max-exfl016:5566"
+ server-port: "tcp://max-exfl-cal001:5566"
run-on:
- Monday 08:30:00 UTC
@@ -69,7 +69,7 @@ SPB:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
JUNGFRAU:
det-type:
@@ -138,7 +138,7 @@ SPB:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
MID:
AGIPD1M2:
@@ -194,7 +194,7 @@ MID:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
EPIX:
det-type:
@@ -236,7 +236,7 @@ MID:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
FXE:
@@ -287,7 +287,7 @@ FXE:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
JUNGFRAU:
det-type:
@@ -353,7 +353,7 @@ FXE:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
DETLAB:
FASTCCD:
@@ -415,7 +415,7 @@ DETLAB:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
SCS:
@@ -478,7 +478,7 @@ SCS:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
SQS:
PNCCD:
@@ -529,7 +529,7 @@ SQS:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
HED:
EPIX:
@@ -572,7 +572,7 @@ HED:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
JUNGFRAU:
det-type:
@@ -637,4 +637,4 @@ HED:
use-existing: "''"
out-folder: "/gpfs/exfel/data/scratch/xcal/report_service/tmp/{instrument}/{detector}/"
cal-db-timeout: 180000
- cal-db-interface: "tcp://max-exfl016:8015#8025"
+ cal-db-interface: "tcp://max-exfl-cal001:8015#8025"
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index 011905554..038ca342b 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -1411,10 +1411,10 @@ class AgipdCorrections:
* tcp://host:port_low#port_high to specify a port range from
which a random port will be picked. E.g. specifying
- tcp://max-exfl016:8015#8025
+ tcp://max-exfl-cal001:8015#8025
- will randomly pick an address in the range max-exfl016:8015 and
- max-exfl016:8025.
+ will randomly pick an address in the range max-exfl-cal001:8015 and
+ max-exfl-cal001:8025.
The latter notation allows for load-balancing.
diff --git a/src/cal_tools/lpdlib.py b/src/cal_tools/lpdlib.py
index e9635cab1..b61652b33 100644
--- a/src/cal_tools/lpdlib.py
+++ b/src/cal_tools/lpdlib.py
@@ -590,10 +590,10 @@ class LpdCorrections:
* tcp://host:port_low#port_high to specify a port range from
which a random port will be picked. E.g. specifying
- tcp://max-exfl016:8015#8025
+ tcp://max-exfl-cal001:8015#8025
- will randomly pick an address in the range max-exfl016:8015 and
- max-exfl016:8025.
+ will randomly pick an address in the range max-exfl-cal001:8015 and
+ max-exfl-cal001:8025.
The latter notation allows for load-balancing.
diff --git a/src/cal_tools/tools.py b/src/cal_tools/tools.py
index 314e2084d..88ab28d1e 100644
--- a/src/cal_tools/tools.py
+++ b/src/cal_tools/tools.py
@@ -477,7 +477,7 @@ def get_pdu_from_db(karabo_id: str, karabo_da: Union[str, list],
intialize CalibrationConstantMetadata class.
:param condition: Detector condition object to
intialize CalibrationConstantMetadata class.
- :param cal_db_interface: Interface string, e.g. "tcp://max-exfl016:8015".
+ :param cal_db_interface: Interface string, e.g. "tcp://max-exfl-cal001:8015".
:param snapshot_at: Database snapshot.
:param timeout: Calibration Database timeout.
:return: List of physical detector units (db_modules)
@@ -557,7 +557,7 @@ def get_from_db(karabo_id: str, karabo_da: str,
:param constant: Calibration constant known for given detector.
:param condition: Calibration condition.
:param empty_constant: Constant to be returned in case of failure.
- :param cal_db_interface: Interface string, e.g. "tcp://max-exfl016:8015"
+ :param cal_db_interface: Interface string, e.g. "tcp://max-exfl-cal001:8015"
:param creation_time: Latest time for constant to be created.
:param verbosity: Level of verbosity (0 - silent)
:param timeout: Timeout for zmq request
@@ -669,7 +669,7 @@ def send_to_db(db_module: str, karabo_id: str, constant, condition,
:param file_loc: Location of raw data.
:param report_path: xfel-calbrate report path to inject along with
the calibration constant versions to the database.
- :param cal_db_interface: Interface string, e.g. "tcp://max-exfl016:8015"
+ :param cal_db_interface: Interface string, e.g. "tcp://max-exfl-cal001:8015"
:param creation_time: Latest time for constant to be created
:param timeout: Timeout for zmq request
:param ntries: number of tries to contact the database,
diff --git a/tests/test_update_config.py b/tests/test_update_config.py
index 32588b239..6e319f679 100644
--- a/tests/test_update_config.py
+++ b/tests/test_update_config.py
@@ -127,7 +127,7 @@ args_1 = {
"cycle": 000000,
"correct": True,
"apply": False,
- "webservice_port": "tcp://max-exfl016:5555",
+ "webservice_port": "tcp://max-exfl-cal001:5555",
"instrument": None,
"force_hg_if_below": None,
"rel_gain": True,
diff --git a/webservice/config/serve_overview.yaml b/webservice/config/serve_overview.yaml
index 6dfc314c1..2da8f8cbc 100644
--- a/webservice/config/serve_overview.yaml
+++ b/webservice/config/serve_overview.yaml
@@ -21,7 +21,7 @@ run-candidates:
server-config:
port: 8008
- host: max-exfl016.desy.de
+ host: max-exfl-cal001.desy.de
dark-timeout: 30
n-calib: 10
diff --git a/webservice/config/webservice.yaml b/webservice/config/webservice.yaml
index 78b13b614..2ed4d41f9 100644
--- a/webservice/config/webservice.yaml
+++ b/webservice/config/webservice.yaml
@@ -52,7 +52,7 @@ correct:
--slurm-name {action}_{instrument}_{detector}_{cycle}_p{proposal}_{runs}
--report-to /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/usr/Reports/{runs}/{det_instance}_{action}_{proposal}_{runs}_{time_stamp}
--cal-db-timeout 300000
- --cal-db-interface tcp://max-exfl016:8015#8044
+ --cal-db-interface tcp://max-exfl-cal001:8015#8044
dark:
in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw
@@ -67,5 +67,5 @@ dark:
--request-time {request_time}
--slurm-name {action}_{instrument}_{detector}_{cycle}_p{proposal}_{runs}
--report-to /gpfs/exfel/d/cal/caldb_store/xfel/reports/{instrument}/{det_instance}/{action}/{action}_{proposal}_{runs}_{time_stamp}
- --cal-db-interface tcp://max-exfl016:8015#8044
+ --cal-db-interface tcp://max-exfl-cal001:8015#8044
--db-output
diff --git a/webservice/manual_launch.py b/webservice/manual_launch.py
index 154e190b6..18078b1ca 100644
--- a/webservice/manual_launch.py
+++ b/webservice/manual_launch.py
@@ -212,7 +212,7 @@ def main(
)
con = zmq.Context()
socket = con.socket(zmq.REQ)
- con = socket.connect("tcp://max-exfl016:5555")
+ con = socket.connect("tcp://max-exfl-cal001:5555")
if not really:
# Fake socket for testing, just logs what would have been sent via ZMQ
diff --git a/webservice/request_darks.py b/webservice/request_darks.py
index b9847f1b4..cbc739c17 100644
--- a/webservice/request_darks.py
+++ b/webservice/request_darks.py
@@ -35,7 +35,7 @@ args = vars(parser.parse_args())
con = zmq.Context()
socket = con.socket(zmq.REQ)
-con = socket.connect("tcp://max-exfl016:5555")
+con = socket.connect("tcp://max-exfl-cal001:5555")
uuid = str(datetime.now().timestamp().as_integer_ratio()[0])
diff --git a/webservice/request_repeat.py b/webservice/request_repeat.py
index db1d77a02..69f5507e0 100644
--- a/webservice/request_repeat.py
+++ b/webservice/request_repeat.py
@@ -13,7 +13,7 @@ parser = argparse.ArgumentParser(description='Request repeat correction.')
parser.add_argument('proposal', type=int, help='The proposal number')
parser.add_argument('run', type=int, help='The run number')
parser.add_argument('--mymdc-id', type=int, default=0, help="Run ID in myMdC")
-parser.add_argument('--endpoint', default='tcp://max-exfl016:5555',
+parser.add_argument('--endpoint', default='tcp://max-exfl-cal001:5555',
help="The ZMQ endpoint to connect to (max-exfl-cal-002 for testing)")
args = parser.parse_args()
diff --git a/webservice/update_config.py b/webservice/update_config.py
index cef206fe5..09a956738 100755
--- a/webservice/update_config.py
+++ b/webservice/update_config.py
@@ -104,7 +104,7 @@ parser.add_argument(
parser.add_argument(
'--webservice-address',
type=str,
- default="tcp://max-exfl016:5555",
+ default="tcp://max-exfl-cal001:5555",
help=('The port of the webservice to update '
'calibration configurations repository.')
)
--
GitLab