FileDirSelector test

.gitlab-ci.yml

@@ -39,6 +39,7 @@ test_DPPP_step:
     - cwl-runner steps/DP3.AOFlaggerStepGenerator.cwl test_jobs/aoflagger_step_generator.json
     - cwl-runner steps/DP3.PreflaggerStepGenerator.cwl test_jobs/preflagger_step_generator.json
     - cwl-runner steps/DP3.ParsetSelector.cwl test_jobs/parset_selector.json
+    - cwl-runner steps/FileDirSelector.cwl test_jobs/filedir_selector.json
     - ! cwl-runner steps/DP3.AveragerStepGenerator.cwl test_jobs/averager_step_generator_error.json
     - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH test_workflow/flag_average.cwl --msin=test_data/L570745_SB001_uv_first10.MS
     - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH steps/DPPP.cwl test_jobs/NDPPP.json

steps/FileDirSelector.cwl

@@ -15,9 +15,11 @@ outputs:
     type: [File, Directory]
 
 expression: |
-  $(
-    {'output': inputs.inputs[step_name][type]}
-  )
+  ${
+    var step_name = inputs.step_name
+    var type = inputs.type
+    return {'output': inputs.inputs[step_name][type]}
+  }
 label: ParsetSelector
 
 requirements:

test_jobs/filedir_selector.json

+{
+    "inputs": {
+        "average": {
+            "parmdb": {
+                    "class": "File",
+                    "location": "ndppp_step.parset"
+            }
+        }
+    },
+    "step_name": "average",
+    "type": "parmdb"
+}