diff --git a/bin/slurm_calibrate.sh b/bin/slurm_calibrate.sh index 98af862987443a3461e9a4feaf5a83a0f6974ab5..a93b5d02a04ba02acb4885fd8a5b34aad7b18f44 100755 --- a/bin/slurm_calibrate.sh +++ b/bin/slurm_calibrate.sh @@ -47,6 +47,7 @@ fi if [ "$caltype" == "CORRECT" ] then + # calparrot stores and repeats calcat queries ${python_path} -m calparrot -- ${python_path} -m princess ${nb_path} --save --run-before "$setup_logger" else ${python_path} -m princess ${nb_path} --save --run-before "$setup_logger" diff --git a/notebooks/test/test-error.ipynb b/notebooks/test/test-logging.ipynb similarity index 100% rename from notebooks/test/test-error.ipynb rename to notebooks/test/test-logging.ipynb diff --git a/src/xfel_calibrate/calibrate.py b/src/xfel_calibrate/calibrate.py index 447553643497e488ee64093bd28f2e141d21f6b1..db5c7d787e1f8864d6dfe151f01cbf3087fbb0ce 100755 --- a/src/xfel_calibrate/calibrate.py +++ b/src/xfel_calibrate/calibrate.py @@ -580,10 +580,12 @@ def make_par_table(parms): return textwrap.dedent(tmpl.render(p=col_type, lines=l_parms)) + def run(argv=None): """ Run a calibration task with parser arguments """ if argv is None: argv = sys.argv + args, nb_details = parse_argv_and_load_nb(argv) concurrency = nb_details.concurrency diff --git a/src/xfel_calibrate/notebooks.py b/src/xfel_calibrate/notebooks.py index dec83897e1aa02b91672610ff92da5da0432fc38..97769638974ee8bd60545b4f70699c0cd979bbf4 100644 --- a/src/xfel_calibrate/notebooks.py +++ b/src/xfel_calibrate/notebooks.py @@ -360,16 +360,8 @@ notebooks = { "cluster cores": 1 }, }, - "TEST-LOG-ERROR": { - "notebook": "notebooks/test/test-error.ipynb", - "concurrency": { - "parameter": None, - "default concurrency": None, - "cluster cores": 1, - }, - }, - "TEST-LOG-WARNING": { - "notebook": "notebooks/test/test-warning.ipynb", + "TEST-LOGGING": { + "notebook": "notebooks/test/test-logging.ipynb", "concurrency": { "parameter": None, "default concurrency": None, diff --git a/src/xfel_calibrate/settings.py b/src/xfel_calibrate/settings.py index eb9f096a5977d7f3c6dbaed34fcbc41e64bc7fb2..15067c0a6ff9e211f1ca3d16280edc9fa524f2d3 100644 --- a/src/xfel_calibrate/settings.py +++ b/src/xfel_calibrate/settings.py @@ -16,9 +16,6 @@ try_report_to_output = True # logo file for calibration report (located in cal_tools/cal_tools) logo_path = "xfel.pdf" -# Logger handler -setup_logger = "setup_loggeing.py" - # the command to run this concurrently. It is prepended to the actual call sprof = os.environ.get("XFELCALSLURM", "exfel") # TODO: https://git.xfel.eu/gitlab/calibration/planning/issues/3 launcher_command = "sbatch -t 24:00:00 --requeue --output {temp_path}/slurm-%j.out --parsable"