From 10d626cd6fb63a0c96e07d72853e7a9d3202447a Mon Sep 17 00:00:00 2001 From: ahmedk <karim.ahmed@xfel.eu> Date: Wed, 9 Aug 2023 13:21:07 +0200 Subject: [PATCH] assign runs separatly --- webservice/webservice.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webservice/webservice.py b/webservice/webservice.py index 5786d1821..d0948d89b 100644 --- a/webservice/webservice.py +++ b/webservice/webservice.py @@ -1460,12 +1460,13 @@ class ActionsServer: for karabo_id, dconfig in detectors.items(): detector = dconfig['detector-type'] del dconfig['detector-type'] - reports_folder=self.config[action]['reports-folder'].format( + runs = "_".join([f"r{int(r):04d}" for r in run_nrs]) + reports_folder = self.config[action]['reports-folder'].format( action=action, instrument=instrument, cycle=cycle, proposal=proposal, - runs="_".join([f"r{int(r):04d}" for r in run_nrs]), + runs=runs, det_instance=karabo_id, ) cmd = self.config[action]['cmd'].format( @@ -1474,7 +1475,7 @@ class ActionsServer: partition=partition, action=action, instrument=instrument, cycle=cycle, proposal=proposal, - runs="_".join([f"r{int(r):04d}" for r in run_nrs]), + runs=runs, report_folder=reports_folder, time_stamp=request_time.strftime('%y%m%d_%H%M%S_%f'), det_instance=karabo_id, -- GitLab