diff --git a/webservice/config/webservice.yaml b/webservice/config/webservice.yaml index 0e23f1ca8bb889d82b84e5b097d5a2efcb419bb1..66195a9a6282ec62992add2493a2e907bf8062f0 100644 --- a/webservice/config/webservice.yaml +++ b/webservice/config/webservice.yaml @@ -63,6 +63,18 @@ dark: reports-folder: /gpfs/exfel/d/cal/caldb_store/xfel/reports/{instrument}/{det_instance}/{action} commissioning-penalty: 1250 job-penalty: 2 + three-gain-detectors: + [ + "LPD", + "AGIPD", + "JUNGFRAU", + "JF", + "JNGFR", + "JUNGF", + "GH2", + "G2", + "HIREX", + ] cmd: >- python -m xfel_calibrate.calibrate {detector} DARK --concurrency-par karabo_da diff --git a/webservice/webservice.py b/webservice/webservice.py index d1a6cafc934f4a6f0d4028abd3e8aa0fd649c6c7..2ce0f9d3eabb3de3de24fffcf479c9c67f2bcc89 100644 --- a/webservice/webservice.py +++ b/webservice/webservice.py @@ -1287,18 +1287,7 @@ class ActionsServer: # Notebooks require one or three runs, depending on the # detector type and operation mode. triple = any( - det in karabo_id for det in - [ - "LPD", - "AGIPD", - "JUNGFRAU", - "JF", - "JNGFR", - "JUNGF", - "GH2", - "G2", - "HIREX" - ]) + det in karabo_id for det in self.config['dark']['three-gain-detectors']) # noqa # This fails silently if the hardcoded strings above are # ever changed (triple = False) but the underlying notebook