Image target field [skip ci]

steps/wsclean.cwl

@@ -315,6 +315,10 @@ inputs:
   - id: fits_image
     type: File?
 outputs:
+  - id: sourcelist
+    type: File?
+    outputBinding:
+      glob: [$(inputs.image_name)-sources.txt]
   - id: dirty_image
     type: File?
     outputBinding:

workflows/linc_target/gsmcal.cwl

@@ -86,7 +86,8 @@ inputs:
 outputs:
   - id: msout
     outputSource:
-      - calibrate_target/msout
+      - image_target/msout
+      # - calibrate_target/msout
       - selfcal_target/msout
     pickValue: all_non_null
     linkMerge: merge_flattened
@@ -490,9 +491,121 @@ steps:
       - msin
     when: $(!inputs.execute || inputs.selfcal_strategy == 'HBA')
 
+  # START image target field
+  - id: h5parm_collector_skysolve
+    in:
+      - id: h5parmFiles
+        source:
+          - calibrate_target/outh5parm
+        pickValue: all_non_null
+        linkMerge: merge_flattened
+      - id: squeeze
+        default: true
+      - id: verbose
+        default: true
+      - id: clobber
+        default: true
+      - id: execute
+        source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
+    out:
+      - id: outh5parm
+      - id: log
+    run: ../../steps/H5ParmCollector.cwl
+    label: h5parm_collector_skysolve
+    when: $(inputs.execute && inputs.selfcal_strategy == 'HBA')
 
+  - id: apply_skysolve
+    in:
+      - id: max_dp3_threads
+        source: max_dp3_threads
+      - id: msin
+        source: calibrate_target/msout
+      - id: msin_datacolumn
+        default: DATA
+      - id: parmdb
+        source: h5parm_collector_skysolve/outh5parm
+      - id: msout_datacolumn
+        default: CORRECTED_DATA
+      - id: storagemanager
+        default: Dysco
+      - id: databitrate
+        default: 0
+      - id: solset
+        default: sol000
+      - id: correction
+        valueFrom: phase000
+      - id: execute
+        source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
+    out:
+      - id: msout
+      - id: logfile
+    run: ../../steps/applycal.cwl
+    scatter:
+      - msin
+    label: apply_skysolve
+    when: $(inputs.execute && inputs.selfcal_strategy == 'HBA')
 
-
+  - id: image_target
+    in:
+      - id: msin
+        source: apply_skysolve/msout
+      - id: image_scale
+        default: 1.5asec
+      - id: auto_threshold
+        default: 0.5
+      - id: image_size
+        default: [2000,2000]
+      - id: niter
+        default: 285
+      - id: nmiter
+        default: 1
+      - id: multiscale
+        default: true
+      - id: use-wgridder
+        default: true
+      - id: mgain
+        default: 0.8
+      - id: parallel-reordering
+        default: 4
+      - id: channels-out
+        default: 6
+      - id: join-channels
+        default: True
+      - id: fit-spectral-pol
+        valueFrom: $(3)
+      - id: weighting
+        default: briggs -1.5
+      - id: minuv-l
+        default: 80
+      - id: tempdir
+        source: wsclean_tmpdir
+      - id: image_name
+        source: targetname
+      - 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.
+      # - id: baseline_averaging
+      #   default: 0.4908738521234052
+      - id: save_source_list
+        default: true
+      - id: execute
+        source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
+    out:
+      - id: msout
+      - id: dirty_image
+      - id: image
+      - id: logfile
+      - id: sourcelist
+    run: ../../steps/wsclean.cwl
+    label: image_target
+    when: $(inputs.execute && inputs.selfcal_strategy == 'HBA')
+    # END image target field
 
 
   - id: selfcal_target
@@ -549,6 +662,8 @@ steps:
     label: selfcal_target
     when: $(inputs.execute && inputs.selfcal_strategy == 'LBA')
 
+
+
   - id: h5parm_collector
     in:
       - id: h5parmFiles