diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py index d6609ec89112e2156806864ee5cc6557813edfbf..9f594817e62affd8dd124a1a0bc6cb81795c484c 100755 --- a/xfel_calibrate/calibrate.py +++ b/xfel_calibrate/calibrate.py @@ -441,8 +441,9 @@ def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None, temp_path=temp_path) + " -p {}".format(sprof) srun_base = srun_base.split() else: + this_res = reservation if priority == 1 else reservation_char srun_base = launcher_command.format( - temp_path=temp_path) + " --reservation={}".format(reservation) + temp_path=temp_path) + " --reservation={}".format(this_res) srun_base = srun_base.split() print(" ".join(srun_base)) else: diff --git a/xfel_calibrate/notebooks.py b/xfel_calibrate/notebooks.py index 2b63c34484932dd2ee0078283580ebc81e895595..ec89e37e4a13c1e634f8fe89fddcbbdec4dce79d 100644 --- a/xfel_calibrate/notebooks.py +++ b/xfel_calibrate/notebooks.py @@ -33,12 +33,6 @@ notebooks = { "default concurrency": None, "cluster cores": 8}, }, - "STATS_FROM_DB": { - "notebook": "notebooks/AGIPD/PlotFromCalDB_AGIPD_NBC.ipynb", - "concurrency": {"parameter": "modules", - "default concurrency": list(range(16)), - "cluster cores": 1}, - }, }, "LPD": { "DARK": { @@ -81,12 +75,19 @@ notebooks = { }, }, "PNCCD": { - "CHARACTERIZE": { - "notebook": "notebooks/pnCCD/Characterize_NBC.ipynb", + "DARK": { + "notebook": "notebooks/pnCCD/Characterize_pnCCD_Dark_NBC.ipynb", "concurrency": {"parameter": None, "default concurrency": None, "cluster cores": 32}, }, + "CORRECT": { + "notebook": "notebooks/pnCCD/Correct_pnCCD_NBC.ipynb", + "concurrency": {"parameter": "sequences", + "default concurrency": [-1], + "use function": "balance_sequences", + "cluster cores": 32}, + }, }, "GENERIC": { "DB_TO_H5": { @@ -148,12 +149,29 @@ notebooks = { "default concurrency": None, "cluster cores": 4}, }, + + "CORRECT": { "notebook": "notebooks/ePix/Correction_ePix_NBC.ipynb", "concurrency": {"parameter": "sequences", "default concurrency": [-1], "use function": "balance_sequences", "cluster cores": 4}, - }, - }, + } + }, + "DSSC": { + "DARK": { + "notebook": "notebooks/DSSC/Characterize_DSSC_Darks_NBC.ipynb", + "concurrency": {"parameter": "modules", + "default concurrency": list(range(16)), + "cluster cores": 8}, + }, + "CORRECT": { + "notebook": "notebooks/DSSC/DSSC_Correct_and_Verify.ipynb", + "concurrency": {"parameter": "sequences", + "use function": "balance_sequences", + "default concurrency": [-1], + "cluster cores": 16}, + }, + }, } diff --git a/xfel_calibrate/settings.py b/xfel_calibrate/settings.py index 892412e80143b4e41d603b5a2d82f29f95a1445c..b086c70d7722f268bfe94351eac3072c30ad891c 100644 --- a/xfel_calibrate/settings.py +++ b/xfel_calibrate/settings.py @@ -34,3 +34,4 @@ free_nodes_cmd = "sinfo -p exfel -t idle -N --noheader | wc -l" preempt_nodes_cmd = "squeue -p all,grid --noheader | grep max-exfl | egrep -v 'max-exfl18[3-8]|max-exfl100|max-exflg' | wc -l" max_reserved = 8 reservation = "xcal" +reservation_char = "darks"