From 3950b2bf0a63dbc6db01c17506e0950a8d9789ea Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Thu, 16 Jan 2020 11:28:28 +0100
Subject: [PATCH] add cycle and all runs
---
webservice/webservice.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/webservice/webservice.py b/webservice/webservice.py
index e11827770..123f0bc33 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -691,9 +691,9 @@ async def server_runner(config, mode):
cmd = ["python", "-m", "xfel_calibrate.calibrate",
detector, "DARK", '--priority', priority,
'--slurm-scheduling', str(config[action]['sched-prio']), # noqa
- '--slurm-name',
- '{}_{}_{}_p{:06d}_r{:04d}'.format(action,
- instrument, detector, proposal, runnr)]
+ '--slurm-name', '{}_{}_{}_{}_p{}_r{}'
+ .format(action, instrument, detector, cycle,
+ proposal, "_r".join(wait_runs))]
# Avoid giving a reservation parameter after the
# ITDM changes for giving xcal high priority by default
@@ -763,8 +763,10 @@ async def server_runner(config, mode):
cmd = ["python", "-m", "xfel_calibrate.calibrate",
detector, "CORRECT", '--slurm-scheduling',
str(config[action]['sched-prio']), '--slurm-name',
- '{}_{}_{}_{}_{}'.format(action, instrument,
- detector, proposal, runnr)]
+ '{}_{}_{}_{}_p{}_r{}'.format(action, instrument,
+ detector, cycle,
+ proposal,
+ "_r".join(wait_runs))]
cmd = await parse_config(cmd, dconfig)
--
GitLab