Skip to content
Snippets Groups Projects
Commit 6ce9d212 authored by Cyril Danilevski's avatar Cyril Danilevski :scooter:
Browse files

Merge branch 'fix/reprod' into 'master'

[Reproducibility] Update report_to argument in repeat.py

See merge request detectors/pycalibration!718
parents e99b8b53 b1aa7548
No related branches found
No related tags found
1 merge request!718[Reproducibility] Update report_to argument in repeat.py
...@@ -139,7 +139,7 @@ def main(argv=None): ...@@ -139,7 +139,7 @@ def main(argv=None):
params_to_set['out_folder'] = out_folder params_to_set['out_folder'] = out_folder
update_notebooks_params(working_dir, params_to_set) update_notebooks_params(working_dir, params_to_set)
if args.report_path: if args.report_to:
report_to = args.report_to report_to = args.report_to
else: # Default to saving report in output folder else: # Default to saving report in output folder
report_to = str(Path(out_folder, f'xfel-calibrate-repeat-{run_uuid}')) report_to = str(Path(out_folder, f'xfel-calibrate-repeat-{run_uuid}'))
......
...@@ -39,5 +39,6 @@ class Success: ...@@ -39,5 +39,6 @@ class Success:
START_CORRECTION_SIM = "SUCCESS: Simulated, not submitting jobs. Would do correction: proposal {}, run {}" START_CORRECTION_SIM = "SUCCESS: Simulated, not submitting jobs. Would do correction: proposal {}, run {}"
START_CHAR_SIM = "SUCCESS: Simulated, not submitting jobs. Would do dark characterization: proposal {}, run {}" START_CHAR_SIM = "SUCCESS: Simulated, not submitting jobs. Would do dark characterization: proposal {}, run {}"
QUEUED = "SUCCESS: Queued proposal {}, run {} for offline calibration" QUEUED = "SUCCESS: Queued proposal {}, run {} for offline calibration"
REPROD_QUEUED = "SUCCESS: Queued proposal {}, run {} for reproducing previous offline calibration"
DONE_CORRECTION = "SUCCESS: Finished correction: proposal {}. run {}" DONE_CORRECTION = "SUCCESS: Finished correction: proposal {}. run {}"
DONE_CHAR = "SUCCESS: Finished dark characterization: proposal {}, run {}" DONE_CHAR = "SUCCESS: Finished dark characterization: proposal {}, run {}"
...@@ -1037,7 +1037,7 @@ class ActionsServer: ...@@ -1037,7 +1037,7 @@ class ActionsServer:
) )
return msg.encode() return msg.encode()
queued_msg = Success.QUEUED.format(proposal, [runnr]) queued_msg = Success.REPROD_QUEUED.format(proposal, [runnr])
logging.debug(queued_msg) logging.debug(queued_msg)
async def _continue(): async def _continue():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment