From 5af870597157d8c1107799d3e63e58631b8c28b3 Mon Sep 17 00:00:00 2001
From: karnem <mikhail.karnevskiy@desy.de>
Date: Wed, 17 Jul 2019 14:47:39 +0200
Subject: [PATCH] Refactoring
---
notebooks/LPD/LPDChar_Darks_NBC.ipynb | 2 +-
xfel_calibrate/calibrate.py | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index 960adc960..1b5e98f29 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -474,7 +474,7 @@
" else:\n",
" metadata.calibration_constant_version = Versions.Timespan(device=device,\n",
" start=creation_time)\n",
- " # metadata.send(cal_db_interface)\n",
+ " metadata.send(cal_db_interface)\n",
" msg = 'Const {} for module {} was injected to the calibration DB. Begin at: {}'\n",
" print(msg.format(const, qm,\n",
" metadata.calibration_constant_version.begin_at))"
diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index d1353b09e..1ff9d9a45 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -391,7 +391,8 @@ def set_figure_format(nb, enable_vector_format):
def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None,
final_job=False, job_list=[], fmtcmd="", cluster_cores=8,
- sequential=False, priority=2, dependent=False):
+ sequential=False, priority=2, dependent=False,
+ show_title=True):
""" Launch a concurrent job on the cluster via SLURM
"""
@@ -407,7 +408,7 @@ def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None,
parms = extract_parameters(nb)
params = parameter_values(parms, **args)
new_nb = replace_definitions(nb, params, execute=False)
- if len(job_list) > 0 and not final_job:
+ if not show_title:
first_markdown_cell(new_nb).source = ''
set_figure_format(new_nb, args["vector_figs"])
base_name = nbname.replace(".ipynb", "")
@@ -742,6 +743,7 @@ def run():
break
for cnum, cval in enumerate(cvals):
+ show_title = cnum == 0
# Job is not final if there are dependent notebooks
jobid = concurrent_run(run_tmp_path, nb, notebook, args,
cvar, [cval, ] if not isinstance(
@@ -749,7 +751,8 @@ def run():
cnum == len(list(cvals)) -
1 and len(dep_notebooks) == 0,
joblist, fmtcmd,
- cluster_cores=cluster_cores, sequential=sequential, priority=priority)
+ cluster_cores=cluster_cores, sequential=sequential, priority=priority,
+ show_title=show_title)
joblist.append(jobid)
--
GitLab