Merge branch 'fix/dark_for_karabo_ids_diff_karabo_das' into 'master'

request dark for more than one karabo_id with different karabo_das for same run

See merge request detectors/pycalibration!329

webservice/webservice.py

@@ -705,11 +705,12 @@ async def server_runner(config, mode):
                 # Prepare configs for all requested detectors
                 for karabo_id in karabo_ids:
 
-                    if karabo_das[0] == 'all':
-                        karabo_das = data_conf[karabo_id]["karabo-da"]
+                    # use selected karabo_das
+                    karabo_da = data_conf[karabo_id]["karabo-da"] \
+                        if karabo_das[0] == "all" else karabo_das
 
                     # Check if any files for given karabo-das exists
-                    if await check_files(in_folder, wait_runs, karabo_das):
+                    if await check_files(in_folder, wait_runs, karabo_da):
                         thisconf = copy.copy(data_conf[karabo_id])
 
                         if (karabo_id in pconf and
@@ -720,7 +721,7 @@ async def server_runner(config, mode):
                         thisconf["out-folder"] = '/'.join((out_folder,
                                                            karabo_id.replace('-', '_')))
                         thisconf["karabo-id"] = karabo_id
-                        thisconf["karabo-da"] = karabo_das
+                        thisconf["karabo-da"] = karabo_da
 
                         run_config = []
                         for typ, run in run_mapping.items():