add variables

workflows/prefactor_target.cwl

@@ -122,7 +122,7 @@ inputs:
     'sbg:y': 500
   - id: gsmcal_step
     type: string?
-    default: phase
+    default: 'phase'
     'sbg:x': -1000
     'sbg:y': 600
   - id: updateweights
@@ -399,6 +399,8 @@ steps:
         source: prep/outh5parm
       - id: compression_bitrate
         source: compression_bitrate
+      - id: skymodel_source
+        source: skymodel_source
     out:
       - id: msout
       - id: solutions

workflows/prefactor_target/finalize.cwl

@@ -20,24 +20,27 @@ inputs:
   - id: gsmcal_step
     type: string
     'sbg:x': -1000
-    'sbg:y': -200
+    'sbg:y': -100
   - id: process_baselines_target
     type: string
     'sbg:x': -1000
-    'sbg:y': -100
+    'sbg:y': 0
   - id: bad_antennas
     type: string
     'sbg:x': -1000
-    'sbg:y': 0
+    'sbg:y': 100
   - id: insolutions
     type: File
     'sbg:x': -1000
-    'sbg:y': 100
+    'sbg:y': 200
   - id: compression_bitrate
     type: int
     'sbg:x': -1000
-    'sbg:y': 200
-
+    'sbg:y': 300
+  - id: skymodel_source
+    type: string
+    'sbg:x': -1000
+    'sbg:y': 400
 outputs:
   - id: msout
     outputSource:
@@ -74,7 +77,8 @@ steps:
         source: gsmcal_step
         valueFrom: $(self+'000')
       - id: soltab_out
-        default: 'TGSSphase'
+        source: gsmcal_step
+        valueFrom: $(inputs.skymodel_source+self)
       - id: filter
         source: process_baselines_target
       - id: bad_antennas
@@ -102,7 +106,8 @@ steps:
       - id: databitrate
         source: compression_bitrate
       - id: correction
-        default: 'TGSSphase'
+        source: gsmcal_step
+        valueFrom: $(inputs.skymodel_source+self)
       - id: solset
         default: 'target'
       - id: msout_name
@@ -124,7 +129,8 @@ steps:
       - id: outsolset
         default: target
       - id: insoltab
-        default: 'TGSSphase'
+        source: gsmcal_step
+        valueFrom: $(inputs.skymodel_source+self)
       - id: input_file
         source: insolutions
       - id: squeeze