Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycalibration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
calibration
pycalibration
Commits
da929a31
Commit
da929a31
authored
2 years ago
by
Karim Ahmed
Browse files
Options
Downloads
Patches
Plain Diff
add new cal_db_interactive tag and fix docstring
parent
94498395
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!619
Feat: Expose the CCV `variant` to cal_tools sending and retrieving and expose it in agipdlib
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
setup.py
+1
-1
1 addition, 1 deletion
setup.py
src/cal_tools/tools.py
+4
-4
4 additions, 4 deletions
src/cal_tools/tools.py
with
5 additions
and
5 deletions
setup.py
+
1
−
1
View file @
da929a31
...
@@ -94,7 +94,7 @@ install_requires = [
...
@@ -94,7 +94,7 @@ install_requires = [
if
"
readthedocs.org
"
not
in
sys
.
executable
:
if
"
readthedocs.org
"
not
in
sys
.
executable
:
install_requires
+=
[
install_requires
+=
[
"
iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@
feat/ccv_tag
"
,
# noqa
"
iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@
2.2.0
"
,
# noqa
"
XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0
"
,
# noqa
"
XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0
"
,
# noqa
]
]
...
...
This diff is collapsed.
Click to expand it.
src/cal_tools/tools.py
+
4
−
4
View file @
da929a31
...
@@ -636,16 +636,16 @@ def send_to_db(db_module: str, karabo_id: str, constant, condition,
...
@@ -636,16 +636,16 @@ def send_to_db(db_module: str, karabo_id: str, constant, condition,
:param condition: Calibration condition
:param condition: Calibration condition
:param file_loc: Location of raw data.
:param file_loc: Location of raw data.
:param report_path: xfel-calbrate report path to inject along with
:param report_path: xfel-calbrate report path to inject along with
the calibration constant versions to the database.
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-exfl016:8015
"
:param creation_time: Latest time for constant to be created
:param creation_time: Latest time for constant to be created
:param timeout: Timeout for zmq request
:param timeout: Timeout for zmq request
:param ntries: number of tries to contact the database,
:param ntries: number of tries to contact the database,
ntries is set to 7 so that if the timeout started
ntries is set to 7 so that if the timeout started
at 30s last timeout will be ~ 1h.
at 30s last timeout will be ~ 1h.
:param doraise: if True raise errors during communication with DB
:param doraise: if True raise errors during communication with DB
:param variant: A calibration constant version variant attribute
:param variant: A calibration constant version variant attribute
for the constant file.
for the constant file.
"""
"""
success
=
False
success
=
False
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment