steps/LoSoTo.Plot.cwl

@@ -18,7 +18,7 @@ requirements:
         entry: $(get_losoto_config('PLOT').join('\n'))
       - entryname: $(inputs.input_h5parm.basename)
         entry: $(inputs.input_h5parm)
-        writable: true
+        writable: false
       - entryname: run_losoto_plot.sh
         entry: |
           #!/bin/bash

workflows/linc_target/gsmcal.cwl

@@ -98,7 +98,9 @@ outputs:
     type: Directory[]
   - id: outh5parm
     outputSource:
+      - h5parm_collector_selfcal_hba/outh5parm
       - h5parm_collector/outh5parm
+    pickValue: first_non_null
     type: File
   - id: outsolutions
     outputSource:
@@ -605,9 +607,10 @@ steps:
     in:
       - id: h5parmFiles
         source:
+          - selfcal_target_hba/outh5parm
           - calibrate_target/outh5parm
           - selfcal_target/outh5parm
-        pickValue: all_non_null
+        pickValue: first_non_null
         linkMerge: merge_flattened
       - id: squeeze
         default: true
@@ -615,6 +618,25 @@ steps:
         default: true
       - id: clobber
         default: true
+    out:
+      - id: outh5parm
+      - id: log
+    run: ../../steps/H5ParmCollector.cwl
+    label: H5parm_collector
+
+  # Collect the selfcal h5parm separately, such that the
+  # plotting steps below can simply plot the original solve
+  - id: h5parm_collector_selfcal_hba
+    in:
+      - id: h5parmFiles
+        source:
+          - selfcal_target_hba/outh5parm
+      - id: squeeze
+        default: true
+      - id: verbose
+        default: true
+      - id: clobber
+        default: true
       - id: execute
         source: selfcal
       - id: selfcal_strategy
@@ -623,7 +645,8 @@ steps:
       - id: outh5parm
       - id: log
     run: ../../steps/H5ParmCollector.cwl
-    label: H5parm_collector
+    label: h5parm_collector_selfcal
+    when: $(inputs.execute && inputs.selfcal_strategy == 'HBA')
 
   - id: plot_unflagged
     in:

workflows/linc_target/selfcal_targ_hba.cwl

@@ -120,6 +120,8 @@ steps:
         default: 0.8
       - id: parallel-reordering
         default: 4
+      - id: parallel-deconvolution
+        default: 2048
       - id: channels-out
         default: 6
       - id: join-channels