From acb55d11f3597128e15bb5cfc0fea5842585fa8c Mon Sep 17 00:00:00 2001
From: Tammo Jan Dijkema <dijkema@astron.nl>
Date: Fri, 18 Oct 2019 10:25:17 +0200
Subject: [PATCH] Rename keyname to key_name in FileSelector
---
steps/DirSelector.cwl | 6 +++---
steps/FileSelector.cwl | 6 +++---
subworkflow/ndppp_prep_cal.cwl | 12 +++++-------
test_jobs/file_selector.json | 2 +-
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/steps/DirSelector.cwl b/steps/DirSelector.cwl
index cdc23ba5..136a6ce0 100644
--- a/steps/DirSelector.cwl
+++ b/steps/DirSelector.cwl
@@ -10,7 +10,7 @@ inputs:
doc: >-
id of the step that generates the output file or directory
(e.g. 'demixstepgenerator')
- - id: keyname
+ - id: key_name
type: string
doc: >-
key of the parset that contains the name of the outputfile
@@ -22,8 +22,8 @@ outputs:
expression: |
${
var step_name = inputs.step_name
- var keyname = inputs.keyname
- return {'output': inputs.inputs[step_name][keyname]}
+ var key_name = inputs.key_name
+ return {'output': inputs.inputs[step_name][key_name]}
}
label: DirSelector
diff --git a/steps/FileSelector.cwl b/steps/FileSelector.cwl
index 85e02115..f935adca 100644
--- a/steps/FileSelector.cwl
+++ b/steps/FileSelector.cwl
@@ -10,7 +10,7 @@ inputs:
doc: >-
id of the step that generates the output file or directory
(e.g. 'demixstepgenerator')
- - id: keyname
+ - id: key_name
type: string
doc: >-
key of the parset that contains the name of the outputfile
@@ -22,8 +22,8 @@ outputs:
expression: |
${
var step_name = inputs.step_name
- var keyname = inputs.keyname
- return {'output': inputs.inputs[step_name][keyname]}
+ var key_name = inputs.key_name
+ return {'output': inputs.inputs[step_name][key_name]}
}
label: FileSelector
diff --git a/subworkflow/ndppp_prep_cal.cwl b/subworkflow/ndppp_prep_cal.cwl
index 0e44500f..33a66f9a 100644
--- a/subworkflow/ndppp_prep_cal.cwl
+++ b/subworkflow/ndppp_prep_cal.cwl
@@ -39,11 +39,9 @@ outputs:
- id: output
outputSource:
- filter_demix_parmdb/output
- type:
- - File
- - Directory
- 'sbg:x': 2973.0185546875
- 'sbg:y': -197.36175537109375
+ type: Directory
+ 'sbg:x': 3000.845703125
+ 'sbg:y': -213.68421936035156
steps:
- id: flagbaseline
in:
@@ -195,11 +193,11 @@ steps:
source: dppp/secondary_output_directories
- id: step_name
valueFrom: demixstepgenerator
- - id: keyname
+ - id: key_name
valueFrom: instrumentmodel
out:
- id: output
- run: ../steps/FileDirSelector.cwl
+ run: ../steps/DirSelector.cwl
label: FileDirSelector
'sbg:x': 2838.8115234375
'sbg:y': -151.54710388183594
diff --git a/test_jobs/file_selector.json b/test_jobs/file_selector.json
index 072bdc5b..9abb9c76 100644
--- a/test_jobs/file_selector.json
+++ b/test_jobs/file_selector.json
@@ -8,5 +8,5 @@
}
},
"step_name": "average",
- "type": "parmdb"
+ "keyname": "parmdb"
}
--
GitLab