From cc4c90b98561b28f58f3bcc3ddc52c7dc44e2a60 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Wed, 4 Mar 2020 14:29:08 +0100
Subject: [PATCH] Add input/output column
Former-commit-id: 1f48b152cf3c50a3d3f614010e77dfc31b95ab82
---
steps/DP3.Execute.cwl | 20 ++++++++++++++++----
steps/DPPP.cwl | 26 ++++++++++++++++++++------
2 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/steps/DP3.Execute.cwl b/steps/DP3.Execute.cwl
index e1f3bbf..c46e506 100644
--- a/steps/DP3.Execute.cwl
+++ b/steps/DP3.Execute.cwl
@@ -7,8 +7,8 @@ $namespaces:
inputs:
- id: msout_name
type: string
- 'sbg:x': -425.39886474609375
- 'sbg:y': 127
+ 'sbg:x': -418
+ 'sbg:y': 187
- id: msin
type: Directory
'sbg:x': -254.39886474609375
@@ -20,8 +20,16 @@ inputs:
- id: autoweight
type: boolean
default: true
- 'sbg:x': -113
- 'sbg:y': 290
+ 'sbg:x': -42
+ 'sbg:y': 305
+ - id: output_column
+ type: string?
+ 'sbg:x': -513
+ 'sbg:y': 104
+ - id: input_column
+ type: string?
+ 'sbg:x': -248.0078125
+ 'sbg:y': 363
outputs:
- id: secondary_output_files
outputSource:
@@ -76,6 +84,10 @@ steps:
source: generic_step/output_directory_names
- id: autoweight
source: autoweight
+ - id: output_column
+ source: output_column
+ - id: input_column
+ source: input_column
out:
- id: msout
- id: secondary_output_files
diff --git a/steps/DPPP.cwl b/steps/DPPP.cwl
index a756093..288049a 100755
--- a/steps/DPPP.cwl
+++ b/steps/DPPP.cwl
@@ -37,17 +37,31 @@ inputs:
- id: output_directory_names
type: Any
doc: Expected output file names
- - id: autoweight
+ - default: true
+ id: autoweight
type: boolean
- default: true
inputBinding:
- prefix: -msin.autoweight=True
- - id: baseline
+ position: 0
+ prefix: '-msin.autoweight=True'
+ - default: ''
+ id: baseline
type: string
- default: ""
inputBinding:
- prefix: -msin.baseline=
+ position: 0
+ prefix: '-msin.baseline='
separate: false
+ - default: DATA
+ id: output_column
+ type: string?
+ inputBinding:
+ position: 0
+ prefix: '-msout.datacolumn='
+ - default: DATA
+ id: input_column
+ type: string?
+ inputBinding:
+ position: 0
+ prefix: '-msin.datacolumn='
outputs:
- id: msout
doc: Output Measurement Set
--
GitLab