Merge branch 'master' of git.astron.nl:eosc/prefactor3-cwl

Former-commit-id: 4adbae06

steps/DP3.ParsetGenerator.cwl

@@ -66,9 +66,9 @@ outputs:
       outputEval: |-
         ${
         var outfiles = []
-        for(let step in inputs.parameters_input){
+        for(var step in inputs.parameters_input){
           step = inputs.parameters_input[step]
-          for(let parameter in step['parameters']){
+          for(var parameter in step['parameters']){
             parameter = step['parameters'][parameter]
 
             if (parameter != null && parameter.class =='File'){
@@ -85,9 +85,9 @@ outputs:
       outputEval: |
         ${
         var outdirs = []
-        for(let step in inputs.parameters_input){
+        for(var step in inputs.parameters_input){
           step = inputs.parameters_input[step]
-          for(let parameter in step['parameters']){
+          for(var parameter in step['parameters']){
             parameter = step['parameters'][parameter]
             if (parameter != null && parameter.class=='Directory'){
               outdirs.push(parameter)

subworkflow/ndppp_prep_cal.cwl

@@ -29,6 +29,10 @@ inputs:
     type: boolean
     'sbg:x': 1736.6195068359375
     'sbg:y': -298.45196533203125
+  - id: msin
+    type: Directory?
+    'sbg:x': 2095.969482421875
+    'sbg:y': 563.7855224609375
 outputs:
   - id: msout
     outputSource:
@@ -36,12 +40,12 @@ outputs:
     type: Directory
     'sbg:x': 2856.537841796875
     'sbg:y': 53.67763900756836
-  - id: output
+  - id: demix_parmdb
     outputSource:
       - filter_demix_parmdb/output
     type: Directory
-    'sbg:x': 3000.845703125
-    'sbg:y': -213.68421936035156
+    'sbg:x': 3071.909912109375
+    'sbg:y': -170.69992065429688
 steps:
   - id: flagbaseline
     in:
@@ -170,6 +174,8 @@ steps:
     in:
       - id: parset
         source: parsetgenerator/output_parset
+      - id: msin
+        source: msin
       - id: secondary_files
         source:
           - parsetgenerator/input_files
@@ -198,7 +204,6 @@ steps:
     out:
       - id: output
     run: ../steps/DirSelector.cwl
-    label: FileDirSelector
     'sbg:x': 2838.8115234375
     'sbg:y': -151.54710388183594
 requirements: