Merge branch 'master' into TMSS-674

SAS/TMSS/backend/src/tmss/tmssapp/adapters/parset.py

@@ -114,8 +114,8 @@ def _convert_correlator_settings_to_parset_dict(subtask: models.Subtask, spec: d
         for digi_beam in digi_beams:
             for subband in digi_beam["subbands"]:
                 dataproduct = [dp for dp in dataproducts
-                               if  dp.specifications_doc["sap"] == digi_beam['name']
-                               and dp.specifications_doc["subband"] == subband]
+                               if  dp.specifications_doc.get("sap") == digi_beam['name']
+                               and dp.specifications_doc.get("subband") == subband]
 
                 correlator_dataproducts.append(dataproduct[0] if dataproduct else null_dataproduct)
 
@@ -145,7 +145,7 @@ def _convert_beamformer_settings_to_parset_dict(subtask: models.Subtask, spec: d
     beamformer_pipeline_parsets = []
 
     # Process beamformer pipelines
-    for pipeline in spec['COBALT']['beamformer']['tab_pipelines']:
+    for pipeline_idx, pipeline in enumerate(spec['COBALT']['beamformer']['tab_pipelines']):
         pipeline_parset = {}
         pipeline_parset.update(_add_prefix(_stokes_settings_parset_subkeys(pipeline['coherent']), "CoherentStokes."))
         pipeline_parset.update(_add_prefix(_stokes_settings_parset_subkeys(pipeline['incoherent']), "IncoherentStokes."))
@@ -176,12 +176,13 @@ def _convert_beamformer_settings_to_parset_dict(subtask: models.Subtask, spec: d
                 for s in range(nr_stokes):
                     for p in range(nr_parts):
                         dataproduct = [dp for dp in dataproducts
-                                       if  dp.specifications_doc["sap"] == sap['name']
+                                       if  dp.specifications_doc.get("sap") == sap['name']
+                                       and "identifiers" in dp.specifications_doc
                                        and dp.specifications_doc["identifiers"]["pipeline_index"] == pipeline_idx
-                                       and dp.specifications_doc["identifiers"]["tab_index"] == field_idx
+                                       and dp.specifications_doc["identifiers"]["tab_index"] == tab_idx
                                        and dp.specifications_doc["identifiers"]["stokes_index"] == s
                                        and dp.specifications_doc["identifiers"]["part_index"] == p
-                                       and dp.specifications_doc["coherent"] == tab['coherent']]
+                                       and dp.specifications_doc.get("coherent") == tab['coherent']]
                         if tab['coherent']:
                             coherent_dataproducts.append(dataproduct[0] if dataproduct else null_dataproduct)
                         else: