diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py index 2a419cff47b3a927b1d149b407d4eb16acb8399a..1dddaed242ffae399c4f6d387278e103fdc83b7d 100755 --- a/xfel_calibrate/calibrate.py +++ b/xfel_calibrate/calibrate.py @@ -642,6 +642,7 @@ def run(): break for cnum, cval in enumerate(cvals): + # Job is not final if there are dependent notebooks jobid = concurrent_run(run_tmp_path, nb, notebook, args, cvar, [cval, ] if not isinstance( cval, list) and cvtype is list else cval, @@ -658,9 +659,10 @@ def run(): "{}/{}".format(os.path.dirname(__file__), notebook)) with open(notebook_path, "r") as f: nb = nbformat.read(f, as_version=4) + final_job = i == len(dep_notebooks) - 1 jobid = concurrent_run(run_tmp_path, nb, os.path.basename(notebook), args, - final_job=i==len(dep_notebooks)-1, + final_job=final_job, job_list=joblist, fmtcmd=fmtcmd, cluster_cores=cluster_cores, sequential=sequential, priority=priority,