diff --git a/steps/requantize.cwl b/steps/requantize.cwl index e78d79c63e1ed4e282c9e197073f17414b2ffb9e..a3861986a95911ddc1a77554d4676e0e350754e2 100644 --- a/steps/requantize.cwl +++ b/steps/requantize.cwl @@ -39,9 +39,10 @@ outputs: - '*/*/SAP*/BEAM*/*.png' - '*/*.png' - '*.png' - - rawvoltages/SAP*/BEAM*/*.png + - 'rawvoltages/SAP*/BEAM*/*.png' - '*stokes/SAP*/BEAM*/*.png' - '*.rfifind.log' + - '*stokes/SAP*/BEAM*/*_ldv_psrfits_requantisation.log' - id: file_content doc: file_content type: File @@ -51,12 +52,6 @@ outputs: type: File outputBinding: glob: '*-ldv-summary.log' -- id: summary_psrfits_file - doc: summary_psrfits_file - type: File? - outputBinding: - glob: - - '*stokes/SAP*/BEAM*/*_ldv_psrfits_requantisation.log' baseCommand: - psrfits_requantisation diff --git a/workflow/download_and_run_psrfits_requantisation.cwl b/workflow/download_and_run_psrfits_requantisation.cwl index fc4ff996f28d804b456c83a4e800cda0332dda1e..367a6c2f190edfd0b2c59dfa836c655e743bb3a6 100644 --- a/workflow/download_and_run_psrfits_requantisation.cwl +++ b/workflow/download_and_run_psrfits_requantisation.cwl @@ -22,9 +22,6 @@ outputs: - id: summary_file type: File[] outputSource: requantise/summary_file -- id: summary_psrfits_file - type: File[]? - outputSource: requantise/summary_psrfits_file - id: ingest type: Any outputSource: requantise/ingest @@ -49,7 +46,6 @@ steps: run: psrfits_requantisation.cwl out: - id: summary_file - - id: summary_psrfits_file - id: summary - id: tar_archive - id: ingest @@ -63,21 +59,8 @@ steps: run: ../steps/join_contents.cwl out: - id: summary_file -- id: join_contents_psrfits - in: - - id: summary_files - source: requantise/summary_psrfits_file - pickValue: all_non_null - - id: metadata - source: requantise/summary - run: ../steps/join_contents.cwl - when: $(inputs.summary_files.length > 0) - out: - - id: summary_file - id: format_quality in: - - id: summary_psrfits_file - source: join_contents_psrfits/summary_file - id: summary_file source: join_contents/summary_file - id: plots diff --git a/workflow/psrfits_requantisation.cwl b/workflow/psrfits_requantisation.cwl index be17af13bf7f01a21100c00dcc8e1f5ce113b3b4..1983ca83663a8d23ce191145fb93343358beec97 100644 --- a/workflow/psrfits_requantisation.cwl +++ b/workflow/psrfits_requantisation.cwl @@ -22,9 +22,6 @@ outputs: - id: summary_file type: File outputSource: requantise/summary_file -- id: summary_psrfits_file - type: File? - outputSource: requantise/summary_psrfits_file - id: plots type: File[] outputSource: requantise/plots @@ -42,7 +39,6 @@ steps: - id: file_content - id: summary - id: summary_file - - id: summary_psrfits_file - id: bf_archive - id: plots