From a7407658070d46a0a78a0ae0b9208a95cdeb378c Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Thu, 22 Apr 2021 16:53:13 +0200
Subject: [PATCH] add cal_db_interactive tag
---
.../Inject_calibration_constants_from_h5files.ipynb | 4 ++--
setup.py | 2 +-
src/cal_tools/tools.py | 12 +++++-------
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/notebooks/LPD/Inject_calibration_constants_from_h5files.ipynb b/notebooks/LPD/Inject_calibration_constants_from_h5files.ipynb
index 2da696d06..6bbbeccf6 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-exfl017:8015#8045\" # calibration DB zmq address.\n",
+ "cal_db_interface = \"tcp://max-exfl016:8015#8045\" # calibration DB zmq address.\n",
"\n",
"# calibration constant conditions:\n",
"memory_cells = 512 # Number of memory cells. Used for constant conditions.\n",
@@ -79,7 +79,7 @@
"file_loc = \"\"\n",
"if proposal:\n",
" file_loc += f\"proposal:{proposal}\"\n",
- "if runs[0] == \"\":\n",
+ "if runs[0] != \"\":\n",
" file_loc += f\"runs: {runs}\"\n",
"\n",
"if file_loc == \"\":\n",
diff --git a/setup.py b/setup.py
index 6a66076cb..d24f4d4ef 100644
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ setup(
},
ext_modules=cythonize(ext_modules),
install_requires=[
- "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.0.5", # noqa
+ "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.0.7-test", # noqa
"nbparameterise @ git+ssh://git@git.xfel.eu:10022/detectors/nbparameterise.git@0.3", # noqa
"XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.5.6-2.10.0#subdirectory=lib", # noqa
"Cython==0.29.21",
diff --git a/src/cal_tools/tools.py b/src/cal_tools/tools.py
index 902116072..f8cd5279a 100644
--- a/src/cal_tools/tools.py
+++ b/src/cal_tools/tools.py
@@ -562,8 +562,6 @@ def get_from_db(karabo_id: str, karabo_da: str,
else:
return empty_constant, None
-already_printed = []
-
def send_to_db(db_module: str, karabo_id: str, constant, condition,
file_loc: str, report_path: str, cal_db_interface: str,
@@ -642,11 +640,11 @@ def send_to_db(db_module: str, karabo_id: str, constant, condition,
raise RuntimeError(f'{e}')
if success:
- if constant.name not in already_printed:
- print(
- f"{constant.name} is injected with creation-time: "
- f"{metadata.calibration_constant_version.begin_at}."
- )
+ print(
+ f"{constant.name} for {db_module} "
+ "is injected with creation-time: "
+ f"{metadata.calibration_constant_version.begin_at}."
+ )
return metadata
--
GitLab