diff --git a/steps/DP3.AOFlaggerStepGenerator.cwl b/steps/DP3.AOFlaggerStepGenerator.cwl index 58effb4851263e05e5de9ac0712a6e2c533aa333..2a70f602771d7e5e669ba46ee395550807bb379d 100755 --- a/steps/DP3.AOFlaggerStepGenerator.cwl +++ b/steps/DP3.AOFlaggerStepGenerator.cwl @@ -83,9 +83,9 @@ inputs: default: true doc: Write the quality statistics? outputs: - - id: parameters_out + - id: augmented_steps outputSource: - - DP3_GenericStep/parameters_out + - DP3_GenericStep/augmented_steps type: Any[] steps: @@ -124,7 +124,7 @@ steps: - id: keepstatistics source: keepstatistics out: - - parameters_out + - augmented_steps run: ../steps/DP3.GenericStep.cwl requirements: - class: StepInputExpressionRequirement diff --git a/steps/DP3.AveragerStepGenerator.cwl b/steps/DP3.AveragerStepGenerator.cwl index 411efad25f2bbd2118f2dad56b7d1675ec62c384..16b3b973c4b39e238897edad98eb5d1887748f9d 100755 --- a/steps/DP3.AveragerStepGenerator.cwl +++ b/steps/DP3.AveragerStepGenerator.cwl @@ -48,9 +48,9 @@ inputs: <step>.freqstep default: 0 outputs: - - id: parameters_out + - id: augmented_steps outputSource: - - DP3_GenericStep/parameters_out + - DP3_GenericStep/augmented_steps type: Any[] steps: @@ -77,7 +77,7 @@ steps: - id: freqresolution source: freqresolution out: - - parameters_out + - augmented_steps run: ../steps/DP3.GenericStep.cwl requirements: - class: StepInputExpressionRequirement diff --git a/steps/DP3.DemixerStepGenerator.cwl b/steps/DP3.DemixerStepGenerator.cwl index 24b3732af9c17efe39aebc663cb83b286c619c8a..caaa14ce8004716f969fb9b88f8589ba2a0167b9 100755 --- a/steps/DP3.DemixerStepGenerator.cwl +++ b/steps/DP3.DemixerStepGenerator.cwl @@ -126,9 +126,9 @@ inputs: type: int doc: Maximum number of iterations used in the LM solve outputs: -- id: parameters_out +- id: augmented_steps outputSource: - - DP3_GenericStep/parameters_out + - DP3_GenericStep/augmented_steps type: Any[] steps: @@ -182,7 +182,7 @@ steps: - id: maxiter source: maxiter out: - - parameters_out + - augmented_steps run: ../steps/DP3.GenericStep.cwl requirements: - class: StepInputExpressionRequirement diff --git a/steps/DP3.GenericStep.cwl b/steps/DP3.GenericStep.cwl index a4e4149d52a6da175bd7ccad833ab1f0bed16820..38829da42ed0deaac51bcf92c7c105e9139d4108 100755 --- a/steps/DP3.GenericStep.cwl +++ b/steps/DP3.GenericStep.cwl @@ -15,7 +15,7 @@ inputs: type: Any? outputs: - - id: parameters_out + - id: augmented_steps type: Any[] expression: |- ${ @@ -59,5 +59,5 @@ expression: |- var out_parameters = in_parameters == null ? [new_step] : in_parameters.concat(new_step) - return {'parameters_out': out_parameters}; + return {'augmented_steps': out_parameters}; } diff --git a/steps/DP3.PreflaggerStepGenerator.cwl b/steps/DP3.PreflaggerStepGenerator.cwl index f3427fc81001d5c2fa17ffa800474043b3ffd1e9..b1ff11afefa2122136e784f437b9a46e9a42fd78 100755 --- a/steps/DP3.PreflaggerStepGenerator.cwl +++ b/steps/DP3.PreflaggerStepGenerator.cwl @@ -169,9 +169,9 @@ inputs: type: float doc: Correlation data with imaginary complex part > imagmax will match. outputs: -- id: parameters_out +- id: augmented_steps outputSource: - - DP3_GenericStep/parameters_out + - DP3_GenericStep/augmented_steps type: Any[] steps: @@ -238,7 +238,7 @@ steps: - id: imagmax source: imagmax out: - - parameters_out + - augmented_steps run: ../steps/DP3.GenericStep.cwl requirements: diff --git a/subworkflow/ndppp_prep_cal.cwl b/subworkflow/ndppp_prep_cal.cwl index dda41c7047ee42bd3d2f038801a3eae42872bee8..4e6dc0e28cec2aa514101dcd1a16ce782a79c334 100644 --- a/subworkflow/ndppp_prep_cal.cwl +++ b/subworkflow/ndppp_prep_cal.cwl @@ -58,7 +58,7 @@ steps: source: - baselines_to_flag out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.PreflaggerStepGenerator.cwl 'sbg:x': 1160.802978515625 'sbg:y': -95.15213775634766 @@ -66,13 +66,13 @@ steps: in: - id: input_parset source: - - flagbaseline/parameters_out + - flagbaseline/augmented_steps - id: step_name default: flagelev - id: elevation source: elevation_to_flag out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.PreflaggerStepGenerator.cwl 'sbg:x': 1459.2421875 'sbg:y': -83.970458984375 @@ -82,7 +82,7 @@ steps: source: raw_data - id: a_arguments source: - - aoflag/parameters_out + - aoflag/augmented_steps out: - id: output_arguments run: ../steps/DP3.ParsetSelector.cwl @@ -93,13 +93,13 @@ steps: in: - id: input_parset source: - - flagelev/parameters_out + - flagelev/augmented_steps - id: step_name default: flagamp - id: amplmin source: min_amplitude_to_flag out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.PreflaggerStepGenerator.cwl 'sbg:x': 1659.302001953125 'sbg:y': -23 @@ -110,7 +110,7 @@ steps: - id: chan default: '[0..nchan/32-1,31*nchan/32..nchan-1]' out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.PreflaggerStepGenerator.cwl 'sbg:x': 53.59375762939453 'sbg:y': -119.96077728271484 @@ -118,7 +118,7 @@ steps: in: - id: steps source: - - flagedge/parameters_out + - flagedge/augmented_steps - id: step_name default: aoflag - id: memoryperc @@ -126,7 +126,7 @@ steps: - id: keepstatistics default: false out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.AOFlaggerStepGenerator.cwl 'sbg:x': 357.934326171875 'sbg:y': -129.337890625 @@ -136,10 +136,10 @@ steps: source: demix - id: a_arguments source: - - demixstepgenerator/parameters_out + - demixstepgenerator/augmented_steps - id: b_arguments source: - - flagamp/parameters_out + - flagamp/augmented_steps out: - id: output_arguments run: ../steps/DP3.ParsetSelector.cwl @@ -150,9 +150,9 @@ steps: in: - id: steps source: - - flagamp/parameters_out + - flagamp/augmented_steps out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.DemixerStepGenerator.cwl 'sbg:x': 1828.623046875 'sbg:y': 156.3474578857422 diff --git a/test_workflow/flag_average.cwl b/test_workflow/flag_average.cwl index ba872d9bcb9b1624d8607d19ca701039ecab751b..953ef10c2f3b3dbda86d328c7bdc7e3b435a96e5 100644 --- a/test_workflow/flag_average.cwl +++ b/test_workflow/flag_average.cwl @@ -20,7 +20,7 @@ steps: - id: aoflagger_step_generator in: [] out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.AOFlaggerStepGenerator.cwl 'sbg:x': -1357.640625 'sbg:y': -729.5 @@ -28,9 +28,9 @@ steps: in: - id: input_parset source: - - aoflagger_step_generator/parameters_out + - aoflagger_step_generator/augmented_steps out: - - id: parameters_out + - id: augmented_steps run: ../steps/DP3.AveragerStepGenerator.cwl 'sbg:x': -1125 'sbg:y': -729 @@ -38,7 +38,7 @@ steps: in: - id: steps source: - - average_step_generator/parameters_out + - average_step_generator/augmented_steps out: - id: output_parset - id: input_files