Propagate backlog of xfel_calibrate related changes from production system as of 06/2019

See merge request detectors/pycalibration!80

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:

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},
+                               },
+                      },
             }

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"