diff --git a/requirements.txt b/requirements.txt index 5446d9494503f00d6002276b67cd20e5de47ecec..c6a6e3ff763da9e6dfacbaa704cf5cdaedc658ee 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 5ff33c17338c78d8ca865fb2ad3276a7f742397e..67e79a995a1c52f1dafb1ae5cbee95ca0df2d58d 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__":