diff --git a/compress_pipeline.cwl b/compress_pipeline.cwl index 41634ee811e8e1d650677dfa474a7e086110e00a..d55e014d16eb5f4778c5ea5adb74806d3fd90607 100644 --- a/compress_pipeline.cwl +++ b/compress_pipeline.cwl @@ -16,6 +16,10 @@ inputs: type: boolean? - id: msin type: Directory +- id: msin_files + type: string[] +- id: ms_count + type: int outputs: - id: inspect @@ -110,12 +114,16 @@ steps: - id: extract_sip_meta in: - id: msin - source: + source: - dppp/msout - msin pickValue: first_non_null - id: compressed_file source: compress/compressed + - id: msin_files + source: msin_files + - id: ms_count + source: ms_count - id: skip source: identify_issues/skip_compress when: $(inputs.skip == false) @@ -174,7 +182,7 @@ steps: label: compress in: - id: directory - source: + source: - dppp/msout - msin pickValue: first_non_null @@ -187,12 +195,12 @@ steps: - id: inspect_step in: - id: msin - source: + source: - dppp/msout - msin pickValue: first_non_null - id: inspect_file_name - source: + source: - dppp/msout - msin pickValue: first_non_null diff --git a/download_and_compress_pipeline.cwl b/download_and_compress_pipeline.cwl index 6ad92e490c30c68c199d78122005af24d9ed3394..6cfb692c88615bbd6134089027f800b18de1b731 100644 --- a/download_and_compress_pipeline.cwl +++ b/download_and_compress_pipeline.cwl @@ -67,6 +67,10 @@ steps: source: flag_autocorrelation - id: is_long_baseline source: is_long_baseline + - id: msin_files + source: surls + - id: ms_count + valueFrom: $(inputs.msin_files.length) scatter: - msin run: ./compress_pipeline.cwl diff --git a/steps/extract_sip_meta.cwl b/steps/extract_sip_meta.cwl index cf84cdbd392b63821f74b24d48709e75162f6863..6b387cf1894a47c5787506a2eb2f301d94e180d3 100644 --- a/steps/extract_sip_meta.cwl +++ b/steps/extract_sip_meta.cwl @@ -13,6 +13,9 @@ inputs: type: File inputBinding: position: 1 + - id: ms_count + type: int + outputs: - id: ingest type: Any @@ -47,7 +50,7 @@ requirements: "timeIntegrationStep": "1", "flagAutoCorrelations": "true", "frequencyIntegrationStep": "1", - "numberOfCorrelatedDataProducts": "1" + "numberOfCorrelatedDataProducts": $(inputs.ms_count), } } - entryname: dataproduct.json