steps/ddecal.cwl

@@ -244,7 +244,7 @@ inputs:
       prefix: ddecal.sourcedb=
       separate: false
   - id: usebeammodel
-    default: true
+    default: false
     type: boolean?
     inputBinding:
       position: 0

workflows/linc_target/calib_targ.cwl

@@ -26,12 +26,16 @@ inputs:
   - id: smoothnessreffrequency
     type: float?
     default: 0.
+  - id: beammode
+    type: string
   - id: nchan
     type: int?
     default: 0
   - id: model_column
     type: string[]?
     default: []
+  - id: uvlambdamin
+    type: float
   - id: execute
     type: boolean?
     default: true
@@ -79,7 +83,7 @@ steps:
       - id: msout_name
         default: '.'
       - id: uvlambdamin
-        default: 150.
+        source: uvlambdamin
       - id: mode
         source: gsmcal_step
         valueFrom: '$(self == "phase" ? "phaseonly" : self)'
@@ -100,7 +104,7 @@ steps:
       - id: usechannelfreq
         default: true
       - id: beammode
-        default: array_factor
+        source: beammode
       - id: smoothnessconstraint
         source: smoothnessconstraint
       - id: smoothnessreffrequency

workflows/linc_target/gsmcal.cwl

@@ -346,7 +346,7 @@ steps:
         source:
           - merge_array_concat/output
       - id: numbands
-        valueFrom: $(-1)
+        default: -1
       - id: DP3fill
         default: true
       - id: stepname
@@ -496,11 +496,15 @@ steps:
       - id: selfcal_strategy
         source: selfcal_strategy
       - id: nchan
-        valueFrom: $(1)
+        default: 1
       - id: smoothnessconstraint
-        valueFrom: $(5000000)
+        default: 5000000
       - id: smoothnessreffrequency
-        valueFrom: $(120000000)
+        default: 120000000
+      - id: beammode
+        default: array_factor
+      - id: uvlambdamin
+        default: 200
     out:
       - id: msout
       - id: BLsmooth.log
@@ -556,7 +560,7 @@ steps:
       - id: solset
         default: sol000
       - id: correction
-        valueFrom: phase000
+        default: phase000
       - id: execute
         source: selfcal
       - id: selfcal_strategy
@@ -597,7 +601,7 @@ steps:
       - id: join-channels
         default: True
       - id: fit-spectral-pol
-        valueFrom: $(3)
+        default: 3
       - id: weighting
         default: briggs -1.5
       - id: minuv-l
@@ -605,7 +609,7 @@ steps:
       - id: tempdir
         source: wsclean_tmpdir
       - id: image_name
-        valueFrom: image_before_selfcal
+        default: image_before_selfcal
       - id: no_model_update
         default: false
       # This can be turned on if we do a separate predict after, not sure if that would be faster.
@@ -644,7 +648,7 @@ steps:
       # - id: skymodel
       #   source: image_target/sourcelist
       - id: do_smooth
-        valueFrom: $(false)
+        default: false
       - id: propagatesolutions
         source: propagatesolutions
       - id: gsmcal_step
@@ -654,13 +658,17 @@ steps:
       - id: selfcal_strategy
         source: selfcal_strategy
       - id: model_column
-        valueFrom: $(["MODEL_DATA"])
+        default: ["MODEL_DATA"]
       - id: nchan
-        valueFrom: $(1)
+        default: 1
       - id: smoothnessconstraint
-        valueFrom: $(5000000)
+        default: 5000000
       - id: smoothnessreffrequency
-        valueFrom: $(120000000)
+        default: 120000000
+      - id: beammode
+        default: array_factor
+      - id: uvlambdamin
+        default: 200
     out:
       - id: msout
       - id: BLsmooth.log
@@ -717,6 +725,8 @@ steps:
         source: aoflag_freqconcat
       - id: execute
         source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
     out:
       - id: msout
       - id: logfiles