From 51b008220864cf4cee81cb4f5c2b50b664617488 Mon Sep 17 00:00:00 2001
From: karnem <mikhail.karnevskiy@desy.de>
Date: Thu, 28 Nov 2019 14:45:56 +0100
Subject: [PATCH] Move report related part to xfel_calibrate
---
cal_tools/cal_tools/tools.py | 344 +----------------
cal_tools/setup.py | 1 -
setup.py | 3 +-
xfel_calibrate/calibrate.py | 8 +-
xfel_calibrate/finalize.py | 345 ++++++++++++++++++
.../titlepage.tmpl | 0
.../cal_tools => xfel_calibrate}/xfel.pdf | Bin
7 files changed, 353 insertions(+), 348 deletions(-)
create mode 100644 xfel_calibrate/finalize.py
rename {cal_tools/cal_tools => xfel_calibrate}/titlepage.tmpl (100%)
rename {cal_tools/cal_tools => xfel_calibrate}/xfel.pdf (100%)
diff --git a/cal_tools/cal_tools/tools.py b/cal_tools/cal_tools/tools.py
index d1912490b..2943381d8 100644
--- a/cal_tools/cal_tools/tools.py
+++ b/cal_tools/cal_tools/tools.py
@@ -1,15 +1,11 @@
from collections import OrderedDict
import datetime
from glob import glob
-from importlib.machinery import SourceFileLoader
import json
-from os import chdir, environ, listdir, makedirs, path, remove, stat
-from os.path import isdir, isfile, splitext
+from os import environ, listdir, path, stat
+from os.path import isfile, splitext
from queue import Queue
import re
-from shutil import copy, copytree, move, rmtree
-from subprocess import CalledProcessError, check_call, check_output
-from textwrap import dedent
from time import sleep
from urllib.parse import urljoin
@@ -20,318 +16,9 @@ from metadata_client.metadata_client import MetadataClient
from notebook.notebookapp import list_running_servers
import numpy as np
import requests
-import tabulate
-from jinja2 import Template
from .mdc_config import MDC_config
from .ana_tools import save_dict_to_hdf5
-from xfel_calibrate import settings
-
-
-def atoi(text):
- """
- Convert string to integer is possible
-
- :param text: string to be converted
- :return: integer value or input string
- """
-
- return int(text) if text.isdigit() else text
-
-
-def natural_keys(text):
- """
- Decompose string to list of integers and sub-strings
- """
- return [atoi(c) for c in re.split(r'(\d+)', text)]
-
-
-def combine_report(run_path, calibration):
- sphinx_path = "{}/sphinx_rep".format(path.abspath(run_path))
- makedirs(sphinx_path)
- direntries = listdir(run_path)
- direntries.sort(key=natural_keys)
-
- for entry in direntries:
-
- if isfile("{}/{}".format(run_path, entry)):
- name, ext = splitext("{}".format(entry))
-
- if ext == ".rst":
- comps = name.split("__")
- if len(comps) >= 3:
- group, name_param, conc_param = "_".join(comps[:-2]), \
- comps[-2], comps[-1]
- else:
- group, name_param, conc_param = comps[0], "None", "None"
-
- with open("{}/{}.rst".format(sphinx_path, group),
- "a") as gfile:
- if conc_param != "None":
- title = "{}, {} = {}".format(calibration, name_param,
- conc_param)
- gfile.write(title + "\n")
- gfile.write("=" * len(title) + "\n")
- gfile.write("\n")
- with open("{}/{}".format(run_path, entry), "r") as ifile:
- skip_next = False
- for line in ifile.readlines():
- if skip_next:
- skip_next = False
- continue
- if conc_param == "None":
- gfile.write(line)
- elif " ".join(calibration.split()) != " ".join(
- line.split()):
- gfile.write(line)
- else:
- skip_next = True
-
- gfile.write("\n\n")
- if isdir("{}/{}".format(run_path, entry)):
- copytree("{}/{}".format(run_path, entry),
- "{}/{}".format(sphinx_path, entry))
- return sphinx_path
-
-
-def prepare_plots(run_path, threshold=1000000):
- """
- Convert svg file to pdf or png to be used for latex
-
- Conversion of svg to vector graphics pdf is performed using svglib3.
- This procedure is CPU consuming. In order to speed up process
- large svg files are converted to png format.
-
- The links in the rst files are adapted accordingly to the
- converted image files.
-
- :param run_path: Run path of the slurm job
- :param threshold: Max svg file size (in bytes) to be converted to pdf
- """
- print('Convert svg to pdf and png')
- run_path = path.abspath(run_path)
-
- rst_files = glob('{}/*rst'.format(run_path))
- for rst_file in rst_files:
- rst_file_name = path.basename(rst_file)
- rst_file_name = path.splitext(rst_file_name)[0]
-
- svg_files = glob(
- '{}/{}_files/*svg'.format(run_path, rst_file_name))
- for f_path in svg_files:
- f_name = path.basename(f_path)
- f_name = path.splitext(f_name)[0]
-
- if (stat(f_path)).st_size < threshold:
- check_call(["svg2pdf", "{}".format(f_path)], shell=False)
- new_ext = 'pdf'
- else:
- check_call(["convert", "{}".format(f_path),
- "{}.png".format(f_name)], shell=False)
- new_ext = 'png'
-
- check_call(["sed",
- "-i",
- "s/{}.svg/{}.{}/g".format(f_name, f_name, new_ext),
- rst_file],
- shell=False)
-
-
-def make_timing_summary(run_path, joblist):
- """
- Create an rst file with timing summary of executed slurm jobs
-
- :param run_path: Run path of the slurm job
- :param joblist: List of slurm jobs
- """
- print('Prepare timing summary')
- run_path = path.abspath(run_path)
- pars_vals = []
- pars = 'JobID,Elapsed,Suspended'
- pars_name = pars.split(',')
-
- for job in joblist:
- out = check_output(['sacct', '-j', job,
- '--format={}'.format(pars)],
- shell=False)
- lines = str(out).split('\\n')
-
- # loop over output lines, skip first two lines with header.
- for line in lines[2:]:
- s = line.split()
- if len(s) == len(pars_name):
- pars_vals.append(s)
- break
-
- tmpl = Template('''
- Runtime summary
- ==============
-
- .. math::
- {% for line in table %}
- {{ line }}
- {%- endfor %}
- ''')
-
- with open("{}/timing_summary.rst".format(run_path), "w+") as gfile:
-
- if len(pars_vals) > 0:
- table = tabulate.tabulate(pars_vals, tablefmt='latex',
- headers=pars_name)
- gfile.write(dedent(tmpl.render(table=table.split('\n'))))
-
-
-def make_report(run_path, tmp_path, out_path, project, author, version,
- report_to):
- """
- Create calibration report (pdf file)
-
- Automatically generated report document results, produced by
- jupyter-notebooks.
-
- :param run_path: Path to sphinx run directory
- :param tmp_path: Run path of the slurm job
- :param out_path: Output directory for report.
- Overwritten if path to report is given in `report_to`
- :param project: Project title
- :param author: Author of the notebook
- :param version: Version of the notebook
- :param report_to: Name or path of the report file
- """
- run_path = path.abspath(run_path)
- report_path, report_name = path.split(report_to)
- if report_path != '':
- out_path = report_path
-
- try:
- check_call(["sphinx-quickstart",
- "--quiet",
- "--project='{}'".format(project),
- "--author='{}'".format(author),
- "-v", str(version),
- "--suffix=.rst",
- "--master=index",
- "--ext-intersphinx",
- "--ext-mathjax",
- "--makefile",
- "--no-batchfile", run_path])
-
- except CalledProcessError:
- raise Exception("Failed to run sphinx-quickbuild. Is sphinx installed?"
- "Generated simple index.rst instead")
-
- # quickbuild went well we need to edit the index.rst and conf.py files
- module_path = "{}".format(path.abspath(path.dirname(__file__)))
-
- conf = SourceFileLoader("conf",
- "{}/conf.py".format(run_path)).load_module()
- l_var = [v for v in dir(conf) if not v.startswith('__')]
-
- with open("{}/conf.py.tmp".format(run_path), "w") as mf:
- latex_elements = {'extraclassoptions': ',openany, oneside',
- 'preamble': r'\usepackage{longtable}',
- 'maketitle': r'\input{titlepage.tex.txt}'}
- mf.write("latex_elements = {}\n".format(latex_elements))
- mf.write("latex_logo = '{}/{}'\n".format(module_path,
- settings.logo_path))
- mf.write("latex_additional_files = ['titlepage.tex.txt']\n")
-
- for var in l_var:
- if var in ['latex_elements', 'latex_logo',
- 'latex_additional_files']:
- continue
- tmpl = '{} = {}\n'
- v = getattr(conf, var, None)
- if isinstance(v, str):
- tmpl = '{} = "{}"\n'
-
- # Set name of the latex document
- if var == 'latex_documents' and len(v[0]) > 1:
- v[0] = v[0][:1] + ('{}.tex'.format(report_name), ) + v[0][2:]
-
- mf.write(tmpl.format(var, v))
-
- remove("{}/conf.py".format(run_path))
- move("{}/conf.py.tmp".format(run_path), "{}/conf.py".format(run_path))
-
- direntries = listdir(run_path)
- files_to_handle = []
- for entry in direntries:
- if isfile("{}/{}".format(run_path, entry)):
- name, ext = splitext("{}".format(entry))
- if ext == ".rst" and "index" not in name:
- files_to_handle.append(name.strip())
-
- index_tmp = Template('''
- Calibration report
- ==================
-
- .. toctree::
- :maxdepth: 2
- {% for k in keys %}
- {{ k }}
- {%- endfor %}
- ''')
-
- with open("{}/index.rst".format(run_path), "w+") as mf:
- mf.write(dedent(index_tmp.render(keys=files_to_handle)))
-
- # finally call the make scripts
- chdir(run_path)
- try:
- check_call(["make", "latexpdf"])
-
- except CalledProcessError:
- print("Failed to make pdf documentation")
- print("Temp files will not be deleted and " +
- "can be inspected at: {}".format(run_path))
- return
- print("Moving report to final location: {}".format(out_path))
- copy('{}/_build/latex/{}.pdf'.format(run_path, report_name), out_path)
- print("Removing temporary files at: {}".format(tmp_path))
- rmtree(tmp_path)
-
-
-def make_titlepage(sphinx_path, project, data_path, version):
- """
- Create title page for report using template
-
- :param sphinx_path: path to sphinx run directory
- :param project: title of the project
- :param data_path: path to input data sample used for notebook
- :param version: Version of the pycalibration tool
- """
- module_path = "{}".format(path.abspath(path.dirname(__file__)))
- with open('{}/titlepage.tmpl'.format(module_path)) as file_:
- title_tmp = Template(file_.read())
-
- with open("{}/titlepage.tex.txt".format(sphinx_path), "w+") as mf:
- mf.write(dedent(title_tmp.render(project=tex_escape(project),
- data_path=tex_escape(data_path),
- version=tex_escape(version))))
-
-
-def finalize(joblist, finaljob, run_path, out_path, project, calibration,
- author, version, report_to, data_path='Unknown'):
- print("Waiting on jobs to finish: {}".format(joblist))
- while True:
- found_jobs = set()
- output = check_output(['squeue']).decode('utf8')
- for line in output.split("\n"):
- for job in joblist:
- if str(job) in line:
- found_jobs.add(job)
- if len(found_jobs) == 0:
- break
- sleep(10)
-
- prepare_plots(run_path)
- make_timing_summary(run_path, joblist + [str(finaljob)])
- sphinx_path = combine_report(run_path, calibration)
- make_titlepage(sphinx_path, project, data_path, version)
- make_report(sphinx_path, run_path, out_path, project, author, version,
- report_to)
-
def parse_runs(runs, return_type=str):
pruns = []
@@ -716,30 +403,3 @@ def get_constant_from_db_and_time(device, constant, condition, empty_constant,
return data, m.calibration_constant_version.begin_at
else:
return data, None
-
-
-def tex_escape(text):
- """
- Escape latex special characters found in the text
-
- :param text: a plain text message
- :return: the message escaped to appear correctly in LaTeX
- """
- conv = {
- '&': r'\&',
- '%': r'\%',
- '$': r'\$',
- '#': r'\#',
- '_': r'\_',
- '{': r'\{',
- '}': r'\}',
- '~': r'\textasciitilde{}',
- '^': r'\^{}',
- '\\': r'\textbackslash{}',
- '<': r'\textless{}',
- '>': r'\textgreater{}',
- }
-
- key_list = sorted(conv.keys(), key=lambda item: - len(item))
- regex = re.compile('|'.join(re.escape(str(key)) for key in key_list))
- return regex.sub(lambda match: conv[match.group()], text)
diff --git a/cal_tools/setup.py b/cal_tools/setup.py
index e1150aae3..37538c3bb 100644
--- a/cal_tools/setup.py
+++ b/cal_tools/setup.py
@@ -4,7 +4,6 @@ setup(
name='calTools',
version='0.1',
packages=['cal_tools',],
- package_data={'': ['titlepage.tmpl', 'xfel.pdf']},
url='',
license='(c) European XFEL GmbH',
author='Steffen Hauf',
diff --git a/setup.py b/setup.py
index 391d522db..ee79e5426 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,8 @@ setup(
'xfel_calibrate.notebooks': 'xfel_calibrate/notebooks',
},
package_data={
- 'xfel_calibrate': ['bin/*.sh']+data_files
+ 'xfel_calibrate': ['bin/*.sh'] + data_files + ['titlepage.tmpl',
+ 'xfel.pdf']
},
cmdclass={
diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index f1e7badbe..730283b95 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -21,7 +21,7 @@ from .notebooks import notebooks
from jinja2 import Template
import textwrap
-from cal_tools.tools import tex_escape
+from .finalize import tex_escape
# Add a class combining raw description formatting with
@@ -532,7 +532,7 @@ def get_launcher_command(args, temp_path, dependent, job_list):
srun_dep = "--dependency=afterok"
for jobid in job_list:
srun_dep += ":{}".format(jobid)
- launcher_slurm += [srun_dep]
+ launcher_slurm += srun_dep
return launcher_slurm.split()
@@ -775,8 +775,8 @@ def run():
out_path))
os.makedirs(out_path, exist_ok=True)
- cmd = ('"from cal_tools.tools import finalize; ' +
- 'finalize({{joblist}}, $1, \'{run_path}\', \'{out_path}\', ' +
+ cmd = ('"from xfel_calibrate import finalize; ' +
+ 'finalize.finalize({{joblist}}, $1, \'{run_path}\', \'{out_path}\', ' +
'\'{project}\', \'{calibration}\', \'{author}\', '
'\'{version}\', \'{report_to}\', \'{in_folder}\' )"')
diff --git a/xfel_calibrate/finalize.py b/xfel_calibrate/finalize.py
new file mode 100644
index 000000000..d37b83f6c
--- /dev/null
+++ b/xfel_calibrate/finalize.py
@@ -0,0 +1,345 @@
+from glob import glob
+from importlib.machinery import SourceFileLoader
+from os import chdir, listdir, makedirs, path, remove, stat
+from os.path import isdir, isfile, splitext
+import re
+from shutil import copy, copytree, move, rmtree
+from subprocess import CalledProcessError, check_call, check_output
+from textwrap import dedent
+from time import sleep
+
+import tabulate
+from jinja2 import Template
+
+from .settings import *
+
+def atoi(text):
+ """
+ Convert string to integer is possible
+
+ :param text: string to be converted
+ :return: integer value or input string
+ """
+
+ return int(text) if text.isdigit() else text
+
+
+def natural_keys(text):
+ """
+ Decompose string to list of integers and sub-strings
+ """
+ return [atoi(c) for c in re.split(r'(\d+)', text)]
+
+
+def combine_report(run_path, calibration):
+ sphinx_path = "{}/sphinx_rep".format(path.abspath(run_path))
+ makedirs(sphinx_path)
+ direntries = listdir(run_path)
+ direntries.sort(key=natural_keys)
+
+ for entry in direntries:
+
+ if isfile("{}/{}".format(run_path, entry)):
+ name, ext = splitext("{}".format(entry))
+
+ if ext == ".rst":
+ comps = name.split("__")
+ if len(comps) >= 3:
+ group, name_param, conc_param = "_".join(comps[:-2]), \
+ comps[-2], comps[-1]
+ else:
+ group, name_param, conc_param = comps[0], "None", "None"
+
+ with open("{}/{}.rst".format(sphinx_path, group),
+ "a") as gfile:
+ if conc_param != "None":
+ title = "{}, {} = {}".format(calibration, name_param,
+ conc_param)
+ gfile.write(title + "\n")
+ gfile.write("=" * len(title) + "\n")
+ gfile.write("\n")
+ with open("{}/{}".format(run_path, entry), "r") as ifile:
+ skip_next = False
+ for line in ifile.readlines():
+ if skip_next:
+ skip_next = False
+ continue
+ if conc_param == "None":
+ gfile.write(line)
+ elif " ".join(calibration.split()) != " ".join(
+ line.split()):
+ gfile.write(line)
+ else:
+ skip_next = True
+
+ gfile.write("\n\n")
+ if isdir("{}/{}".format(run_path, entry)):
+ copytree("{}/{}".format(run_path, entry),
+ "{}/{}".format(sphinx_path, entry))
+ return sphinx_path
+
+
+def prepare_plots(run_path, threshold=1000000):
+ """
+ Convert svg file to pdf or png to be used for latex
+
+ Conversion of svg to vector graphics pdf is performed using svglib3.
+ This procedure is CPU consuming. In order to speed up process
+ large svg files are converted to png format.
+
+ The links in the rst files are adapted accordingly to the
+ converted image files.
+
+ :param run_path: Run path of the slurm job
+ :param threshold: Max svg file size (in bytes) to be converted to pdf
+ """
+ print('Convert svg to pdf and png')
+ run_path = path.abspath(run_path)
+
+ rst_files = glob('{}/*rst'.format(run_path))
+ for rst_file in rst_files:
+ rst_file_name = path.basename(rst_file)
+ rst_file_name = path.splitext(rst_file_name)[0]
+
+ svg_files = glob(
+ '{}/{}_files/*svg'.format(run_path, rst_file_name))
+ for f_path in svg_files:
+ f_name = path.basename(f_path)
+ f_name = path.splitext(f_name)[0]
+
+ if (stat(f_path)).st_size < threshold:
+ check_call(["svg2pdf", "{}".format(f_path)], shell=False)
+ new_ext = 'pdf'
+ else:
+ check_call(["convert", "{}".format(f_path),
+ "{}.png".format(f_name)], shell=False)
+ new_ext = 'png'
+
+ check_call(["sed",
+ "-i",
+ "s/{}.svg/{}.{}/g".format(f_name, f_name, new_ext),
+ rst_file],
+ shell=False)
+
+
+def make_timing_summary(run_path, joblist):
+ """
+ Create an rst file with timing summary of executed slurm jobs
+
+ :param run_path: Run path of the slurm job
+ :param joblist: List of slurm jobs
+ """
+ print('Prepare timing summary')
+ run_path = path.abspath(run_path)
+ pars_vals = []
+ pars = 'JobID,Elapsed,Suspended'
+ pars_name = pars.split(',')
+
+ for job in joblist:
+ out = check_output(['sacct', '-j', job,
+ '--format={}'.format(pars)],
+ shell=False)
+ lines = str(out).split('\\n')
+
+ # loop over output lines, skip first two lines with header.
+ for line in lines[2:]:
+ s = line.split()
+ if len(s) == len(pars_name):
+ pars_vals.append(s)
+ break
+
+ tmpl = Template('''
+ Runtime summary
+ ==============
+
+ .. math::
+ {% for line in table %}
+ {{ line }}
+ {%- endfor %}
+ ''')
+
+ with open("{}/timing_summary.rst".format(run_path), "w+") as gfile:
+
+ if len(pars_vals) > 0:
+ table = tabulate.tabulate(pars_vals, tablefmt='latex',
+ headers=pars_name)
+ gfile.write(dedent(tmpl.render(table=table.split('\n'))))
+
+
+def make_report(run_path, tmp_path, out_path, project, author, version,
+ report_to):
+ """
+ Create calibration report (pdf file)
+
+ Automatically generated report document results, produced by
+ jupyter-notebooks.
+
+ :param run_path: Path to sphinx run directory
+ :param tmp_path: Run path of the slurm job
+ :param out_path: Output directory for report.
+ Overwritten if path to report is given in `report_to`
+ :param project: Project title
+ :param author: Author of the notebook
+ :param version: Version of the notebook
+ :param report_to: Name or path of the report file
+ """
+ run_path = path.abspath(run_path)
+ report_path, report_name = path.split(report_to)
+ if report_path != '':
+ out_path = report_path
+
+ try:
+ check_call(["sphinx-quickstart",
+ "--quiet",
+ "--project='{}'".format(project),
+ "--author='{}'".format(author),
+ "-v", str(version),
+ "--suffix=.rst",
+ "--master=index",
+ "--ext-intersphinx",
+ "--ext-mathjax",
+ "--makefile",
+ "--no-batchfile", run_path])
+
+ except CalledProcessError:
+ raise Exception("Failed to run sphinx-quickbuild. Is sphinx installed?"
+ "Generated simple index.rst instead")
+
+ # quickbuild went well we need to edit the index.rst and conf.py files
+ module_path = "{}".format(path.abspath(path.dirname(__file__)))
+
+ conf = SourceFileLoader("conf",
+ "{}/conf.py".format(run_path)).load_module()
+ l_var = [v for v in dir(conf) if not v.startswith('__')]
+
+ with open("{}/conf.py.tmp".format(run_path), "w") as mf:
+ latex_elements = {'extraclassoptions': ',openany, oneside',
+ 'preamble': r'\usepackage{longtable}',
+ 'maketitle': r'\input{titlepage.tex.txt}'}
+ mf.write("latex_elements = {}\n".format(latex_elements))
+ mf.write("latex_logo = '{}/{}'\n".format(module_path,
+ logo_path))
+ mf.write("latex_additional_files = ['titlepage.tex.txt']\n")
+
+ for var in l_var:
+ if var in ['latex_elements', 'latex_logo',
+ 'latex_additional_files']:
+ continue
+ tmpl = '{} = {}\n'
+ v = getattr(conf, var, None)
+ if isinstance(v, str):
+ tmpl = '{} = "{}"\n'
+
+ # Set name of the latex document
+ if var == 'latex_documents' and len(v[0]) > 1:
+ v[0] = v[0][:1] + ('{}.tex'.format(report_name), ) + v[0][2:]
+
+ mf.write(tmpl.format(var, v))
+
+ remove("{}/conf.py".format(run_path))
+ move("{}/conf.py.tmp".format(run_path), "{}/conf.py".format(run_path))
+
+ direntries = listdir(run_path)
+ files_to_handle = []
+ for entry in direntries:
+ if isfile("{}/{}".format(run_path, entry)):
+ name, ext = splitext("{}".format(entry))
+ if ext == ".rst" and "index" not in name:
+ files_to_handle.append(name.strip())
+
+ index_tmp = Template('''
+ Calibration report
+ ==================
+
+ .. toctree::
+ :maxdepth: 2
+ {% for k in keys %}
+ {{ k }}
+ {%- endfor %}
+ ''')
+
+ with open("{}/index.rst".format(run_path), "w+") as mf:
+ mf.write(dedent(index_tmp.render(keys=files_to_handle)))
+
+ # finally call the make scripts
+ chdir(run_path)
+ try:
+ check_call(["make", "latexpdf"])
+
+ except CalledProcessError:
+ print("Failed to make pdf documentation")
+ print("Temp files will not be deleted and " +
+ "can be inspected at: {}".format(run_path))
+ return
+ print("Moving report to final location: {}".format(out_path))
+ copy('{}/_build/latex/{}.pdf'.format(run_path, report_name), out_path)
+ print("Removing temporary files at: {}".format(tmp_path))
+ rmtree(tmp_path)
+
+
+def make_titlepage(sphinx_path, project, data_path, version):
+ """
+ Create title page for report using template
+
+ :param sphinx_path: path to sphinx run directory
+ :param project: title of the project
+ :param data_path: path to input data sample used for notebook
+ :param version: Version of the pycalibration tool
+ """
+ module_path = "{}".format(path.abspath(path.dirname(__file__)))
+ with open('{}/titlepage.tmpl'.format(module_path)) as file_:
+ title_tmp = Template(file_.read())
+
+ with open("{}/titlepage.tex.txt".format(sphinx_path), "w+") as mf:
+ mf.write(dedent(title_tmp.render(project=tex_escape(project),
+ data_path=tex_escape(data_path),
+ version=tex_escape(version))))
+
+
+def tex_escape(text):
+ """
+ Escape latex special characters found in the text
+
+ :param text: a plain text message
+ :return: the message escaped to appear correctly in LaTeX
+ """
+ conv = {
+ '&': r'\&',
+ '%': r'\%',
+ '$': r'\$',
+ '#': r'\#',
+ '_': r'\_',
+ '{': r'\{',
+ '}': r'\}',
+ '~': r'\textasciitilde{}',
+ '^': r'\^{}',
+ '\\': r'\textbackslash{}',
+ '<': r'\textless{}',
+ '>': r'\textgreater{}',
+ }
+
+ key_list = sorted(conv.keys(), key=lambda item: - len(item))
+ regex = re.compile('|'.join(re.escape(str(key)) for key in key_list))
+ return regex.sub(lambda match: conv[match.group()], text)
+
+
+def finalize(joblist, finaljob, run_path, out_path, project, calibration,
+ author, version, report_to, data_path='Unknown'):
+ print("Waiting on jobs to finish: {}".format(joblist))
+ while True:
+ found_jobs = set()
+ output = check_output(['squeue']).decode('utf8')
+ for line in output.split("\n"):
+ for job in joblist:
+ if str(job) in line:
+ found_jobs.add(job)
+ if len(found_jobs) == 0:
+ break
+ sleep(10)
+
+ prepare_plots(run_path)
+ make_timing_summary(run_path, joblist + [str(finaljob)])
+ sphinx_path = combine_report(run_path, calibration)
+ make_titlepage(sphinx_path, project, data_path, version)
+ make_report(sphinx_path, run_path, out_path, project, author, version,
+ report_to)
diff --git a/cal_tools/cal_tools/titlepage.tmpl b/xfel_calibrate/titlepage.tmpl
similarity index 100%
rename from cal_tools/cal_tools/titlepage.tmpl
rename to xfel_calibrate/titlepage.tmpl
diff --git a/cal_tools/cal_tools/xfel.pdf b/xfel_calibrate/xfel.pdf
similarity index 100%
rename from cal_tools/cal_tools/xfel.pdf
rename to xfel_calibrate/xfel.pdf
--
GitLab