diff --git a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb index ecf2ee82356ac4476d0781484a34fac17d64113f..a63b7ec0b6b60a1df504909b95a092d8c1445176 100644 --- a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb +++ b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb @@ -206,7 +206,8 @@ " if mod not in noise_map:\n", " if not manual_slow_data:\n", " run_path = h5path_run.format(karabo_id_control, receiver_control_id)\n", - " with h5py.File(fp_path.format(0), 'r') as f:\n", + " filename = fp_path.format(0)\n", + " with h5py.File(filename, 'r') as f:\n", " integration_time = float(f[f'{run_path}/exposureTime/value'][()]*1e6)\n", " bias_voltage = int(np.squeeze(f[f'{run_path}/vHighVoltage/value'])[0])\n", " if r_n == run_high:\n", @@ -215,7 +216,7 @@ " except KeyError:\n", " print(\n", " \"ERROR: gain_setting is not available for h5 ctrl path \"\n", - " f\"/RUN/{karabo_id_control}/DET/CONTROL/settings/value,\\nfor file: {fp_path}. \\n\"\n", + " f\"/RUN/{karabo_id_control}/DET/CONTROL/settings/value,\\nfor file: {filename}. \\n\"\n", " \"WARNING: Setting gain_setting to 0, assuming that this is an old run.\\n\")\n", " gain_s = \"KeyError\"\n", " gain_setting = 1 if gain_s == \"dynamichg0\" else 0\n", diff --git a/src/xfel_calibrate/calibrate.py b/src/xfel_calibrate/calibrate.py index 64b2a5806c560e991bfabc88f40160088ca6ba94..cd6b2408409ca436fd06f04c1bed98e4fb93aa57 100755 --- a/src/xfel_calibrate/calibrate.py +++ b/src/xfel_calibrate/calibrate.py @@ -717,7 +717,7 @@ class SlurmOptions: launcher_slurm += ["--job-name", self.job_name] if self.nice: - launcher_slurm += ["--nice", str(self.nice)] + launcher_slurm.append(f"--nice={self.nice}") if self.mem: launcher_slurm.append(f"--mem={self.mem}G") diff --git a/webservice/webservice.py b/webservice/webservice.py index 4b26e03b961875ddfb2c2518e906a56addd60b00..6bbeeeeef7db847c59b15030f576c176387e8d29 100644 --- a/webservice/webservice.py +++ b/webservice/webservice.py @@ -513,13 +513,22 @@ async def run_action(job_db, cmd, mode, proposal, run, rid) -> str: rstr = stdout.decode() for r in rstr.split("\n"): - if "Submitted job:" in r: - _, jobid = r.split(":") - c.execute( - "INSERT INTO jobs VALUES (?, ?, ?, ?, 'PD', ?, ?, ?)", - (rid, jobid.strip(), proposal, run, - datetime.now().isoformat(), cmd[3], cmd[4]) - ) + if "Submitted the following SLURM jobs:" in r: + _, jobids = r.split(":") + + jobs = [] + for jobid in jobids.split(','): + jobs.append((rid, + jobid.strip(), + proposal, + run, + datetime.now().isoformat(), + cmd[3], + cmd[4]) + ) + c.executemany( + "INSERT INTO jobs VALUES (?, ?, ?, ?, 'PD', ?, ?, ?)", + jobs) job_db.commit() else: # mode == "sim"