Rename keyname to key_name in FileSelector

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
 

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
 

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

test_jobs/file_selector.json

@@ -8,5 +8,5 @@
         }
     },
     "step_name": "average",
-    "type": "parmdb"
+    "keyname": "parmdb"
 }