From 6e1cb7611d87136cce418575a2c1b69b735cdd13 Mon Sep 17 00:00:00 2001
From: Steffen Hauf <haufs@max-exfl015.desy.de>
Date: Wed, 8 Aug 2018 14:11:53 +0200
Subject: [PATCH] Explicitely install caltools
---
requirements.txt | 1 +
xfel_calibrate/calibrate.py | 13 +++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 5446d9494..c6a6e3ff7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,5 @@ astcheck
astsearch
influxdb
tabulate
+./cal_tools
.
diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index 5ff33c173..67e79a995 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -291,10 +291,11 @@ def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None,
output = check_output(srun_base).decode('utf8')
jobid = None
- for line in output.split("\n"):
- if "Submitted batch job " in line:
- jobid = line.split(" ")[3]
- print("Submitted job: {}".format(jobid))
+ if not sequential:
+ for line in output.split("\n"):
+ if "Submitted batch job " in line:
+ jobid = line.split(" ")[3]
+ print("Submitted job: {}".format(jobid))
return jobid
@@ -450,8 +451,8 @@ def run():
joblist.append(jobid)
-
- print("Submitted the following SLURM jobs: {}".format(",".join(joblist)))
+ if not all([j is None for j in joblist]):
+ print("Submitted the following SLURM jobs: {}".format(",".join(joblist)))
if __name__ == "__main__":
--
GitLab